Browse Source

模板读取数据库

lichunlei 5 months ago
parent
commit
1dce768f7b
3 changed files with 10 additions and 4 deletions
  1. 1 1
      Controllers/Admin/MakeDataController.cs
  2. 6 0
      Model/Dto/Admin/ApiDocQueryDto.cs
  3. 3 3
      Task/MakeHelper.cs

+ 1 - 1
Controllers/Admin/MakeDataController.cs

@@ -63,7 +63,7 @@ namespace Controllers.Admin
         [Route("/v1/omega_make/StaticFile/apiDocQuery")]
         public string apiDocQuery([FromQuery] ApiDocQueryDto param)
         {
-            var response = _MakeDataService.GetFirst(m => m.dataId == param.id && m.makeFileType == "apidoc").Adapt<GetMakeDataQueryVo>();
+            var response = _MakeDataService.GetFirst(m => m.dataId == param.id && m.makeFileType == param.fileType) ?? new MakeData();
             var docContent = Function.ReadInstance(response.makeFilePath + response.makeFileName);
             return docContent;
         }

+ 6 - 0
Model/Dto/Admin/ApiDocQueryDto.cs

@@ -13,5 +13,11 @@ namespace Dto.Admin
         public int id { get; set; }
 
 
+        /// <summary>
+        /// 文件类型
+        /// </summary>
+        public string fileType { get; set; }
+
+        
     }
 }

+ 3 - 3
Task/MakeHelper.cs

@@ -46,12 +46,12 @@ namespace Tasks
             //附加数据,原样返回
             string attach = jsonObj["attach"].ToString();
             //读取模板文件内容
-            string templateString = Function.ReadInstance("Template/" + modePath + ".json");
+            // string templateString = Function.ReadInstance("Template/" + modePath + ".json");
             var templateService = App.GetRequiredService<IMakeTemplateService>();
             var template = templateService.GetFirst(m => m.templateName == modePath);
             if(template == null) return;
-            // string templateString = template.templateContent;
-            // templateString = HttpUtility.UrlDecode(templateString);
+            string templateString = template.templateContent;
+            templateString = HttpUtility.UrlDecode(templateString);
             //解析模板内容
             string resultString = await Util.Maker.StartMake(jsonObj["data"], templateString);
             //生成文件