lichunlei hai 4 meses
pai
achega
9add7c3318

+ 6 - 6
Controllers/PageUpdateInfoController.cs

@@ -43,24 +43,24 @@ namespace Controllers
         /// <returns>生成APP配置文件</returns>
         [HttpGet]
         [Route("/noauth/SystemSet/makeAppInitData")]
-        public string makeAppInitData([FromQuery] MakeAppInitDataDto parm)
+        public string makeAppInitData([FromQuery] MakeAppInitDataDto parm, string EncryptType = "des")
         {
-            string AppInfoList = _AppBottomNavsService.makeAppInitData(parm.kind, parm.appVersion);
+            string AppInfoList = _AppBottomNavsService.makeAppInitData(parm.kind, parm.appVersion, EncryptType);
             // Function.WriteLog(AppInfoList);
-            string FileInfoList = _FileUpdateInfoService.makeAppInitData(parm.kind, parm.appVersion);
-            string PageInfoList = _PageUpdateInfoService.makeAppInitData(parm.kind, parm.appVersion);
+            string FileInfoList = _FileUpdateInfoService.makeAppInitData(parm.kind, parm.appVersion, EncryptType);
+            string PageInfoList = _PageUpdateInfoService.makeAppInitData(parm.kind, parm.appVersion, EncryptType);
             return AppInfoList + "#cut#" + FileInfoList + "#cut#" + PageInfoList;
         }
 
         [HttpGet]
         [Route("/noauth/reg")]
-        public IActionResult Register(string v = "4.4.0", string k = "creater", string c = "")
+        public IActionResult Register(string v = "4.4.0", string k = "creater", string c = "", string et = "des")
         {
             string appini = makeAppInitData(new MakeAppInitDataDto()
             {
                 kind = k,
                 appVersion = v,
-            }); //Function.GetWebRequest("http://" + url + "/noauth/SystemSet/makeAppInitData?kind=" + k + "&appVersion=" + v);
+            }, et);
             if (!string.IsNullOrEmpty(appini))
             {
                 if (appini.Contains("#cut#"))

+ 3 - 3
Services/AppBottomNavsService.cs

@@ -44,13 +44,13 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind, string appVersion = "")
+        public string makeAppInitData(string kind, string appVersion, string EncryptType = "des")
         {
             var obj = GetList(m => m.kind == kind && m.appVersion == appVersion);
             string str = Newtonsoft.Json.JsonConvert.SerializeObject(obj);
             // string str = "[{\"title\":\"首页\",\"selectIcon\":\"/static/images/tab-icon1-active1@3x.png\",\"normalIcon\":\"/static/images/tab-icon1-no@3x.png\",\"selectTextColor\":\"333333\",\"normalTextColor\":\"999999\",\"pageName\":\"index1\",\"noPageHint\":\"\",\"backgroudColor\":\"\",\"style\":\"\",\"scrollerAnimationImages\":\"\",\"pagPath\":\"\",\"showTitle\":true,\"iconSize\":34,\"statusBarColor\":\"true\",\"id\":13,\"status\":0,\"sort\":0,\"version\":0,\"createDate\":\"2024-07-11T23:38:05\",\"updateDate\":\"2024-07-19T15:19:26\",\"kind\":\"creater\",\"appVersion\":\"4.2.0\"},{\"title\":\"消息\",\"selectIcon\":\"/static/images/tab-icon3-active1@3x.png\",\"normalIcon\":\"/static/images/tab-icon3-no@3x.png\",\"selectTextColor\":\"333333\",\"normalTextColor\":\"999999\",\"pageName\":\"notice-center1\",\"noPageHint\":\"\",\"backgroudColor\":\"\",\"style\":\"\",\"scrollerAnimationImages\":\"\",\"pagPath\":\"\",\"showTitle\":false,\"iconSize\":34,\"statusBarColor\":\"true\",\"id\":14,\"status\":0,\"sort\":0,\"version\":0,\"createDate\":\"2024-07-11T23:38:05\",\"updateDate\":\"2024-11-28T17:53:32\",\"kind\":\"creater\",\"appVersion\":\"4.2.0\"},{\"title\":\"我的\",\"selectIcon\":\"/static/images/tab-icon4-active1@3x.png\",\"normalIcon\":\"/static/images/tab-icon4-no@3x.png\",\"selectTextColor\":\"333333\",\"normalTextColor\":\"999999\",\"pageName\":\"user-center1\",\"noPageHint\":\"\",\"backgroudColor\":\"\",\"style\":\"\",\"scrollerAnimationImages\":\"\",\"pagPath\":\"\",\"showTitle\":true,\"iconSize\":34,\"statusBarColor\":\"true\",\"id\":16,\"status\":0,\"sort\":0,\"version\":0,\"createDate\":\"2024-07-11T23:38:05\",\"updateDate\":\"2024-07-19T15:18:43\",\"kind\":\"creater\",\"appVersion\":\"4.2.0\"}]";
-            return Dbconn.Encrypt3DES(str, "*ga34|^7");
-            // return Dbconn.AesEncrypt(str, "CBTU1dD4Kd5pyiGWTsI10jRQ3SvKusSV", "DYgjCEIMVrj2W9xN");
+            if(EncryptType == "des") return Dbconn.Encrypt3DES(str, "*ga34|^7");
+            return Dbconn.AesEncrypt(str, "CBTU1dD4Kd5pyiGWTsI10jRQ3SvKusSV", "DYgjCEIMVrj2W9xN");
         }
 
 

