调整生成

Controllers/Admin/ApiGroupController.cs

@@ -115,8 +115,8 @@ namespace Controllers.Admin
         public IActionResult makeApiDoc([FromBody] ApiGroup param)
         {
             TokenModel loginUser = JwtUtil.GetLoginUser(HttpContext);
-            _ApiGroupService.makeApiDoc(param.serviceId, loginUser);
-            return SUCCESS("ok");
+            var response = _ApiGroupService.makeApiDoc(param.serviceId, loginUser);
+            return SUCCESS(response);
         }
 
 

Model/Base/OptionsSetting.cs

@@ -20,6 +20,7 @@ namespace Infrastructure.Model
         /// </summary>
         public bool InitDb { get; set; }
         public MailOptions MailOptions { get; set; }
+        public BaseConfigs BaseConfigs { get; set; }
         public Upload Upload { get; set; }
         public ALIYUN_OSS ALIYUN_OSS { get; set; }
         public JwtSettings JwtSettings { get; set; }
@@ -43,6 +44,13 @@ namespace Infrastructure.Model
         public string Signature { get; set; }
     }
     /// <summary>
+    /// 基础配置
+    /// </summary>
+    public class BaseConfigs
+    {
+        public string gatewayHost { get; set; }
+    }
+    /// <summary>
     /// 上传
     /// </summary>
     public class Upload

Model/Vo/Admin/MakeApiDocVo.cs

@@ -0,0 +1,16 @@
+using Newtonsoft.Json;
+
+namespace Vo.Admin
+{
+    /// <summary>
+    /// 详情
+    /// </summary>
+    public class MakeApiDocVo
+    {
+        /// <summary>
+        /// 文档地址
+        /// </summary>
+        public string docUrl { get; set; }
+
+    }
+}

Services/ApiGroupService.cs

@@ -8,6 +8,7 @@ using Vo.Admin;
 using Common;
 using Custom;
 using Tasks;
+using Infrastructure;
 
 
 namespace Services
@@ -50,7 +51,7 @@ namespace Services
         /// 生成api文档
         /// </summary>
         /// <param name="serviceId">服务id</param>
-        public void makeApiDoc(int serviceId, TokenModel loginUser)
+        public MakeApiDocVo makeApiDoc(int serviceId, TokenModel loginUser)
         {
             var service = Feign.IProject.getProjectService(serviceId);
             var apiGroups = GetList(m => m.serviceId == serviceId);
@@ -66,7 +67,12 @@ namespace Services
             pushData.Add("serviceTitle", service.serviceTitle);
             pushData.Add("apiGroup", apiGroups);
             pushData.Add("apiInfo", apiInfos);
-            MakeHelper.Push(pushData, "apifoxDoc", "apidoc", loginUser.username);
+            MakeHelper.Push(pushData, "apifoxDoc", "apidoc", loginUser.username, service.id.ToString());
+            var options = App.OptionsSetting;
+            return new MakeApiDocVo()
+            {
+                docUrl = options.BaseConfigs.gatewayHost + "/v1/omega_make/StaticFile/apiDocQuery?id=" + service.id
+            };
         }
 
         /// <summary>

Services/IService/IApiGroupService.cs

@@ -21,7 +21,7 @@ namespace Services
         /// 生成api文档
         /// </summary>
         /// <param name="serviceId">服务id</param>
-        void makeApiDoc(int serviceId, TokenModel loginUser);
+        MakeApiDocVo makeApiDoc(int serviceId, TokenModel loginUser);
 
 
         /// <summary>

Task/MakeHelper.cs

@@ -64,7 +64,7 @@ namespace Tasks
         }
 
 
-        public static void Push(Dictionary<string, object> pushData, string modePath, string fileType, string createBy = "系统")
+        public static void Push(Dictionary<string, object> pushData, string modePath, string fileType, string createBy = "系统", string dataId = "0")
         { 
             MakeData makeData = new();
             string requestId = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Function.get_Random(8);
@@ -72,6 +72,7 @@ namespace Tasks
             makeData.modePath = modePath;
             Dictionary<string, string> attach = new();
             attach.Add("fileType", fileType);
+            attach.Add("dataId", dataId);
             attach.Add("createBy", createBy);
             makeData.attach = Newtonsoft.Json.JsonConvert.SerializeObject(attach);
             makeData.data = pushData;