完善生成功能

Program.cs

@@ -128,7 +128,7 @@ app.MapControllers();
 app.Urls.Add("http://*:8006");
 
 
-MakeSqlHelper.Instance.Start("MakeSqlQueue");
+MakeHelper.Instance.Start("MakeSqlQueue");
 RabbitMQClient.Instance.Conn("MakeSqlCallBackQueue");
 
 app.Run();

Task/MakeHelper.cs

@@ -35,11 +35,18 @@ namespace Task
         public void DoQueue(string content)
         {
             JsonData jsonObj = JsonMapper.ToObject(content);
+            //流水号
             string requestId = jsonObj["requestId"].ToString();
+            //模板文件路径
             string modePath = jsonObj["modePath"].ToString();
-            string templateString = Function.ReadInstance("Template/" + modePath); //读取数据库sql模板
+            //附加数据，原样返回
+            string attach = jsonObj["attach"].ToString();
+            //读取模板文件内容
+            string templateString = Function.ReadInstance("Template/" + modePath);
+            //解析模板内容
             string resultString = Util.Maker.StartMake(jsonObj["data"], templateString);
-            RabbitMQClient.Instance.Push("MakeSqlCallBackQueue", requestId + "#cut#" + resultString);
+            //MQ回调解析的结果
+            RabbitMQClient.Instance.Push("MakeSqlCallBackQueue", requestId + "#cut#" + attach + "#cut#" + resultString);
         }
 
     }

Template/Sql/db.sql

@@ -11,10 +11,6 @@ CREATE table <<tableName>>(
 <<ym-loop:databaseField>>
 <<fieldName>> <<fieldType>><<ym-if:!isEmpty(<<fieldLength>>)>>(<<fieldLength>>)<</ym-if>><<ym-if:<<notNull>>=1>> not null<</ym-if>><<ym-if:<<autoIncrement>>=1>> AUTO_INCREMENT<</ym-if>><<ym-if:!isEmpty(<<fieldDefaultValue>>)>> default <<fieldDefaultValue>><</ym-if>> COMMENT <<fieldTitle>><<fieldDetail>>,
 <</ym-loop:databaseField>>
-PRIMARY KEY(
-<<ym-loop:databaseField removeEnd=",">>
-<<fieldName>>,
-<</ym-loop:databaseField>>
-)
+PRIMARY KEY(<<ym-loop:databaseField removeEnd=",">><<fieldName>>,<</ym-loop:databaseField>>)
 ) COMMENT '<<tableTitle>>' ENGINE=InnoDB DEFAULT charset=utf8mb4 COLLATE utf8mb4_general_ci;
 <</ym-loop:databaseTable>>