调整版本更新

Middleware/GlobalExceptionMiddleware.cs

@@ -35,9 +35,9 @@ namespace Middleware
             try
             {
                 // 设置允许跨域的域名、方法等
-                // context.Response.Headers.Add("Access-Control-Allow-Origin", "*");
-                // context.Response.Headers.Add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
-                // context.Response.Headers.Add("Access-Control-Allow-Headers", "DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization");
+                context.Response.Headers.Add("Access-Control-Allow-Origin", "*");
+                context.Response.Headers.Add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
+                context.Response.Headers.Add("Access-Control-Allow-Headers", "DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization");
 
                 // 如果请求方法是预检请求（OPTIONS），则直接返回成功状态码
                 if (context.Request.Method == "OPTIONS")

Model/Dto/FileUpdateInfoUpdateFileDto.cs

@@ -15,6 +15,12 @@ namespace Dto
         public string? kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        public string? appVersion { get; set; }
+
+
 
     }
 }

Model/Dto/PageUpdateInfoUpdateTemplateDto.cs

@@ -15,6 +15,12 @@ namespace Dto
         public string? kind { get; set; }
 
 
+        /// <summary>
+        /// 模板版本号
+        /// </summary>
+        public string? appVersion { get; set; }
+
+
 
     }
 }

Program.cs

@@ -25,7 +25,7 @@ builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 // builder.Services.AddIPRate(builder.Configuration);
 builder.Services.AddSession();
 builder.Services.AddHttpContextAccessor();
-// builder.Services.AddCors(option => option.AddPolicy("cors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().SetIsOriginAllowed(_ => true)));
+builder.Services.AddCors(option => option.AddPolicy("cors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().SetIsOriginAllowed(_ => true)));
 builder.Services.Configure<KestrelServerOptions>(x => x.AllowSynchronousIO = true).Configure<IISServerOptions>(x => x.AllowSynchronousIO = true);
 
 //绑定整个对象到Model上

Services/FileUpdateInfoService.cs

@@ -50,14 +50,19 @@ namespace Services
         {
             OssConfigs ossConfigs = new();
             AppSettings.Bind("OssConfigs", ossConfigs);
-            GetSystemFiles(ossConfigs, parm.kind);
+            string kind = parm.kind;
+            if(!string.IsNullOrEmpty(parm.appVersion))
+            {
+                kind += "/" + parm.appVersion;
+            }
+            GetSystemFiles(ossConfigs, kind);
             foreach (string filename in SystemFiles)
             {
                 string Path = filename.Substring(0, filename.LastIndexOf("/") + 1);
                 string template = filename.Substring(filename.LastIndexOf("/") + 1);
                 if (!template.EndsWith(".html") && !template.EndsWith(".DS_Store") && !template.EndsWith("LICENSE") && !template.EndsWith("Thumbs.db"))
                 {
-                    FileUpdateInfo check = GetFirst(m => m.path == Path && m.fileName == template && m.kind == parm.kind);
+                    FileUpdateInfo check = GetFirst(m => m.path == Path && m.fileName == template && m.kind == parm.kind && m.appVersion == parm.appVersion);
                     if (check == null)
                     {
                         Add(new FileUpdateInfo()
@@ -68,6 +73,7 @@ namespace Services
                             path = Path,
                             versionNum = 0,
                             kind = parm.kind,
+                            appVersion = Function.CheckNull(parm.appVersion),
                         });
                     }
                 }

Services/PageUpdateInfoService.cs

@@ -31,7 +31,7 @@ namespace Services
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<PageUpdateInfo>();
-            predicate = predicate.And(m => m.appVersion.Contains(parm.appVersion));
+            predicate = predicate.And(m => m.appVersion == parm.appVersion);
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.title), m => m.title.Contains(parm.title));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.modulePath), m => m.modulePath.Contains(parm.modulePath));
@@ -53,16 +53,21 @@ namespace Services
         {
             OssConfigs ossConfigs = new();
             AppSettings.Bind("OssConfigs", ossConfigs);
-            GetSystemFiles(ossConfigs, parm.kind);
+            string kind = parm.kind;
+            if(!string.IsNullOrEmpty(parm.appVersion))
+            {
+                kind += "/" + parm.appVersion;
+            }
+            GetSystemFiles(ossConfigs, kind);
             foreach (string filename in SystemFiles)
             {
                 string template = filename.Substring(filename.LastIndexOf("/") + 1);
                 if (template.EndsWith(".html"))
                 {
-                    PageUpdateInfo check = GetFirst(m => m.modulePath == template && m.kind == parm.kind);
+                    PageUpdateInfo check = GetFirst(m => m.modulePath == template && m.kind == parm.kind && m.appVersion == parm.appVersion);
                     if (check == null)
                     {
-                        string ModuleContent = Function.GetNetFileContent(ossConfigs.Host + "template/app/" + parm.kind + "/" + template);
+                        string ModuleContent = Function.GetNetFileContent(ossConfigs.Host + "template/app/" + kind + "/" + template);
                         if (!string.IsNullOrEmpty(ModuleContent))
                         {
                             string admintitle = "";
@@ -80,7 +85,7 @@ namespace Services
                                     title = admintitle;
                                 // }
                             }
-                            var item = GetFirst(m => m.modulePath == template);
+                            var item = GetFirst(m => m.modulePath == template && m.appVersion == parm.appVersion);
                             if(item == null)
                             {
                                 Add(new PageUpdateInfo()
@@ -100,6 +105,7 @@ namespace Services
                                     modulePath = template,
                                     moduleVersion = 1,
                                     mustUpdate = true,
+                                    appVersion = Function.CheckNull(parm.appVersion),
                                 });
                             }
                             else

appsettings.Development.json

@@ -32,11 +32,11 @@
     "Session": "47.109.31.237:6379,password=klm@redis,defaultDatabase=13,poolsize=50,ssl=false,writeBuffer=10240,prefix=session:"
   },
   "OssConfigs": {
-    "Host": "http://kexiaoshuang-oss.oss-cn-chengdu.aliyuncs.com/",
+    "Host": "http://kxs-app-sources.oss-cn-chengdu.aliyuncs.com/",
     "Endpoint": "oss-cn-chengdu.aliyuncs.com",
     "Key": "LTAI5tJsPaNzqCSMCPwb8zfz",
     "Secret": "efM31Up75fQcgZ32U6xvAciagceQae",
-    "BucketName": "kexiaoshuang-oss"
+    "BucketName": "kxs-app-sources"
   },
   "JwtSettings": {
     "Issuer": "ym", //即token的签发者。