|
@@ -1,5 +1,6 @@
|
|
|
using System.Collections;
|
|
using System.Collections;
|
|
|
using System.Text.RegularExpressions;
|
|
using System.Text.RegularExpressions;
|
|
|
|
|
+using System.Web;
|
|
|
using Common;
|
|
using Common;
|
|
|
using Infrastructure;
|
|
using Infrastructure;
|
|
|
using LitJson;
|
|
using LitJson;
|
|
@@ -49,10 +50,17 @@ namespace Tasks
|
|
|
var template = templateService.GetFirst(m => m.templateName == modePath);
|
|
var template = templateService.GetFirst(m => m.templateName == modePath);
|
|
|
if(template == null) return;
|
|
if(template == null) return;
|
|
|
string templateString = template.templateContent;
|
|
string templateString = template.templateContent;
|
|
|
|
|
+ templateString = HttpUtility.UrlDecode(templateString);
|
|
|
//解析模板内容
|
|
//解析模板内容
|
|
|
string resultString = Util.Maker.StartMake(jsonObj["data"], templateString);
|
|
string resultString = Util.Maker.StartMake(jsonObj["data"], templateString);
|
|
|
|
|
+ //生成文件
|
|
|
|
|
+ string path = template.makePath.Substring(0, template.makePath.LastIndexOf("/") + 1);
|
|
|
|
|
+ string fileName = template.makePath.Substring(template.makePath.LastIndexOf("/") + 1);
|
|
|
|
|
+ path = Util.Maker.replaceKeyToValue(jsonObj["data"], path);
|
|
|
|
|
+ fileName = Util.Maker.replaceKeyToValue(jsonObj["data"], fileName);
|
|
|
|
|
+ Function.WritePage(path, fileName, resultString);
|
|
|
//MQ回调解析的结果
|
|
//MQ回调解析的结果
|
|
|
- RabbitMQClient.Instance.Push("MakeSqlCallBackQueue", requestId + "#cut#" + attach + "#cut#" + resultString);
|
|
|
|
|
|
|
+ // RabbitMQClient.Instance.Push("MakeSqlCallBackQueue", requestId + "#cut#" + attach + "#cut#" + resultString);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|