接口完善

Common/Function.cs

@@ -11,6 +11,8 @@ using System.Net;
 using LitJson;
 using Microsoft.AspNetCore.Http;
 using ThoughtWorks.QRCode.Codec;
+using System.Linq;
+using System.IO;
 
 namespace Common
 {
@@ -1169,5 +1171,45 @@ namespace Common
         {
             return String.Join("&", kvp.Select(item => String.Format("{0}={1}", item.Key.Trim(), item.Value)).ToArray());
         }
+
+
+
+        #region 获取网络文件内容
+
+        public static string GetNetFileContent(string url)
+        {
+            string textContent = "";     
+            using (var client = new WebClient())
+            {
+                try
+                {
+                    textContent = client.DownloadString(url); // 通过 DownloadString 方法获取网页内容
+                }
+                catch (Exception ex)
+                {
+                    WriteLog(DateTime.Now.ToString() + "\n" + url + "\n" + ex.ToString() + "\n\n", "获取网络文件内容异常");
+                }
+            }
+            return textContent;
+        }
+
+        public static byte[] GetNetFileData(string url)
+        {
+            byte[] textContent = new byte[] { };
+            using (var client = new WebClient())
+            {
+                try
+                {
+                    textContent = client.DownloadData(url); // 通过 DownloadString 方法获取网页内容
+                }
+                catch (Exception ex)
+                {
+                    WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "获取网络文件流异常");
+                }
+            }
+            return textContent;
+        }
+
+        #endregion
     }
 }

Controller/Client/AppController.cs → Controllers/Client/AppController.cs

@@ -12,6 +12,7 @@ using Middleware;
 using Model;
 using Services.Client;
 using Model.Base;
+using Base;
 
 namespace Controllers
 {
@@ -79,9 +80,21 @@ namespace Controllers
         [Route("/v1/kxsconfig/app/pageInfo")]
         public IActionResult PageInfo([FromQuery] AppPageInfoDto parm)
         {
+            OssConfigs ossConfigs = new();
+            AppSettings.Bind("OssConfigs", ossConfigs);
             var response = _PageUpdateInfoService.Queryable()
                 .First(x => x.moduleVersion == parm.moduleVersion)
                 .Adapt<AppPageInfoVo>() ?? new AppPageInfoVo();
+            if (parm.moduleVersion < response.moduleVersion)
+            {
+                string PagePath = "template/app/" + parm.kind + "/" + response.modulePath;
+                string pageContent = Function.GetNetFileContent(ossConfigs.Host + PagePath);
+                response.moduleContent = pageContent; //模板内容
+            }
+            else
+            {
+                response.moduleContent = ""; //模板内容
+            }
             return SUCCESS(response);
         }
 

Controllers/FileUpdateInfoController.cs

@@ -118,6 +118,17 @@ namespace Controllers
 
 
 
+        /// <summary>
+        /// 资源文件更新信息刷新文件
+        /// </summary>
+        /// <returns>资源文件更新信息刷新文件</returns>
+        [HttpGet]
+        [Route("/v1/api/PageUpdateInfo/updateTemplate")]
+        public IActionResult UpdateFile([FromQuery] FileUpdateInfoListDto parm)
+        {
+            _FileUpdateInfoService.UpdateFile(parm);
+            return SUCCESS("ok");
+        }
 
 
     }

Controllers/PageUpdateInfoController.cs

@@ -118,6 +118,21 @@ namespace Controllers
 
 
 
+        /// <summary>
+        /// 页面模板更新信息刷新文件
+        /// </summary>
+        /// <returns>页面模板更新信息刷新文件</returns>
+        [HttpGet]
+        [Route("/v1/api/PageUpdateInfo/updateTemplate")]
+        public IActionResult UpdateTemplate([FromQuery] PageUpdateInfoListDto parm)
+        {
+            _PageUpdateInfoService.UpdateTemplate(parm);
+            return SUCCESS("ok");
+        }
+
+
+
+
 
 
     }

KxsOperateAdminServer.csproj

@@ -7,6 +7,11 @@
     <SatelliteResourceLanguages>clear</SatelliteResourceLanguages>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Reference Include="Aliyun.OSS">
+      <HintPath>DLL\Aliyun.OSS.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="CSRedisCore" Version="3.8.802" />

Model/Base/OptionsSetting.cs

