fix: system.js

center-manage/app/base/system.js

@@ -16,55 +16,55 @@ class System {
 			}
 		}
 	}
-	static async delReq(url,qdata){
-		let rtn={}
-		let promise=new Promise(function(resv,rej){
+	static async delReq(url, qdata) {
+		let rtn = {}
+		let promise = new Promise(function (resv, rej) {
 			request.del({
 				url: url,
 				qs: qdata
-			  }, function(error, response, body) {
-				rtn.statusCode=response.statusCode
+			}, function (error, response, body) {
+				rtn.statusCode = response.statusCode
 				if (!error) {
-					if(body){
-						let data=JSON.parse(body)
-						rtn.data=data
-					}else{
-						rtn.data=null
+					if (body) {
+						let data = JSON.parse(body)
+						rtn.data = data
+					} else {
+						rtn.data = null
 					}
-				    resv(rtn);
-				}else{
+					resv(rtn);
+				} else {
 					rej(error)
 				}
-			  });
+			});
 		})
 		return promise;
 	}
-	static async getReq(url,qdata){
-		let rtn={}
-		let promise=new Promise(function(resv,rej){
+	static async getReq(url, qdata) {
+		let rtn = {}
+		let promise = new Promise(function (resv, rej) {
 			request.get({
 				url: url,
 				json: true,
 				qs: qdata
-			  }, function(error, response, body) {
-					rtn.statusCode=response.statusCode;
-					if (!error) {
-						if(body){
-							rtn.data=body
-						}else{
-							rtn.data=null
-						}
-							resv(rtn);
-					}else{
-					  	rej(error);
+			}, function (error, response, body) {
+				rtn.statusCode = response.statusCode;
+				if (!error) {
+					if (body) {
+						rtn.data = body
+					} else {
+						rtn.data = null
 					}
-			  });
+					resv(rtn);
+				} else {
+					rej(error);
+				}
+			});
 		})
 		return promise;
 	}
-	static async postJsonTypeReq(url,data,md="POST"){
-		let rtn={}
-		let promise=new Promise(function(resv,rej){
+	static async postJsonTypeReq(url, data, md = "POST") {
+		let rtn = {}
+		let promise = new Promise(function (resv, rej) {
 			request({
 				url: url,
 				method: md,
@@ -73,54 +73,54 @@ class System {
 					"content-type": "application/json",
 				},
 				body: data
-			  }, function(error, response, body) {
-					console.log(error)
-				rtn.statusCode=response.statusCode
+			}, function (error, response, body) {
+				console.log(error)
+				rtn.statusCode = response.statusCode
 				if (!error) {
-					if(body){
-						rtn.data=body
-					}else{
-						rtn.data=null
+					if (body) {
+						rtn.data = body
+					} else {
+						rtn.data = null
 					}
-				    resv(rtn);
-				}else{
+					resv(rtn);
+				} else {
 					rej(error)
 				}
-			  });
+			});
 		})
 		return promise;
 	}
-	static async post3wFormTypeReq(url,data){
-		let rtn={}
-		let promise=new Promise(function(resv,rej){
+	static async post3wFormTypeReq(url, data) {
+		let rtn = {}
+		let promise = new Promise(function (resv, rej) {
 			request.post({
 				url: url,
 				form: data
-			  }, function(error, response, body) {
-				rtn.statusCode=response.statusCode
+			}, function (error, response, body) {
+				rtn.statusCode = response.statusCode
 				if (!error) {
-					let data=JSON.parse(body)
-					rtn.data=data
-				    resv(rtn);
-				}else{
+					let data = JSON.parse(body)
+					rtn.data = data
+					resv(rtn);
+				} else {
 					rej(error)
 				}
-			  });
+			});
 		})
 		return promise;
 	}
-	static async postMpFormTypeReq(url,formdata){
-		let promise=new Promise(function(resv,rej){
+	static async postMpFormTypeReq(url, formdata) {
+		let promise = new Promise(function (resv, rej) {
 			request.post({
 				url: url,
 				formData: formdata
-			  }, function(error, response, body) {
+			}, function (error, response, body) {
 				if (!error && response.statusCode == 200) {
-				    resv(body);
-				}else{
+					resv(body);
+				} else {
 					rej(error)
 				}
-			  });
+			});
 		})
 		return promise;
 	}
@@ -176,11 +176,16 @@ class System {
 			data: data,
 		};
 	}
-	static register(key, ClassObj,groupName,filename) {
+	static register(key, ClassObj, groupName, filename) {
 		if (System.objTable[key] != null) {
 			throw new Error("相同key的对象已经存在");
 		} 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;
 		}
 
@@ -204,29 +209,29 @@ class System {
 		//判断文件的存在性
 		//如果不存在，需要查看packageName
 		//如果packageName=web.service,dao
-	
+
 		if (System.objTable[objabspath] != null) {
 			return System.objTable[objabspath];
 		} else {
-			var ClassObj =null;
-			try{
+			var ClassObj = null;
+			try {
 				ClassObj = require(objabspath);
-			}catch(e){
+			} catch (e) {
 				// console.log(e)
-				let fname=objsettings[packageName+"base"];
+				let fname = objsettings[packageName + "base"];
 				ClassObj = require(fname);
 			}
-			if(ClassObj.name=="Dao"){
-				let modelname=filename.substring(0,filename.lastIndexOf("Dao"))
-				return System.register(objabspath, ClassObj,modelname);
+			if (ClassObj.name == "Dao") {
+				let modelname = filename.substring(0, filename.lastIndexOf("Dao"))
+				return System.register(objabspath, ClassObj, modelname);
 			}
-			if(ClassObj.name.indexOf("Ctl")>=0){
+			if (ClassObj.name.indexOf("Ctl") >= 0) {
 				console.log(ClassObj.name);
 			}
-			return System.register(objabspath, ClassObj,groupName,filename);
+			return System.register(objabspath, ClassObj, groupName, filename);
 		}
 	}
-     
+
 	static getSysConfig() {
 		var configPath = settings.basepath + "/app/base/db/metadata/index.js";
 		// if(settings.env=="dev"){
@@ -251,7 +256,7 @@ class System {
 		}
 
 	};
-	
+
 }
 Date.prototype.Format = function (fmt) { //author: meizz
 	var o = {