From e869d2fe4b0e850267c9540d249fb01d28a95bb8 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 27 九月 2024 09:43:12 +0800
Subject: [PATCH] test
---
store/index.js | 566 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 517 insertions(+), 49 deletions(-)
diff --git a/store/index.js b/store/index.js
index 73a7dd7..ddeeac3 100644
--- a/store/index.js
+++ b/store/index.js
@@ -282,15 +282,22 @@
commit("setDataSApi", '');
commit("setMongodbSvr", '');
if (ser[ser.length - 1] == 'mobox3') { //鍒ゆ柇鍦板潃鏄惁鏄疢obox3
- var orgSApi = "http://" + ser[0].split(':')[0] + ":5101/";
- var mobxoSApi = "http://" + ser[0].split(':')[0] + ":5102/";
- var dataSApi = "http://" + ser[0].split(':')[0] + ":5103/";
- var mongodbSvr = "http://" + ser[0].split(':')[0] + ":5201/";
+
+ const orgsport = univerifyInfo.orgsport || 5101
+ const moboxsport = univerifyInfo.moboxsport || 5102
+ const datasport = univerifyInfo.datasport || 5103
+ const mongodbsport = univerifyInfo.mongodbsport || 5201
+
+ var orgSApi = "http://" + ser[0].split(':')[0] + ":" + orgsport + "/";
+ var mobxoSApi = "http://" + ser[0].split(':')[0] + ":" + moboxsport + "/";
+ var dataSApi = "http://" + ser[0].split(':')[0] + ":" + datasport + "/";
+ var mongodbSvr = "http://" + ser[0].split(':')[0] + ":" + mongodbsport + "/";
if (univerifyInfo.server.includes("://")) {
- orgSApi =ser[0] + "//" + ser[2].split(':')[0] + ":5101/";
- mobxoSApi = ser[0] + "//" + ser[2].split(':')[0] + ":5102/";
- dataSApi =ser[0] + "//" + ser[2].split(':')[0] + ":5103/";
- mongodbSvr = ser[0] + "//" + ser[2].split(':')[0] + ":5201/";
+ orgSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + orgsport + "/";
+ mobxoSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + moboxsport + "/";
+ dataSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + datasport + "/";
+ mongodbSvr = ser[0] + "//" + ser[2].split(':')[0] + ":" + mongodbsport +
+ "/";
}
commit("setOrgSApi", orgSApi);
commit("setMobxoSApi", mobxoSApi);
@@ -356,7 +363,7 @@
url = state.OIMoboxSAPI + 'api/app/area/GetList?sessionid=' + state
.loginProvider.loginid.result.session_id;
univerifyInfo = {
- app_type: "MES",
+ app_type: univerifyInfo.app_type || "MES",
};
header = {};
}
@@ -380,7 +387,29 @@
// })
// reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
// }
- const ret = res.data;
+ var ret = res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哸reaFunc銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.code == '00000' || ret.err_code == 0) {
commit("areaFunc", ret);
resolve(ret);
@@ -412,7 +441,29 @@
dataType: "json",
success: (_res) => {
// console.log(_res);
- const ret = _res.data
+ var ret = _res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏咷etFuncTree銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.err_code == 0) {
// commit("areaFunc",ret);
resolve(ret);
@@ -460,7 +511,29 @@
// })
// reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
// }
- const ret = res.data
+ var ret = res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哻lassAttrList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.code == '00000') {
commit("classAttrList", ret);
resolve(ret);
@@ -502,7 +575,29 @@
},
success: (res) => {
console.log(res);
- const ret = res.data
+ var ret = res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哻lassGridStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.code == '00000') {
// var data ={};
// Vue.set(data,univerifyInfo.name,ret);
@@ -553,7 +648,29 @@
// })
// reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
// }
- const ret = res.data
+ var ret = res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏唖ubClassAttrList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.code == '00000') {
commit("subClassAttrList", ret);
resolve(ret);
@@ -602,7 +719,29 @@
// })
// reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
// }
- const ret = res.data
+ var ret = res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏唖ubClassGridStyleInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.code == '00000') {
// var data ={};
// Vue.set(data,univerifyInfo.name,ret);
@@ -646,7 +785,29 @@
},
success: (res) => {
// console.log(res);
- const ret = res.data
+ var ret = res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哾icValueInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.code == '00000') {
state.thisDictName = univerifyInfo.dic_name
commit("dicValueInfo", ret);
@@ -688,7 +849,29 @@
},
success: (res) => {
// console.log(res);
- const ret = res.data
+ var ret = res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏咲ataObjRunCustomEventInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.code == '00000') {
commit("DataObjRunCustomEventInfo", ret);
resolve(ret);
@@ -733,14 +916,32 @@
header: header,
success: (res) => {
// console.log(res);
- try {
- res = JSON.parse(res.data);
- } catch (e) {
- res = res.data;
+ var ret = res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏唓uerySelpsn銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
}
- if (res.code == '00000' || res.err_code == 0) {
- commit("querySelpsn", res);
- resolve(res);
+
+
+ if (ret.code == '00000' || ret.err_code == 0) {
+ commit("querySelpsn", ret);
+ resolve(ret);
} else {
reject({
"errMsg": ret.msg || ret.err_msg
@@ -786,7 +987,28 @@
header: header,
success: (res) => {
console.log(res);
- const ret = res.data;
+ var ret = res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哖rojectGetAnalysisList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
if (ret.code == '00000') {
commit("ProjectGetAnalysisList", ret);
resolve(ret);
@@ -833,7 +1055,28 @@
// })
// reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
// }
- const ret = res.data;
+ var ret = res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哸ddclassattr銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
if (ret.code == '00000') {
commit("addclassattr", ret);
resolve(ret);
@@ -867,7 +1110,28 @@
},
success: (res) => {
console.log(res);
- const ret = res.data;
+ var ret = res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏咲elObj銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
if (ret.code == '00000') {
commit("DelObj", ret);
resolve(ret);
@@ -902,7 +1166,28 @@
dataType: "json",
success: (_res) => {
// console.log(_res);
- const ret = _res.data
+ var ret = _res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哻lassAttrGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
if (ret.err_code == 0) {
commit("classAttrList", ret);
resolve(ret);
@@ -935,7 +1220,29 @@
dataType: "json",
success: (_res) => {
// console.log(_res);
- const ret = _res.data
+ var ret = _res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏唖ubClassAttrGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.err_code == 0) {
commit("subClassAttrList", ret);
resolve(ret);
@@ -968,7 +1275,29 @@
dataType: "json",
success: (_res) => {
// console.log(_res);
- const ret = _res.data
+ var ret = _res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏咲ictItemGetList銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.err_code == 0) {
resolve(ret);
} else {
@@ -1000,7 +1329,29 @@
dataType: "json",
success: (_res) => {
// console.log(_res);
- const ret = _res.data
+ var ret = _res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏咲ictGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.err_code == 0) {
resolve(ret);
} else {
@@ -1033,7 +1384,29 @@
dataType: "json",
success: (_res) => {
// console.log(_res);
- const ret = _res.data
+ var ret = _res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哻reateDataObj銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
+
+
if (ret.err_code == 0) {
resolve(ret);
} else {
@@ -1057,7 +1430,8 @@
state
}, univerifyInfo) {
return new Promise((resolve, reject) => {
- // console.log(state.loginProvider.loginid.result.session_id);
+ // console.log(state.loginProvider.loginid.result.session_id);
+ // console.log(state.OIDataSAPI)
uni.request({
url: state.OIDataSAPI + 'api/class/uistyle/GetInfo?sessionid=' + state
.loginProvider.loginid.result.session_id,
@@ -1066,18 +1440,37 @@
dataType: "json",
success: (_res) => {
console.log(_res);
- const ret = _res.data
+ var ret = _res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哢IStyleGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
if (ret.err_code == 0) {
- // commit("areaFunc",ret);
resolve(ret);
} else {
reject({
- "errMsg": ret.err_msg
+ "errMsg": ret.err_msg || ret.errMsg
});
}
},
fail: (err) => {
- // console.log(err);
+ console.log("fail", err);
reject(err);
}
})
@@ -1099,13 +1492,32 @@
dataType: "json",
success: (_res) => {
// console.log(_res);
- const ret = _res.data
+ var ret = _res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏唕unCustomEvent銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
if (ret.err_code == 0) {
- // commit("areaFunc",ret);
resolve(ret);
} else {
reject({
- "errMsg": ret.err_msg
+ "errMsg": ret.err_msg || ret.errMsg
});
}
},
@@ -1132,13 +1544,31 @@
dataType: "json",
success: (_res) => {
// console.log(_res);
- const ret = _res.data
+ var ret = _res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哾ataObjDel銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�)
+ }
+ }
if (ret.err_code == 0) {
- // commit("areaFunc",ret);
resolve(ret);
} else {
reject({
- "errMsg": ret.err_msg
+ "errMsg": ret.err_msg || ret.errMsg
});
}
},
@@ -1165,13 +1595,32 @@
dataType: "json",
success: (_res) => {
// console.log(_res);
- const ret = _res.data
+ var ret = _res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哾ataObjQuery銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
if (ret.err_code == 0) {
- // commit("areaFunc",ret);
resolve(ret);
} else {
reject({
- "errMsg": ret.err_msg
+ "errMsg": ret.err_msg || ret.errMsg
});
}
},
@@ -1198,13 +1647,32 @@
dataType: "json",
success: (_res) => {
// console.log(_res);
- const ret = _res.data
+ var ret = _res.data
+ if (typeof ret == 'string') {
+ try {
+ try {
+ try {
+ ret = JSON.parse(ret.replace(/\\"/g, '"'));
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\/g, '\\\\'))
+ }
+ } catch (ex) {
+ ret = JSON.parse(ret.replace(/\\"/g, "'").replace(
+ /[\r\n]/g,
+ '<br>').replace(/[\t]/g, ' '));
+ }
+ } catch (ex) {
+ console.log(ret)
+ return reject(
+ '灏哸ppGetInfo銆恓son string銆戣浆鎹负銆恓son object銆戝け璐�
+ )
+ }
+ }
if (ret.err_code == 0) {
- // commit("areaFunc",ret);
resolve(ret);
} else {
reject({
- "errMsg": ret.err_msg
+ "errMsg": ret.err_msg || ret.errMsg
});
}
},
--
Gitblit v1.9.1