修改

DocTools/CreateDocHtml.cs

@@ -1,6 +1,7 @@
 using DocTools.Entity;
 using DocTools.Entity.Doc;
 using DocTools.Helper;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -284,7 +285,7 @@ namespace DocTools
                                         type = "Text",
                                         field_type = "String",
                                         value = "Upload Fail"
-                                   }
+                                    }
                                 }
                             },
                             success = new ResponseResultEntity()
@@ -309,15 +310,17 @@ namespace DocTools
                                         type = "Text",
                                         field_type = "String",
                                         value = ""
-                                   }
+                                    }
                                 }
                             }
                         };
                         var fileInfo = methodEntity.RequestList?.FirstOrDefault()?.ParamPropertyList?.Find(c => c.Name == "File") ?? new ParamPropertyEntity();
                         var dafultFieldType = CommonHelper.GetJsonDataTypeByString(fileInfo.TypeFullName);
-                        var requestBodyEntity = new RequestBodyEntity()
+                        var requestBodyEntity = new RequestBodyEntity();
+                            
+                        requestBodyEntity = new RequestBodyEntity()
                         {
-                            mode = "form-data",
+                            mode = "byte",
                             parameter = new List<ResponseParameterEntity>()
                             {
                                 new ResponseParameterEntity()
@@ -334,6 +337,7 @@ namespace DocTools
                             raw = "",
                             raw_para = new List<ResponseParameterEntity>()
                         };
+                            
                         var headerParameterRequest = new List<object>();
                         var headerParamList = methodEntity.RequestList?.FirstOrDefault()?.ParamPropertyList?.FindAll(c => c.Name != "File") ?? new List<ParamPropertyEntity>();
                         if (headerParamList?.Count > 0)
@@ -358,7 +362,7 @@ namespace DocTools
                         };
                         childEntity.request = new RequestEntity()
                         {
-                            url = url + "存储桶地址/文件名【此请求地址为动态地址，实际值为上传文件权鉴接口返回的StorageUrl字段的值】",
+                            url = url + "文件名【此请求地址为动态地址，实际值为上传文件权鉴接口返回的StorageUrl字段的值】",
                             resful = new RequestParameterEntity(),
                             query = new RequestParameterEntity(),
                             header = headerRequest,
@@ -449,13 +453,10 @@ namespace DocTools
                             error_result = new List<ExceptionResultEntity>()
                         };
                         //计算响应列表枚举
-                        if (methodEntity.ParaList?.Count > 0)
+                        if (!string.IsNullOrEmpty(methodEntity.ErrorCodes))
                         {
-                            foreach (var item in methodEntity.ParaList)
-                            {
-                                var gere = GetExceptionResultEnum(item);
-                                successParameter.error_result.Add(gere);
-                            }
+                            var gere = GetExceptionResultEnum(methodEntity.ErrorCodes);
+                            successParameter.error_result.Add(gere);
                         }
                         var rawResultStr = "";
                         if (methodEntity.ResponseList?.Count > 0)
@@ -946,31 +947,50 @@ namespace DocTools
         {
             var resultEntity = new ExceptionResultEntity();
             List<MemberEntity> memberList = LoadData.GetInterfaceConfigToCache();
-            var enumInfo = memberList.Find(c => c.ParamName.Contains("T:WingInterfaceLibrary.Enum.RpcExceptionEnum." + enumNamespace) && !string.IsNullOrEmpty(c.Remarks));
+            var enumInfo = memberList.Find(c => c.ParamName.Contains("T:WingInterfaceLibrary.Enum.CustomerRpcCode") && !string.IsNullOrEmpty(c.Remarks));
             if (enumInfo != null)
             {
-                //获取错误枚举、上传文件类型枚举
-                var enumList = memberList.FindAll(c => c.ParamName.Contains(enumInfo.ParamName.Replace("T:", "")));
-                if (enumList?.Count > 0)
+                var key = enumInfo.ParamName.Replace("T:", "");
+                resultEntity.title = enumInfo.Summary;
+                resultEntity.name = enumInfo.Summary;
+                resultEntity.url = "/" + FileName + "#" + PublicEnumDic[key];
+                resultEntity.header = enumInfo.Remarks.Split('|').ToArray().Select(c => c.Trim()).ToList();
+
+                if (enumNamespace.Split(',').Length > 0)
                 {
-                    foreach (var item in enumList)
+                    for (var i = 0; i < enumNamespace.Split(',').Length; i++)
                     {
-                        if (item.ParamName.Equals(enumInfo.ParamName))
-                        {
-                            //title，name，和header
-                            resultEntity.title = item.Summary;
-                            resultEntity.name = enumNamespace;
-                            resultEntity.header = item.Remarks.Split('|').ToArray().Select(c => c.Trim()).ToList();
-                        }
-                        else
+                        var item = enumNamespace.Split(',')[i];
+                        if (!string.IsNullOrEmpty(item) && item.Split('|').Length > 2)
                         {
                             var ece = new ExceptionContentEntity();
-                            ece.content_data = item.Summary.Split('|').ToArray().Select(c => c.Trim()).ToList();
-                            //content
+                            ece.content_data = item.Split('|').ToArray().Select(c => c.Trim()).ToList();
                             resultEntity.content.Add(ece);
                         }
                     }
                 }
+                ////获取错误枚举、上传文件类型枚举
+                //var enumList = memberList.FindAll(c => c.ParamName.Contains(enumInfo.ParamName.Replace("T:", "")));
+                //if (enumList?.Count > 0)
+                //{
+                //    foreach (var item in enumList)
+                //    {
+                //        if (item.ParamName.Equals(enumInfo.ParamName))
+                //        {
+                //            //title，name，和header
+                //            resultEntity.title = item.Summary;
+                //            resultEntity.name = enumNamespace;
+                //            resultEntity.header = item.Remarks.Split('|').ToArray().Select(c => c.Trim()).ToList();
+                //        }
+                //        else
+                //        {
+                //            var ece = new ExceptionContentEntity();
+                //            ece.content_data = item.Summary.Split('|').ToArray().Select(c => c.Trim()).ToList();
+                //            //content
+                //            resultEntity.content.Add(ece);
+                //        }
+                //    }
+                //}
             }
             return resultEntity;
         }
