推送生成通知，参数增加userId

Controllers/Client/MakeCodeController.cs

@@ -47,7 +47,7 @@ namespace Controllers.Client
                 ProjectService baseInfo = IProject.getProjectService(param.serviceId);
                 string versionNo = baseInfo.devLanguage + "-" + DateTime.Now.ToString("yyyyMMddHHmmssfff");
                 Function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(baseInfo), "测试生成代码");
-                List<int> databaseIds = baseInfo.databaseList.ToList();
+                List<int> databaseIds = Tools.SpitIntArrary(baseInfo.databaseList).ToList();
                 Function.WriteLog("databaseIds:" + databaseIds.Count.ToString(), "测试生成代码");
                 foreach(var databaseId in databaseIds)
                 {

Model/Custom/ProjectService.cs

@@ -80,13 +80,13 @@ namespace Custom
         /// <summary>
         /// 服务器
         /// </summary>
-        public int[] serverList { get; set; }
+        public string? serverList { get; set; }
 
 
         /// <summary>
         /// 数据库
         /// </summary>
-        public int[] databaseList { get; set; }
+        public string? databaseList { get; set; }
 
 
         /// <summary>

Services/ApiGroupService.cs

@@ -67,7 +67,7 @@ namespace Services
             pushData.Add("serviceTitle", service.serviceTitle);
             pushData.Add("apiGroup", apiGroups);
             pushData.Add("apiInfo", apiInfos);
-            MakeHelper.Push(pushData, "apifoxDoc", "apidoc", loginUser.username, service.id.ToString());
+            MakeHelper.Push(pushData, "apifoxDoc", "apidoc", loginUser, service.id.ToString());
             var options = App.OptionsSetting;
             return new MakeApiDocVo()
             {

Services/DatabaseFieldService.cs

@@ -106,7 +106,7 @@ namespace Services
             pushData.Add("opType", "add");
             pushData.Add("tableName", tableName);
             pushData.Add("databaseField", fields);
-            MakeHelper.Push(pushData, "dbField", "dbField", loginUser.username);
+            MakeHelper.Push(pushData, "dbField", "dbField", loginUser);
         }
     }
 }

Services/DatabaseInfoService.cs

@@ -68,7 +68,7 @@ namespace Services
             Dictionary<string, object> pushData = new Dictionary<string, object>();
             pushData.Add("databaseInfo", databaseInfo);
             pushData.Add("databaseTable", tables);
-            MakeHelper.Push(pushData, "db", "db", loginUser.username);
+            MakeHelper.Push(pushData, "db", "db", loginUser);
         }
 
 

Services/DatabaseTableService.cs

@@ -208,7 +208,7 @@ namespace Services
 
             Dictionary<string, object> pushData = new Dictionary<string, object>();
             pushData.Add("databaseTable", tables);
-            MakeHelper.Push(pushData, "dbTable", "dbTable", loginUser.username);
+            MakeHelper.Push(pushData, "dbTable", "dbTable", loginUser);
         }
 
 
@@ -233,7 +233,7 @@ namespace Services
             pushData.Add("projectService", baseInfo);
             pushData.Add("databaseTable", table);
             pushData.Add("databaseFields", fields);
-            MakeHelper.Push(pushData, "model", "javaModel", loginUser.username, "0", versionNo);
+            MakeHelper.Push(pushData, "model", "javaModel", loginUser, "0", versionNo);
         }
 
 
@@ -263,7 +263,7 @@ namespace Services
             pushData.Add("projectService", baseInfo);
             pushData.Add("databaseTable", table);
             pushData.Add("apiInfos", apiInfos);
-            MakeHelper.Push(pushData, "service", "javaService", loginUser.username, "0", versionNo);
+            MakeHelper.Push(pushData, "service", "javaService", loginUser, "0", versionNo);
         }
 
 
