lcl 10 сар өмнө
parent
commit
449bb88a6b

BIN
.DS_Store


+ 2 - 2
Controllers/FileUpdateInfoController.cs

@@ -42,9 +42,9 @@ namespace Controllers
         /// <returns>资源文件更新信息列表</returns>
         /// <returns>资源文件更新信息列表</returns>
         [HttpGet]
         [HttpGet]
         [Route("/v1/api/FileUpdateInfo/list")]
         [Route("/v1/api/FileUpdateInfo/list")]
-        public IActionResult List([FromQuery] FileUpdateInfoListDto parm)
+        public IActionResult List([FromQuery] FileUpdateInfoListDto parm, [FromQuery] PagerInfo page)
         {
         {
-            var response = _FileUpdateInfoService.List(parm);
+            var response = _FileUpdateInfoService.List(parm, page);
             return SUCCESS(response);
             return SUCCESS(response);
         }
         }
 
 

+ 2 - 2
Controllers/PageUpdateInfoController.cs

@@ -41,9 +41,9 @@ namespace Controllers
         /// <returns>页面模板更新信息列表</returns>
         /// <returns>页面模板更新信息列表</returns>
         [HttpGet]
         [HttpGet]
         [Route("/v1/api/PageUpdateInfo/list")]
         [Route("/v1/api/PageUpdateInfo/list")]
-        public IActionResult List([FromQuery] PageUpdateInfoListDto parm)
+        public IActionResult List([FromQuery] PageUpdateInfoListDto parm, [FromQuery] PagerInfo page)
         {
         {
-            var response = _PageUpdateInfoService.List(parm);
+            var response = _PageUpdateInfoService.List(parm, page);
             return SUCCESS(response);
             return SUCCESS(response);
         }
         }
 
 

+ 2 - 1
Middleware/GlobalExceptionMiddleware.cs

@@ -1,4 +1,5 @@
 using Attribute;
 using Attribute;
+using Common;
 using Extensions;
 using Extensions;
 using Infrastructure;
 using Infrastructure;
 using Infrastructure.Model;
 using Infrastructure.Model;
@@ -78,7 +79,7 @@ namespace Middleware
             {
             {
                 msg = "服务器好像出了点问题,请联系系统管理员...";
                 msg = "服务器好像出了点问题,请联系系统管理员...";
                 error = $"{ex.Message}";
                 error = $"{ex.Message}";
-                Console.Write("500错误:" + ex.ToString());
+                Function.WriteLog(DateTime.Now.ToString() + "\n500错误:" + ex.ToString(), "Global全局异常");
                 logLevel = NLog.LogLevel.Error;
                 logLevel = NLog.LogLevel.Error;
                 context.Response.StatusCode = 500;
                 context.Response.StatusCode = 500;
             }
             }

+ 3 - 1
Services/Client/FileUpdateInfoService.cs

@@ -23,13 +23,15 @@ namespace Services.Client
         /// <returns>APP静态资源</returns>
         /// <returns>APP静态资源</returns>
         public PagedInfo<AppStaticFilesVo> StaticFiles([FromQuery] AppStaticFilesDto parm)
         public PagedInfo<AppStaticFilesVo> StaticFiles([FromQuery] AppStaticFilesDto parm)
         {
         {
+            PagerInfo page = new PagerInfo();
+            page.pageSize = 100000;
             //开始拼装查询条件
             //开始拼装查询条件
             var predicate = Expressionable.Create<FileUpdateInfo>();
             var predicate = Expressionable.Create<FileUpdateInfo>();
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             var response = Queryable()
             var response = Queryable()
                 .Where(predicate.ToExpression())
                 .Where(predicate.ToExpression())
                 .OrderByDescending(m => m.id)
                 .OrderByDescending(m => m.id)
-                .ToPage<FileUpdateInfo, AppStaticFilesVo>(new PagerInfo());
+                .ToPage<FileUpdateInfo, AppStaticFilesVo>(page);
             return response;
             return response;
         }
         }
 
 

+ 5 - 5
Services/FileUpdateInfoService.cs

@@ -25,17 +25,15 @@ namespace Services
         /// </summary>
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <param name="parm">请求参数</param>
         /// <returns>资源文件更新信息列表</returns>
         /// <returns>资源文件更新信息列表</returns>
-        public PagedInfo<FileUpdateInfoListVo> List([FromQuery] FileUpdateInfoListDto parm)
+        public PagedInfo<FileUpdateInfoListVo> List([FromQuery] FileUpdateInfoListDto parm, [FromQuery] PagerInfo page)
         {
         {
-            PagerInfo pager = new PagerInfo();
-            pager.pageSize = 100000;
             //开始拼装查询条件
             //开始拼装查询条件
             var predicate = Expressionable.Create<FileUpdateInfo>();
             var predicate = Expressionable.Create<FileUpdateInfo>();
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             var response = Queryable()
             var response = Queryable()
                 .Where(predicate.ToExpression())
                 .Where(predicate.ToExpression())
                 .OrderByDescending(m => m.id)
                 .OrderByDescending(m => m.id)
-                .ToPage<FileUpdateInfo, FileUpdateInfoListVo>(pager);
+                .ToPage<FileUpdateInfo, FileUpdateInfoListVo>(page);
             return response;
             return response;
         }
         }
 
 
