Skip to content

Z
zhichan
Commit 2693e404 by sxy
Options

fix: system.js

parent a28f5d69
Showing with 76 additions and 71 deletions
center-manage/app/base/system.js
...@@ -16,55 +16,55 @@ class System { ...@@ -16,55 +16,55 @@ class System {
} }
} }
} }
static async delReq(url,qdata){ static async delReq(url, qdata) {
let rtn={} let rtn = {}
let promise=new Promise(function(resv,rej){ let promise = new Promise(function (resv, rej) {
request.del({ request.del({
url: url, url: url,
qs: qdata qs: qdata
}, function(error, response, body) { }, function (error, response, body) {
rtn.statusCode=response.statusCode rtn.statusCode = response.statusCode
if (!error) { if (!error) {
if(body){ if (body) {
let data=JSON.parse(body) let data = JSON.parse(body)
rtn.data=data rtn.data = data
}else{ } else {
rtn.data=null rtn.data = null
} }
resv(rtn); resv(rtn);
}else{ } else {
rej(error) rej(error)
} }
}); });
}) })
return promise; return promise;
} }
static async getReq(url,qdata){ static async getReq(url, qdata) {
let rtn={} let rtn = {}
let promise=new Promise(function(resv,rej){ let promise = new Promise(function (resv, rej) {
request.get({ request.get({
url: url, url: url,
json: true, json: true,
qs: qdata qs: qdata
}, function(error, response, body) { }, function (error, response, body) {
rtn.statusCode=response.statusCode; rtn.statusCode = response.statusCode;
if (!error) { if (!error) {
if(body){ if (body) {
rtn.data=body rtn.data = body
}else{ } else {
rtn.data=null rtn.data = null
}
resv(rtn);
}else{
rej(error);
} }
}); resv(rtn);
} else {
rej(error);
}
});
}) })
return promise; return promise;
} }
static async postJsonTypeReq(url,data,md="POST"){ static async postJsonTypeReq(url, data, md = "POST") {
let rtn={} let rtn = {}
let promise=new Promise(function(resv,rej){ let promise = new Promise(function (resv, rej) {
request({ request({
url: url, url: url,
method: md, method: md,
...@@ -73,54 +73,54 @@ class System { ...@@ -73,54 +73,54 @@ class System {
"content-type": "application/json", "content-type": "application/json",
}, },
body: data body: data
}, function(error, response, body) { }, function (error, response, body) {
console.log(error) console.log(error)
rtn.statusCode=response.statusCode rtn.statusCode = response.statusCode
if (!error) { if (!error) {
if(body){ if (body) {
rtn.data=body rtn.data = body
}else{ } else {
rtn.data=null rtn.data = null
} }
resv(rtn); resv(rtn);
}else{ } else {
rej(error) rej(error)
} }
}); });
}) })
return promise; return promise;
} }
static async post3wFormTypeReq(url,data){ static async post3wFormTypeReq(url, data) {
let rtn={} let rtn = {}
let promise=new Promise(function(resv,rej){ let promise = new Promise(function (resv, rej) {
request.post({ request.post({
url: url, url: url,
form: data form: data
}, function(error, response, body) { }, function (error, response, body) {
rtn.statusCode=response.statusCode rtn.statusCode = response.statusCode
if (!error) { if (!error) {
let data=JSON.parse(body) let data = JSON.parse(body)
rtn.data=data rtn.data = data
resv(rtn); resv(rtn);
}else{ } else {
rej(error) rej(error)
} }
}); });
}) })
return promise; return promise;
} }
static async postMpFormTypeReq(url,formdata){ static async postMpFormTypeReq(url, formdata) {
let promise=new Promise(function(resv,rej){ let promise = new Promise(function (resv, rej) {
request.post({ request.post({
url: url, url: url,
formData: formdata formData: formdata
}, function(error, response, body) { }, function (error, response, body) {
if (!error && response.statusCode == 200) { if (!error && response.statusCode == 200) {
resv(body); resv(body);
}else{ } else {
rej(error) rej(error)
} }
}); });
}) })
return promise; return promise;
} }
...@@ -176,11 +176,16 @@ class System { ...@@ -176,11 +176,16 @@ class System {
data: data, data: data,
}; };
} }
static register(key, ClassObj,groupName,filename) { static register(key, ClassObj, groupName, filename) {
if (System.objTable[key] != null) { if (System.objTable[key] != null) {
throw new Error("相同key的对象已经存在"); throw new Error("相同key的对象已经存在");
} else { } else {
let obj = new ClassObj(groupName,filename); let obj;
if (ClassObj.name === "ServiceBase") {
obj = new ClassObj(groupName, filename.replace("Sve", "Dao"));
} else {
obj = new ClassObj(groupName, filename);
}
System.objTable[key] = obj; System.objTable[key] = obj;
} }
...@@ -204,29 +209,29 @@ class System { ...@@ -204,29 +209,29 @@ class System {
//判断文件的存在性 //判断文件的存在性
//如果不存在，需要查看packageName //如果不存在，需要查看packageName
//如果packageName=web.service,dao //如果packageName=web.service,dao
if (System.objTable[objabspath] != null) { if (System.objTable[objabspath] != null) {
return System.objTable[objabspath]; return System.objTable[objabspath];
} else { } else {
var ClassObj =null; var ClassObj = null;
try{ try {
ClassObj = require(objabspath); ClassObj = require(objabspath);
}catch(e){ } catch (e) {
// console.log(e) // console.log(e)
let fname=objsettings[packageName+"base"]; let fname = objsettings[packageName + "base"];
ClassObj = require(fname); ClassObj = require(fname);
} }
if(ClassObj.name=="Dao"){ if (ClassObj.name == "Dao") {
let modelname=filename.substring(0,filename.lastIndexOf("Dao")) let modelname = filename.substring(0, filename.lastIndexOf("Dao"))
return System.register(objabspath, ClassObj,modelname); return System.register(objabspath, ClassObj, modelname);
} }
if(ClassObj.name.indexOf("Ctl")>=0){ if (ClassObj.name.indexOf("Ctl") >= 0) {
console.log(ClassObj.name); console.log(ClassObj.name);
} }
return System.register(objabspath, ClassObj,groupName,filename); return System.register(objabspath, ClassObj, groupName, filename);
} }
} }
static getSysConfig() { static getSysConfig() {
var configPath = settings.basepath + "/app/base/db/metadata/index.js"; var configPath = settings.basepath + "/app/base/db/metadata/index.js";
// if(settings.env=="dev"){ // if(settings.env=="dev"){
...@@ -251,7 +256,7 @@ class System { ...@@ -251,7 +256,7 @@ class System {
} }
}; };
} }
Date.prototype.Format = function (fmt) { //author: meizz Date.prototype.Format = function (fmt) { //author: meizz
var o = { var o = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment