|
@@ -12,6 +12,7 @@ using Common;
|
|
|
using System.Text.RegularExpressions;
|
|
|
using Infrastructure.Model;
|
|
|
using Base;
|
|
|
+using Mapster;
|
|
|
|
|
|
namespace Services
|
|
|
{
|
|
@@ -28,13 +29,15 @@ namespace Services
|
|
|
/// <returns>页面模板更新信息列表</returns>
|
|
|
public PagedInfo<PageUpdateInfoListVo> List([FromQuery] PageUpdateInfoListDto parm)
|
|
|
{
|
|
|
+ PagerInfo pager = new PagerInfo();
|
|
|
+ pager.pageSize = 100000;
|
|
|
//开始拼装查询条件
|
|
|
var predicate = Expressionable.Create<PageUpdateInfo>();
|
|
|
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
|
|
|
var response = Queryable()
|
|
|
.Where(predicate.ToExpression())
|
|
|
.OrderByDescending(m => m.id)
|
|
|
- .ToPage<PageUpdateInfo, PageUpdateInfoListVo>(new PagerInfo());
|
|
|
+ .ToPage<PageUpdateInfo, PageUpdateInfoListVo>(pager);
|
|
|
return response;
|
|
|
}
|
|
|
|
|
@@ -130,7 +133,9 @@ namespace Services
|
|
|
foreach (PageUpdateInfo page in newpages)
|
|
|
{
|
|
|
string FileName = page.modulePath.Split('.')[0];
|
|
|
- PageInfoList += "\"page" + FileName + "\":" + Newtonsoft.Json.JsonConvert.SerializeObject(page) + ",";
|
|
|
+ var pageinfo = page.Adapt<AppPageInfoVo>();
|
|
|
+ pageinfo.dataId = Function.MD5_16(pageinfo.id.ToString() + "123890");
|
|
|
+ PageInfoList += "\"page" + FileName + "\":" + Newtonsoft.Json.JsonConvert.SerializeObject(pageinfo) + ",";
|
|
|
string PagePath = "template/app/" + kind + "/" + page.modulePath;
|
|
|
string pageContent = Function.GetNetFileContent(ossConfigs.Host + PagePath);
|
|
|
pageContent = Dbconn.Encrypt3DES(pageContent, "*ga34|^7");
|