@@ -103,7 +101,9 @@ namespace Services
         {
         {
             FileUpdateInfoListDto parm = new FileUpdateInfoListDto();
             FileUpdateInfoListDto parm = new FileUpdateInfoListDto();
             parm.kind = kind;
             parm.kind = kind;
-            var obj = List(parm);
+            PagerInfo page = new PagerInfo();
+            page.pageSize = 100000;
+            var obj = List(parm, page);
             string str = Newtonsoft.Json.JsonConvert.SerializeObject(obj.Records);
             string str = Newtonsoft.Json.JsonConvert.SerializeObject(obj.Records);
             return Dbconn.Encrypt3DES(str, "*ga34|^7");
             return Dbconn.Encrypt3DES(str, "*ga34|^7");
         }
         }

+ 1 - 1
Services/IService/IFileUpdateInfoService.cs

@@ -13,7 +13,7 @@ namespace Services
         /// </summary>
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <param name="parm">请求参数</param>
         /// <returns>资源文件更新信息列表</returns>
         /// <returns>资源文件更新信息列表</returns>
-        PagedInfo<FileUpdateInfoListVo> List([FromQuery] FileUpdateInfoListDto parm);
+        PagedInfo<FileUpdateInfoListVo> List([FromQuery] FileUpdateInfoListDto parm, [FromQuery] PagerInfo page);
 
 
 
 
 
 

+ 1 - 1
Services/IService/IPageUpdateInfoService.cs

@@ -13,7 +13,7 @@ namespace Services
         /// </summary>
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <param name="parm">请求参数</param>
         /// <returns>页面模板更新信息列表</returns>
         /// <returns>页面模板更新信息列表</returns>
-        PagedInfo<PageUpdateInfoListVo> List([FromQuery] PageUpdateInfoListDto parm);
+        PagedInfo<PageUpdateInfoListVo> List([FromQuery] PageUpdateInfoListDto parm, [FromQuery] PagerInfo page);
 
 
 
 
 
 

+ 3 - 5
Services/PageUpdateInfoService.cs

@@ -27,17 +27,15 @@ namespace Services
         /// </summary>
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <param name="parm">请求参数</param>
         /// <returns>页面模板更新信息列表</returns>
         /// <returns>页面模板更新信息列表</returns>
-        public PagedInfo<PageUpdateInfoListVo> List([FromQuery] PageUpdateInfoListDto parm)
+        public PagedInfo<PageUpdateInfoListVo> List([FromQuery] PageUpdateInfoListDto parm, [FromQuery] PagerInfo page)
         {
         {
-            PagerInfo pager = new PagerInfo();
-            pager.pageSize = 100000;
             //开始拼装查询条件
             //开始拼装查询条件
             var predicate = Expressionable.Create<PageUpdateInfo>();
             var predicate = Expressionable.Create<PageUpdateInfo>();
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             var response = Queryable()
             var response = Queryable()
                 .Where(predicate.ToExpression())
                 .Where(predicate.ToExpression())
                 .OrderByDescending(m => m.id)
                 .OrderByDescending(m => m.id)
-                .ToPage<PageUpdateInfo, PageUpdateInfoListVo>(pager);
+                .ToPage<PageUpdateInfo, PageUpdateInfoListVo>(page);
             return response;
             return response;
         }
         }
         
         
@@ -129,7 +127,7 @@ namespace Services
             string GotoPages = "{";
             string GotoPages = "{";
             string PageInfoList = "{";
             string PageInfoList = "{";
             string LibFile = "{";
             string LibFile = "{";
-            List<PageUpdateInfo> newpages = GetList(m => m.kind == kind).OrderBy(m => m.id).ToList();
+            List<PageUpdateInfo> newpages = GetList(m => m.kind == kind);
             foreach (PageUpdateInfo page in newpages)
             foreach (PageUpdateInfo page in newpages)
             {
             {
                 string FileName = page.modulePath.Split('.')[0];
                 string FileName = page.modulePath.Split('.')[0];

+ 3 - 3
appsettings.Development.json

@@ -34,9 +34,9 @@
   "OssConfigs": {
   "OssConfigs": {
     "Host": "http://kexiaoshuang-oss.oss-cn-chengdu.aliyuncs.com/",
     "Host": "http://kexiaoshuang-oss.oss-cn-chengdu.aliyuncs.com/",
     "Endpoint": "oss-cn-chengdu.aliyuncs.com",
     "Endpoint": "oss-cn-chengdu.aliyuncs.com",
-    "Key": "LTAI5tAp9ASZtq4wYzuXfeer",
-    "Secret": "N0o6TwowU8r4aeNWoefMnnus9Q2saW",
-    "BucketName": "kexiaoshuang"
+    "Key": "LTAI5tJsPaNzqCSMCPwb8zfz",
+    "Secret": "efM31Up75fQcgZ32U6xvAciagceQae",
+    "BucketName": "kexiaoshuang-oss"
   },
   },
   "JwtSettings": {
   "JwtSettings": {
     "Issuer": "ym", //即token的签发者。
     "Issuer": "ym", //即token的签发者。