ow
This commit is contained in:
1 parent
6d68eb11b7
commit
67c632715b
29 files changed
+2801
-739
No files matched your search
@@ -76,34 +76,19 @@ namespace CloudBuilder.Master.Service
|
||||
|
||||
if (data.Details != null && data.Details.Length > 0)
|
||||
{
|
||||
var webRootPath = service.Configuration[ServiceSettingsPolicy.RequestPath];
|
||||
var phy = service.Configuration[ServiceSettingsPolicy.PhysicalFileDirectory];
|
||||
var scale = service.Configuration[ServiceSettingsPolicy.DmsFileScaleDirectory].Replace(phy, "");
|
||||
|
||||
foreach (var item in data.Details)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(item.Pic) && FileTypePolicy.GetType(item.Pic!) == FileTypePolicy.PHOTO)
|
||||
{
|
||||
var fileExtension = Path.GetExtension(item.Pic);
|
||||
var filePathRel = Path.Combine(scale, item.CreatedBy, fileExtension.Replace(".", ""), "");
|
||||
var filePath = filePathRel.Replace(Path.DirectorySeparatorChar, '/');
|
||||
item.FormattedPic = service.Configuration[AppsettingsPolicy.ApplicationUrl] + webRootPath + filePath + item.Pic;
|
||||
item.FormattedPic = item.FormattedPic = FileTypePolicy.PackUrl(service, item.CreatedBy, item.Pic, YesNoPolicy.NO);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(item.Url) && FileTypePolicy.GetType(item.Url!) == FileTypePolicy.AUDIO)
|
||||
{
|
||||
var fileExtension = Path.GetExtension(item.Url);
|
||||
var backup = service.Configuration[ServiceSettingsPolicy.DmsFileBackupDirectory].Replace(phy, "");
|
||||
var filePathRel = Path.Combine(backup, item.CreatedBy, fileExtension.Replace(".", ""), "");
|
||||
var filePath = filePathRel.Replace(Path.DirectorySeparatorChar, '/');
|
||||
item.FormattedUrl = service.Configuration[AppsettingsPolicy.ApplicationUrl] + webRootPath + filePath + item.Url;
|
||||
item.FormattedUrl = FileTypePolicy.PackUrl(service, item.CreatedBy, item.Url, YesNoPolicy.NO);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(item.Lrc) && FileTypePolicy.GetType(item.Lrc!) == FileTypePolicy.LYRIC)
|
||||
{
|
||||
var fileExtension = Path.GetExtension(item.Lrc);
|
||||
var upload = service.Configuration[ServiceSettingsPolicy.DmsFileUploadDirectory].Replace(phy, "");
|
||||
var filePathRel = Path.Combine(upload, item.CreatedBy, fileExtension.Replace(".", ""), "");
|
||||
var filePath = filePathRel.Replace(Path.DirectorySeparatorChar, '/');
|
||||
item.FormattedLrc = service.Configuration[AppsettingsPolicy.ApplicationUrl] + webRootPath + filePath + item.Lrc;
|
||||
item.FormattedLrc = FileTypePolicy.PackUrl(service, item.CreatedBy, item.Lrc, YesNoPolicy.NO);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user