@@ -985,13 +1005,28 @@ namespace DocTools
         /// <returns>封装好的实体</returns>
         public ChildrenEntity GetSpecialEnum(string enumNamespace, string local_target_id, string formatterDesc = "代码 | 错误描述", int index = 0)
         {
+            var strTable = "";
             var enumName = string.Empty;
-            var errorEnumStr = string.Empty;
             List<MemberEntity> memberList = LoadData.GetInterfaceConfigToCache();
             //获取错误枚举、上传文件类型枚举
             var enumList = memberList.FindAll(c => c.ParamName.Contains(enumNamespace));
             if (enumList?.Count > 0)
             {
+                strTable = "<table>";
+                if (!string.IsNullOrEmpty(formatterDesc))
+                {
+                    var headerList = formatterDesc.Split('|');
+                    if (headerList?.Length > 1)
+                    {
+                        strTable += "<thead><tr>";
+                        foreach (var headItem in headerList)
+                        {
+                            strTable += "<th>" + headItem.Trim() + "</th>";
+                        }
+                        strTable += "</tr></thead>";
+                    }
+                }
+                strTable += "<tbody>";
                 foreach (var item in enumList)
                 {
                     if (item.ParamName.Equals("T:" + enumNamespace))
@@ -1000,9 +1035,22 @@ namespace DocTools
                     }
                     else
                     {
-                        errorEnumStr += "\n" + item.Summary;
+                        if (!string.IsNullOrEmpty(item.Summary))
+                        {
+                            var bodyList = item.Summary.Split('|');
+                            if (bodyList?.Length > 1)
+                            {
+                                strTable += "<tr>";
+                                foreach (var bodyItem in bodyList)
+                                {
+                                    strTable += "<td>" + bodyItem.Trim() + "</td>";
+                                }
+                                strTable += "</tr>";
+                            }
+                        }
                     }
                 }
+                strTable += "</tbody></table>";
             }
             var errorEntity = new ChildrenEntity()
             {
@@ -1033,11 +1081,13 @@ namespace DocTools
                 request = new RequestEntity()
                 {
                     url = "",
+                    requestId = Guid.NewGuid().ToString(),
                     resful = new RequestParameterEntity(),
                     query = new RequestParameterEntity(),
                     header = new RequestParameterEntity(),
                     Event = new ScriptEntity(),
-                    description = formatterDesc + "\n--- | ---" + errorEnumStr,
+                    //description = formatterDesc + "\n--- | ---" + errorEnumStr,
+                    description = strTable,
                     cookie = new RequestParameterEntity(),
                     body = new RequestBodyEntity()
                     {

DocTools/Entity/Doc/RequestEntity.cs

@@ -4,6 +4,7 @@ namespace DocTools.Entity.Doc
 {
     public class RequestEntity
     {
+        public string requestId { get; set; } = string.Empty;
         public string url { get; set; } = string.Empty;
         public RequestParameterEntity resful { get; set; } = new RequestParameterEntity();
         public RequestParameterEntity query { get; set; } = new RequestParameterEntity();

DocTools/Entity/Doc/ResponseEntity.cs

@@ -43,6 +43,8 @@ namespace DocTools.Entity.Doc
 
         public string name { get; set; } = string.Empty;
 
+        public string url { get; set; } = string.Empty;
+
         public List<string> header { get; set; } = new List<string>();
 
         public List<ExceptionContentEntity> content { get; set; } = new List<ExceptionContentEntity>();

DocTools/Entity/InterfaceBasicInfoEntity.cs

@@ -16,7 +16,7 @@ namespace DocTools.Entity
     {
         public List<InterfaceBasicInfoEntity> InterfaceList = new List<InterfaceBasicInfoEntity>();
         public string Value { get; set; } = string.Empty;
-        public string Url { get; set; } = "http://192.168.6.117/";
+        public string Url { get; set; } = "http://存储服务域名/";
     }
 
 

DocTools/Entity/MemberEntity.cs

@@ -12,7 +12,7 @@ namespace DocTools.Entity
         public string Remarks { get; set; } = string.Empty;
         public string Code { get; set; } = "1";
         public string Example { get; set; } = "";
-        public string Para { get; set; } = "";
+        public string ErrorCodes { get; set; } = "";
         public bool C { get; set; } = true;
     }
 

DocTools/Entity/MethodEntity.cs

@@ -15,7 +15,7 @@ namespace DocTools.Entity
         public string ParamTypeFullName { get; set; } = string.Empty;
         public string ParamText { get; set; } = string.Empty;
         public string SubmitType { get; set; } = "POST";
-        public List<string> ParaList { get; set; } = new List<string>();
+        public string ErrorCodes { get; set; } = string.Empty;
 
         public List<ParamPropertyEntity> RequestList = new List<ParamPropertyEntity>();
 

DocTools/Helper/CommonHelper.cs

@@ -16,12 +16,12 @@ namespace DocTools.Helper
         {
             var enumStr = "";
             string result;
-            if (typeStr.Contains("AccountString") || typeStr.Contains("BaseParamsString") || typeStr.Contains("BaseString") || typeStr.Contains("EmailString") 
-                || typeStr.Contains("PasswordString") || typeStr.Contains("PhoneString") || typeStr.Contains("UrlString") || typeStr.Contains("VerificationCode"))
-            {
-                typeStr = "System.String";
-            }
-            else if (typeStr.Contains("WingInterfaceLibrary") && typeStr.Contains("`1"))
+            //if (typeStr.Contains("AccountString") || typeStr.Contains("BaseParamsString") || typeStr.Contains("BaseString") || typeStr.Contains("EmailString") 
+            //    || typeStr.Contains("PasswordString") || typeStr.Contains("PhoneString") || typeStr.Contains("UrlString") || typeStr.Contains("VerificationCode"))
+            //{
+            //    typeStr = "System.String";
+            //} else
+            if (typeStr.Contains("WingInterfaceLibrary") && typeStr.Contains("`1"))
             {
                 typeStr = "Object";
             }

DocTools/LoadData.cs

@@ -74,9 +74,9 @@ namespace DocTools
                             {
                                 entity.Example = childNode.InnerText.Trim();
                             }
-                            else if (childNode.Name == "para")
+                            else if (childNode.Name == "errorCodes")
                             {
-                                entity.Para = childNode.InnerText.Trim();
+                                entity.ErrorCodes = childNode.InnerText.Trim();
                             }
                             else if (childNode.Name == "show")
                             {
@@ -97,7 +97,7 @@ namespace DocTools
         /// 封装接口和成员信息
         /// </summary>
         /// <returns>封装号的实体</returns>
-        public static List<APIModuleEntity> PackageInterfaceMemberInfo(string classNamespace = "T:WingInterfaceLibrary.Interface.I")
+        public static List<APIModuleEntity> PackageInterfaceMemberInfo(string classNamespace = "T:WingInterfaceLibrary.Interface.IIdentityApplyService")
         {
             var moduleList = new List<APIModuleEntity>();
             var memberList = GetInterfaceConfigToCache();
@@ -182,12 +182,9 @@ namespace DocTools
                                         {
                                             methodModel.ParamTypeFullName = methodItem.ParamName.Split('(')[1].TrimEnd(')');
                                         }
-                                        if (!string.IsNullOrEmpty(methodItem.Para) && methodItem.Para.Split(',').Length > 0)
+                                        if (!string.IsNullOrEmpty(methodItem.ErrorCodes))
                                         {
-                                            foreach (var paraItem in methodItem.Para.Split(','))
-                                            {
-                                                methodModel.ParaList.Add(paraItem);
-                                            }
+                                            methodModel.ErrorCodes = methodItem.ErrorCodes;
                                         }
                                         if (!string.IsNullOrEmpty(methodModel.ParamTypeFullName))
                                         {