@@ -125,4 +125,13 @@ namespace Infrastructure.Model
         public string[] Decimal { get; set; }
         public string[] Bool { get; set; }
     }
+
+    public class OssConfigs
+    {
+        public string Host { get; set; }
+        public string Endpoint { get; set; }
+        public string Key { get; set; }
+        public string Secret { get; set; }
+        public string BucketName { get; set; }
+    }
 }

Model/Dto/FileUpdateInfoListDto.cs

@@ -10,9 +10,9 @@ namespace Dto
     public class FileUpdateInfoListDto
     {
         /// <summary>
-        /// 文件名
+        /// 分类
         /// </summary>
-        public string? fileName { get; set; }
+        public string? kind { get; set; }
 
 
 

Model/Dto/PageUpdateInfoListDto.cs

@@ -10,9 +10,9 @@ namespace Dto
     public class PageUpdateInfoListDto
     {
         /// <summary>
-        /// 顶部标题
+        /// 分类
         /// </summary>
-        public string? title { get; set; }
+        public string? kind { get; set; }
 
 
 

Model/Vo/Client/AppPageInfoVo.cs

@@ -133,6 +133,10 @@ namespace Vo
         public DateTime? createDate { get; set; }
 
 
+        /// <summary>
+        /// 页面内容
+        /// </summary>
+        public string moduleContent { get; set; }
 
     }
 }

Model/Vo/PageUpdateInfoListVo.cs

@@ -19,6 +19,12 @@ namespace Vo
         public string modulePath { get; set; }
 
 
+        /// <summary>
+        /// 顶部标题
+        /// </summary>
+        public string title { get; set; }
+
+
         /// <summary>
         /// ID
         /// </summary>

Services/FileUpdateInfoService.cs

@@ -7,6 +7,9 @@ using Model.Base;
 using Repository;
 using Service;
 using Microsoft.AspNetCore.Mvc;
+using Aliyun.OSS;
+using Infrastructure.Model;
+using Base;
 
 namespace Services
 {
@@ -25,7 +28,7 @@ namespace Services
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<FileUpdateInfo>();
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.fileName), m => m.fileName.Contains(parm.fileName));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.kind), m => m.kind.Contains(parm.kind));
             var response = Queryable()
                 .Where(predicate.ToExpression())
                 .OrderByDescending(m => m.id)
@@ -36,7 +39,54 @@ namespace Services
 
 
 
-
+        /// <summary>
+        /// 资源文件更新信息-更新文件
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>资源文件更新信息更新文件</returns>
+        public string UpdateFile([FromQuery] FileUpdateInfoListDto parm)
+        {
+            OssConfigs ossConfigs = new();
+            AppSettings.Bind("OssConfigs", ossConfigs);
+            GetSystemFiles(ossConfigs, parm.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);
+                    if (check == null)
+                    {
+                        Add(new FileUpdateInfo()
+                        {
+                            createDate = DateTime.Now,
+                            updateDate = DateTime.Now,
+                            fileName = template,
+                            path = Path,
+                            versionNum = 0,
+                            kind = parm.kind,
+                        });
+                    }
+                }
+            }
+            return "success";
+        }
+        List<string> SystemFiles;
+        private void GetSystemFiles(OssConfigs ossConfigs, string Kind = "default")
+        {
+            SystemFiles = new List<string>();
+            var client = new OssClient(ossConfigs.Endpoint, ossConfigs.Key, ossConfigs.Secret);
+            var listObjectsRequest = new ListObjectsRequest(ossConfigs.BucketName);
+            listObjectsRequest.MaxKeys = 1000;
+            listObjectsRequest.Prefix = "skin/app/" + Kind + "/";
+            var result = client.ListObjects(listObjectsRequest);
+            foreach (var summary in result.ObjectSummaries.Where(m => m.Size > 0).ToList())
+            {
+                string path = summary.Key.Substring(summary.Key.IndexOf(listObjectsRequest.Prefix) + listObjectsRequest.Prefix.Length).Replace("\\", "/");
+                SystemFiles.Add(path);
+            }
+        }
 
 
 

Services/IService/IFileUpdateInfoService.cs

@@ -19,7 +19,12 @@ namespace Services
 
 
 
-
+        /// <summary>
+        /// 资源文件更新信息-更新文件
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>资源文件更新信息更新文件</returns>
+        public string UpdateFile([FromQuery] FileUpdateInfoListDto parm);
 
 
 

