|
|
@@ -45,9 +45,10 @@ namespace Tasks
|
|
|
// string packageName = "123123123";
|
|
|
// }
|
|
|
//附加数据,原样返回
|
|
|
- JsonData attach = jsonObj["attach"];
|
|
|
+ JsonData attach = JsonMapper.ToObject(jsonObj["attach"].ToString());
|
|
|
string versionNo = attach["versionNo"].ToString();
|
|
|
string fileType = attach["fileType"].ToString();
|
|
|
+ string userId = attach["userId"].ToString();
|
|
|
//读取模板文件内容
|
|
|
// string templateString = Function.ReadInstance("Template/" + modePath + ".json");
|
|
|
var templateService = App.GetRequiredService<IMakeTemplateService>();
|
|
|
@@ -69,7 +70,7 @@ namespace Tasks
|
|
|
Function.WritePage(path, fileName, resultString);
|
|
|
string startPath = Function.getPath(path + fileName);
|
|
|
OssHelper.Instance.Upload(startPath);
|
|
|
- addFile(projectId, serviceId, 0, versionNo, fileName, path + fileName, path + fileName, fileType, javaVersion, "java");
|
|
|
+ addFile(projectId, serviceId, int.Parse(Function.CheckInt(userId)), versionNo, fileName, path + fileName, path + fileName, fileType, javaVersion, "java");
|
|
|
//生成数据入库
|
|
|
int dataId = int.Parse(Function.CheckInt(attach["dataId"].ToString()));
|
|
|
string makeFileType = attach["fileType"].ToString();
|