@@ -293,7 +293,7 @@ namespace Services
             pushData.Add("projectService", baseInfo);
             pushData.Add("databaseTable", table);
             pushData.Add("apiInfos", apiInfos);
-            MakeHelper.Push(pushData, "serviceImpl", "javaServiceImpl", loginUser.username, "0", versionNo);
+            MakeHelper.Push(pushData, "serviceImpl", "javaServiceImpl", loginUser, "0", versionNo);
         }
 
 
@@ -312,7 +312,7 @@ namespace Services
             pushData.Add("apiInfo", apiInfo);
             pushData.Add("apiGroup", apiGroup);
             pushData.Add("databaseFields", apiInfo.apiParam.Where(m => m.reqParam).ToList());
-            MakeHelper.Push(pushData, "dto", "javaDto", loginUser.username, "0", versionNo);
+            MakeHelper.Push(pushData, "dto", "javaDto", loginUser, "0", versionNo);
         }
 
 
@@ -331,7 +331,7 @@ namespace Services
             pushData.Add("apiInfo", apiInfo);
             pushData.Add("apiGroup", apiGroup);
             pushData.Add("databaseFields", apiInfo.apiParam.Where(m => m.resParam).ToList());
-            MakeHelper.Push(pushData, "vo", "javaVo", loginUser.username, "0", versionNo);
+            MakeHelper.Push(pushData, "vo", "javaVo", loginUser, "0", versionNo);
         }
 
 
@@ -346,7 +346,7 @@ namespace Services
             pushData.Add("author", loginUser.username);
             pushData.Add("projectService", baseInfo);
             pushData.Add("databaseTable", table);
-            MakeHelper.Push(pushData, "mapper", "javaMapper", loginUser.username, "0", versionNo);
+            MakeHelper.Push(pushData, "mapper", "javaMapper", loginUser, "0", versionNo);
         }
 
 
@@ -364,7 +364,7 @@ namespace Services
             pushData.Add("projectService", baseInfo);
             pushData.Add("databaseTable", table);
             pushData.Add("databaseFields", fields);
-            MakeHelper.Push(pushData, "mapperXml", "javaMapperXml", loginUser.username, "0", versionNo);
+            MakeHelper.Push(pushData, "mapperXml", "javaMapperXml", loginUser, "0", versionNo);
         }
 
 
@@ -393,7 +393,7 @@ namespace Services
             pushData.Add("apiGroup", apiGroup);
             pushData.Add("apiInfos", apiInfos);
             pushData.Add("controllerName", controllerFilePath);
-            MakeHelper.Push(pushData, "controller", "javaController", loginUser.username, "0", versionNo);
+            MakeHelper.Push(pushData, "controller", "javaController", loginUser, "0", versionNo);
         }
     
     

Task/MakeHelper.cs

@@ -6,6 +6,7 @@ using Infrastructure;
 using LitJson;
 using Microsoft.CodeAnalysis.CSharp.Scripting;
 using Model;
+using Model.Base;
 using Services;
 
 namespace Tasks
@@ -64,7 +65,7 @@ namespace Tasks
         }
 
 
-        public static void Push(Dictionary<string, object> pushData, string modePath, string fileType, string createBy = "系统", string dataId = "0", string versionNo = "0")
+        public static void Push(Dictionary<string, object> pushData, string modePath, string fileType, TokenModel createBy, string dataId = "0", string versionNo = "0")
         { 
             MakeData makeData = new();
             string requestId = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Function.get_Random(8);
@@ -73,7 +74,8 @@ namespace Tasks
             Dictionary<string, string> attach = new();
             attach.Add("fileType", fileType);
             attach.Add("dataId", dataId);
-            attach.Add("createBy", createBy);
+            attach.Add("userId", createBy.userId.ToString());
+            attach.Add("createBy", createBy.username);
             attach.Add("versionNo", versionNo);
             makeData.attach = Newtonsoft.Json.JsonConvert.SerializeObject(attach);
             makeData.data = pushData;