Services/IService/IPageUpdateInfoService.cs

@@ -18,7 +18,12 @@ namespace Services
 
 
 
-
+        /// <summary>
+        /// 页面模板更新信息-刷新文件
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>页面模板更新信息刷新文件</returns>
+        void UpdateTemplate([FromQuery] PageUpdateInfoListDto parm);
 
 
 

Services/PageUpdateInfoService.cs

@@ -7,6 +7,11 @@ using Model.Base;
 using Repository;
 using Service;
 using Microsoft.AspNetCore.Mvc;
+using Aliyun.OSS;
+using Common;
+using System.Text.RegularExpressions;
+using Infrastructure.Model;
+using Base;
 
 namespace Services
 {
@@ -25,25 +30,87 @@ namespace Services
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<PageUpdateInfo>();
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.title), m => m.title.Contains(parm.title));
+            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());
             return response;
         }
+        
 
 
-
-
-
-
-
-
-
-
-
-
-
+        /// <summary>
+        /// 页面模板更新信息-刷新文件
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>页面模板更新信息刷新文件</returns>
+        public void UpdateTemplate([FromQuery] PageUpdateInfoListDto parm)
+        {
+            OssConfigs ossConfigs = new();
+            AppSettings.Bind("OssConfigs", ossConfigs);
+            GetSystemFiles(ossConfigs, parm.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);
+                    if (check == null)
+                    {
+                        string ModuleContent = Function.GetNetFileContent(ossConfigs.Host + "template/app/" + parm.kind + "/" + template);
+                        if (!string.IsNullOrEmpty(ModuleContent))
+                        {
+                            string admintitle = "";
+                            string title = "";
+                            Match match = Regex.Match(ModuleContent, "<title>.*?</title>", RegexOptions.IgnoreCase);
+                            if (match.Success)
+                            {
+                                admintitle = match.Value.Replace("<title>", "").Replace("</title>", "");
+                                if (admintitle.Contains("-"))
+                                {
+                                    title = admintitle.Substring(admintitle.LastIndexOf("-") + 1);
+                                }
+                                else
+                                {
+                                    title = admintitle;
+                                }
+                            }
+                            Add(new PageUpdateInfo()
+                            {
+                                createDate = DateTime.Now,
+                                updateDate = DateTime.Now,
+                                kind = parm.kind,
+                                leftAction1 = "{\"Url\":\"GoBack#{\\\"Level\\\":\\\"1\\\"}\",\"Jump\":\"1\",\"Kind\":\"2\"}",
+                                leftBtn1 = "static/images/left.png",
+                                skidFlag = true,
+                                showScrollBar = false,
+                                title = title,
+                                showTitle = true,
+                                statusBarStyle = "default",
+                                textColor = "FFFFFF",
+                                backgroudColor = "FD7538",
+                                modulePath = template,
+                                moduleVersion = 1,
+                            });
+                        }
+                    }
+                }
+            }
+        }
+        List<string> SystemFiles;
+        private void GetSystemFiles(OssConfigs ossConfigs, string Kind = "default")
+        {
+            SystemFiles = new List<string>();
+            var client = new OssClient(ossConfigs.Endpoint, ossConfigs.Key, ossConfigs.Secret);
+            var listObjectsRequest = new ListObjectsRequest(ossConfigs.BucketName);
+            listObjectsRequest.MaxKeys = 1000;
+            listObjectsRequest.Prefix = "template/app/" + Kind + "/";
+            var result = client.ListObjects(listObjectsRequest);
+            foreach (var summary in result.ObjectSummaries)
+            {
+                SystemFiles.Add(summary.Key);
+            }
+        }
     }
 }

appsettings.Development.json

@@ -31,6 +31,13 @@
     "Cache": "47.109.31.237:6379,password=klm@redis,defaultDatabase=13,poolsize=50,ssl=false,writeBuffer=10240,prefix=cache:",
     "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/",
+    "Endpoint": "oss-cn-chengdu.aliyuncs.com",
+    "Key": "LTAI5tAp9ASZtq4wYzuXfeer",
+    "Secret": "N0o6TwowU8r4aeNWoefMnnus9Q2saW",
+    "BucketName": "kexiaoshuang"
+  },
   "JwtSettings": {
     "Issuer": "ym", //即token的签发者。
     "Audience": "ym", //指该token是服务于哪个群体的（群体范围）