This commit is contained in:
itcsx committed 2026-09-05 23:08:56 +08:00
1 parent 6d68eb11b7
commit 67c632715b
29 files changed
+2801 -739

No files matched your search

@@ -80,13 +80,18 @@ namespace CloudBuilder.Master.Service
if (data.Details != null || data.Details.Length > 0)
foreach (var item in data.Details)
{
item.FileName = (isAttached ? service.Configuration[AppsettingsPolicy.ApplicationUrl] : "") + item.FileName;
item.FileName = PackImageFileName(isAttached, item.FileName);
}
return data;
}
private string PackImageFileName(bool isAttached,string fileName)
{
return (isAttached ? service.Configuration[AppsettingsPolicy.ApplicationUrl] : "")
+ fileName?.Replace("\\", "/");
}
[PermissionOperate(name: MasterPermissionPolicy.PublishPhoto, operate: Operate.Find)]
public PublishPhotoResultData FindBySearchCriteria(PublishPhotoSearchCriteria criteria)
@@ -352,7 +357,7 @@ namespace CloudBuilder.Master.Service
{
if (item.FileName.ToLower().StartsWith("http")) continue;
item.FileName = (isAttached ? service.Configuration[AppsettingsPolicy.ApplicationUrl] : "") + item.FileName;
item.FileName = PackImageFileName(isAttached, item.FileName);
}
return dtls;
@@ -416,12 +421,12 @@ namespace CloudBuilder.Master.Service
var webRootPath = service.Configuration[ServiceSettingsPolicy.RequestPath];
var phy = service.Configuration[ServiceSettingsPolicy.PhysicalFileDirectory];
var scale = service.Configuration[ServiceSettingsPolicy.DmsFileScaleDirectory].Replace(phy, "");
var backup = service.Configuration[ServiceSettingsPolicy.DmsFileBackupDirectory].Replace(phy, "").Substring(1);
var fileExtension = Path.GetExtension(dmsFile.OrderKey);
var filePathRel = Path.Combine(scale, dmsFile.CreatedBy, fileExtension.Replace(".", ""), "");
var filePath = filePathRel.Replace(Path.DirectorySeparatorChar, '/');
string path = Path.Combine(webRootPath, filePathRel, dmsFile.OrderKey);
var filePathRel = Path.Combine(webRootPath.Substring(1), backup, dmsFile.CreatedBy, fileExtension.Replace(".", ""), "");
var filePath = '/'+filePathRel.Replace(Path.DirectorySeparatorChar, '/');
string path = Path.Combine(filePath, dmsFile.OrderKey);
PublishPhotoDetailEntity[] dtls = repositoryPublishPhotoDetail.DetachedEntities.Where(x => x.PublishName == publishName).ToArray();