Browse Source

调整小工具bug

denny 2 years ago
parent
commit
dba445ba99

+ 7 - 8
Tools/GeneralDocTool/AppSettings.json

@@ -1,10 +1,9 @@
 {
-    "InterfaceService":{
-      "DLLPath":"F:\\DingDing Download\\"
-    },
-    "ReponseService":{
-      "DocHtmlPath": "D:\\Project\\git\\wingsolutionMaster\\WingCloudServer\\src\\bin\\Debug\\net6.0\\Services\\DocHtml.html",
-      "SecondService": ""
-    }
+  "InterfaceService":{
+    "DLLPath":"D:\\Project\\git\\wingsolutionMaster\\WingInterfaceLibrary\\src\\bin\\Debug\\netstandard2.0\\"
+  },
+  "ReponseService":{
+    "DocHtmlPath": "D:\\Project\\git\\wingsolutionMaster\\WingCloudServer\\src\\bin\\Debug\\net6.0\\DocHtml.html",
+    "SecondService": ""
   }
-  
+}

+ 1 - 1
Tools/GeneralDocTool/Helper/ConfigurationManager.cs

@@ -15,7 +15,7 @@ namespace WingCloudServer.GeneralDocTools.Helper
 
         static ConfigurationManager()
         {
-            var configFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "AppSettings.json");
+            var configFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "AppSettings.json").Replace("\\bin\\Debug\\net6.0", "");
             _parameters = ParameterSerializer.Deserialize(configFilePath);
         }
 

+ 1 - 1
Tools/GeneralDocTool/Program.cs

@@ -50,7 +50,7 @@ namespace WingCloudServer.GeneralDocTools
                 var fileName = secondService + Path.GetFileName(resPath);
                 var resEntity = doc.CreateDocProjectString(InterfaceDllVersion, fileName);
                 var json = JsonConvert.SerializeObject(resEntity).Replace("\"Event\":", "\"event\":");
-                var readXMLPath = AppDomain.CurrentDomain.BaseDirectory + "\\XML.htm";
+                var readXMLPath = AppDomain.CurrentDomain.BaseDirectory.Replace("\\bin\\Debug\\net6.0", "") + "XML.htm";
                 var htmlContent = File.ReadAllText(readXMLPath);
                 var resultHtml = htmlContent.Replace("$GetExportDocHtml()", json);
                 if (File.Exists(resPath))

+ 13 - 4
Tools/GeneralDocTool/Service/LoadData.cs

@@ -111,7 +111,7 @@ namespace WingCloudServer.GeneralDocTools.Service
             var memberList = GetInterfaceConfigToCache();
             var otherApiModuleList = new List<QueryMethodMemberEntity>();
             //获取一级目录,其中Show为true,表示显示,其他为不显示
-            var firstMemberList = memberList.FindAll(c => c.ParamName.Contains("T:WingInterfaceLibrary.") && !string.IsNullOrEmpty(c.DocFirstDirectory) && c.Show).Select(d => d.DocFirstDirectory).Distinct().ToList();
+            var firstMemberList = memberList.FindAll(c => c.ParamName.Contains("T:WingInterfaceLibrary.") && !string.IsNullOrEmpty(c.DocFirstDirectory) && c.Show && c.DocFirstDirectory == "AI诊断API").Select(d => d.DocFirstDirectory).Distinct().ToList();
             if (firstMemberList != null && firstMemberList.Count > 0)
             {
                 //添加枚举一级目录,枚举
@@ -190,10 +190,17 @@ namespace WingCloudServer.GeneralDocTools.Service
                                         otherApiModuleList.Add(queryItem);
                                         continue;
                                     }
+                                    // if (methodItem.DocFirstDirectory == "预约会诊服务" && methodItem.ParamName == "M:WingInterfaceLibrary.LiveConsultation.ILiveConsultationService.SendInteractiveBoardDataAsync(WingInterfaceLibrary.LiveConsultation.Consultation.SendInteractiveBoardDataRequest)")
+                                    // {
+                                    //     Console.WriteLine("预约会诊服务");
+                                    // }
                                     if (!entity.MethodList.Exists(c => c.MethodNameSpace == methodItem.ParamName))
                                     {
                                         var methodModel = PackageInterfaceMethod(methodItem, interfaceModel, item.DocFirstDirectory, memberList, type);
-                                        entity.MethodList.Add(methodModel);
+                                        if (methodModel != null) 
+                                        {
+                                            entity.MethodList.Add(methodModel);
+                                        }
                                     }
                                 }
                             }
@@ -253,9 +260,11 @@ namespace WingCloudServer.GeneralDocTools.Service
                                             if (!curMainModelInfo.MethodList.Exists(c => c.MethodNameSpace == item.MethodInfo.ParamName))
                                             {
                                                 var methodModel = PackageInterfaceMethod(item.MethodInfo, item.InterfaceEntity, item.DocFirstDirectory, memberList, item.InterfaceType);
-                                                curMainModelInfo.MethodList.Add(methodModel);
+                                                if (methodModel != null) 
+                                                {
+                                                    curMainModelInfo.MethodList.Add(methodModel);
+                                                }
                                             }
-                                                
                                             if (curMainModelInfo.MethodList.Count <= 0)
                                             {
                                                 continue;