Merge remote-tracking branch 'github/master'
This commit is contained in:
commit
05e3680d10
@ -54,13 +54,13 @@ public class AppsService : ApplicationService
|
|||||||
.OrderByDescending(a => a.UpdateTime)
|
.OrderByDescending(a => a.UpdateTime)
|
||||||
.ToPagedListAsync(input.PageIndex, input.PageSize);
|
.ToPagedListAsync(input.PageIndex, input.PageSize);
|
||||||
|
|
||||||
var logoKeys = res.Items
|
// var logoKeys = res.Items
|
||||||
.Where(x => !x.LogoKey.IsNullOrWhiteSpace())
|
// .Where(x => !x.LogoKey.IsNullOrWhiteSpace())
|
||||||
.Select(x => x.LogoKey).ToArray();
|
// .Select(x => x.LogoKey).ToArray();
|
||||||
var urlDic = OSSHelper.GetUrlByKeys(logoKeys);
|
// var urlDic = OSSHelper.GetUrlByKeys(logoKeys);
|
||||||
|
|
||||||
foreach (var url in urlDic)
|
// foreach (var url in urlDic)
|
||||||
res.Items.First(x => x.LogoKey == url.Key).LogoUrl = url.Value;
|
// res.Items.First(x => x.LogoKey == url.Key).LogoUrl = url.Value;
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
@ -161,6 +161,7 @@ public class AppsService : ApplicationService
|
|||||||
throw new BusinessException(message: "应用名称已存在");
|
throw new BusinessException(message: "应用名称已存在");
|
||||||
if (await _appRepository.IsAnyAsync(x => x.AppKey == input.AppKey))
|
if (await _appRepository.IsAnyAsync(x => x.AppKey == input.AppKey))
|
||||||
throw new BusinessException(message: "appkey已存在");
|
throw new BusinessException(message: "appkey已存在");
|
||||||
|
input.LogoKey = String.Empty;
|
||||||
if (await _appRepository.IsAnyAsync(x => x.AppSecret == input.AppSecret))
|
if (await _appRepository.IsAnyAsync(x => x.AppSecret == input.AppSecret))
|
||||||
throw new BusinessException(message: "appsecret已存在");
|
throw new BusinessException(message: "appsecret已存在");
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user