+ 3 - 3
Services/FileUpdateInfoService.cs

@@ -104,7 +104,7 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind, string appVersion = "")
+        public string makeAppInitData(string kind, string appVersion, string EncryptType = "des")
         {
             FileUpdateInfoListDto parm = new FileUpdateInfoListDto();
             parm.kind = kind;
@@ -113,8 +113,8 @@ namespace Services
             page.pageSize = 100000;
             var obj = List(parm, page);
             string str = Newtonsoft.Json.JsonConvert.SerializeObject(obj.Records);
-            return Dbconn.Encrypt3DES(str, "*ga34|^7");
-            // return Dbconn.AesEncrypt(str, "CBTU1dD4Kd5pyiGWTsI10jRQ3SvKusSV", "DYgjCEIMVrj2W9xN");
+            if(EncryptType == "des") return Dbconn.Encrypt3DES(str, "*ga34|^7");
+            return Dbconn.AesEncrypt(str, "CBTU1dD4Kd5pyiGWTsI10jRQ3SvKusSV", "DYgjCEIMVrj2W9xN");
         }
 
 

+ 1 - 1
Services/IService/IAppBottomNavsService.cs

@@ -24,7 +24,7 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind, string appVersion = "");
+        public string makeAppInitData(string kind, string appVersion, string EncryptType = "des");
 
 
 

+ 1 - 1
Services/IService/IFileUpdateInfoService.cs

@@ -34,7 +34,7 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind, string appVersion = "");
+        public string makeAppInitData(string kind, string appVersion, string EncryptType = "des");
 
 
 

+ 1 - 1
Services/IService/IPageUpdateInfoService.cs

@@ -33,7 +33,7 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind, string appVersion = "");
+        public string makeAppInitData(string kind, string appVersion, string EncryptType = "des");
 
 
         /// <summary>

+ 11 - 5
Services/PageUpdateInfoService.cs

@@ -140,7 +140,7 @@ namespace Services
         /// </summary>
         /// <param name="parm">请求参数</param>
         /// <returns>生成APP配置文件</returns>
-        public string makeAppInitData(string kind, string appVersion = "")
+        public string makeAppInitData(string kind, string appVersion, string EncryptType = "des")
         {
             OssConfigs ossConfigs = new();
             AppSettings.Bind("OssConfigs", ossConfigs);
@@ -160,8 +160,14 @@ namespace Services
                 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");
-                // pageContent = Dbconn.AesEncrypt(pageContent, "CBTU1dD4Kd5pyiGWTsI10jRQ3SvKusSV", "DYgjCEIMVrj2W9xN");
+                if(EncryptType == "des")
+                {
+                    pageContent = Dbconn.Encrypt3DES(pageContent, "*ga34|^7");
+                }
+                else
+                {
+                    pageContent = Dbconn.AesEncrypt(pageContent, "CBTU1dD4Kd5pyiGWTsI10jRQ3SvKusSV", "DYgjCEIMVrj2W9xN");
+                }
                 LibFile += "\"page" + FileName + "\":\"" + pageContent + "\",";
             }
             PageInfoList = PageInfoList.TrimEnd(',');
@@ -170,8 +176,8 @@ namespace Services
             GotoPages += "}";
             LibFile = LibFile.TrimEnd(',');
             LibFile += "}";
-            return Dbconn.Encrypt3DES(PageInfoList, "*ga34|^7") + "#cut#" + GotoPages + "#cut#" + Dbconn.Encrypt3DES(LibFile, "*ga34|^7");
-            // return Dbconn.AesEncrypt(PageInfoList, "CBTU1dD4Kd5pyiGWTsI10jRQ3SvKusSV", "DYgjCEIMVrj2W9xN") + "#cut#" + GotoPages + "#cut#" + Dbconn.AesEncrypt(LibFile, "CBTU1dD4Kd5pyiGWTsI10jRQ3SvKusSV", "DYgjCEIMVrj2W9xN");
+            if(EncryptType == "des") return Dbconn.Encrypt3DES(PageInfoList, "*ga34|^7") + "#cut#" + GotoPages + "#cut#" + Dbconn.Encrypt3DES(LibFile, "*ga34|^7");
+            return Dbconn.AesEncrypt(PageInfoList, "CBTU1dD4Kd5pyiGWTsI10jRQ3SvKusSV", "DYgjCEIMVrj2W9xN") + "#cut#" + GotoPages + "#cut#" + Dbconn.AesEncrypt(LibFile, "CBTU1dD4Kd5pyiGWTsI10jRQ3SvKusSV", "DYgjCEIMVrj2W9xN");
         }