Skip to content

Z
zhichan
Commit 7e132566 by sxy
Options

fix: settings

parent 29df0a1f
Showing with 100 additions and 130 deletions
icp-deliver/.gitignore
node_modules/ node_modules/
icp-deliver/app/config/localsettings.js
icp-deliver/app/base/service/sve.base.js
...@@ -7,7 +7,7 @@ class ServiceBase { ...@@ -7,7 +7,7 @@ class ServiceBase {
//this.dbf=system.getObject("db.connection"); //this.dbf=system.getObject("db.connection");
this.db = system.getObject("db.common.connection").getCon(); this.db = system.getObject("db.common.connection").getCon();
this.cacheManager = system.getObject("db.common.cacheManager"); this.cacheManager = system.getObject("db.common.cacheManager");
console.log(">>>>>>>>>>>>>>..",daoName) console.log(">>>>>>>>>>>>>>..", daoName)
this.daoName = daoName; this.daoName = daoName;
this.dao = system.getObject("db." + gname + "." + daoName); this.dao = system.getObject("db." + gname + "." + daoName);
this.restS = system.getObject("util.restClient"); this.restS = system.getObject("util.restClient");
...@@ -27,8 +27,8 @@ class ServiceBase { ...@@ -27,8 +27,8 @@ class ServiceBase {
} }
static getDaoName(ClassObj) { static getDaoName(ClassObj) {
console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>.."); console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>..");
let rtnstr=ClassObj["name"].substring(0, ClassObj["name"].lastIndexOf("Service")).toLowerCase() + "Dao"; let rtnstr = ClassObj["name"].substring(0, ClassObj["name"].lastIndexOf("Service")).toLowerCase() + "Dao";
console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>..",rtnstr); console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>..", rtnstr);
return rtnstr; return rtnstr;
} }
async findAndCountAll(obj) { async findAndCountAll(obj) {
...@@ -118,83 +118,83 @@ class ServiceBase { ...@@ -118,83 +118,83 @@ class ServiceBase {
} }
//kong统一处理 //kong统一处理
//统一注册组件 //统一注册组件
async cformregister(opurl,opts){ async cformregister(opurl, opts) {
try{ try {
let rtn=await system.post3wFormTypeReq(opurl,opts) let rtn = await system.post3wFormTypeReq(opurl, opts)
console.log(rtn); console.log(rtn);
if(rtn.statusCode==409){ if (rtn.statusCode == 409) {
//return new Error("已经存在相同的统一账号名称!"); //return new Error("已经存在相同的统一账号名称!");
return null; return null;
} }
if(rtn.statusCode==201){ if (rtn.statusCode == 201) {
return rtn.data; return rtn.data;
}else{ } else {
throw new Error(rtn.data); throw new Error(rtn.data);
} }
}catch(e){ } catch (e) {
console.log(e); console.log(e);
return null; return null;
} }
} }
async cget(opurl){ async cget(opurl) {
let rtn=await system.getReq(opurl) let rtn = await system.getReq(opurl)
return rtn; return rtn;
} }
async cjsonregister(opurl,opts){ async cjsonregister(opurl, opts) {
try{ try {
let rtn=await system.postJsonTypeReq(opurl,opts) let rtn = await system.postJsonTypeReq(opurl, opts)
console.log(",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,",rtn); console.log(",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,", rtn);
if(rtn.statusCode==409){ if (rtn.statusCode == 409) {
//return new Error("已经存在相同的统一账号名称!"); //return new Error("已经存在相同的统一账号名称!");
return null; return null;
} }
if(rtn.statusCode==201){ if (rtn.statusCode == 201) {
return rtn.data; return rtn.data;
}else{ } else {
throw new Error(rtn.data); throw new Error(rtn.data);
} }
return null; return null;
}catch(e){ } catch (e) {
console.log(e); console.log(e);
return null; return null;
} }
} }
async cdel(opurl){ async cdel(opurl) {
try{ try {
let rtn=await system.delReq(opurl) let rtn = await system.delReq(opurl)
if(rtn.statusCode==204){ if (rtn.statusCode == 204) {
return {}; return {};
}else{ } else {
throw new Error(rtn.data); throw new Error(rtn.data);
} }
}catch(e){ } catch (e) {
console.log(e); console.log(e);
return null; return null;
} }
} }
static bindPluginUrl(rname){ static bindPluginUrl(rname) {
return settings.kongurl+"routes/"+rname+"/plugins"; return settings.kongurl() + "routes/" + rname + "/plugins";
} }
static newRouteUrl(sname){ static newRouteUrl(sname) {
return settings.kongurl+"services/"+sname+"/routes"; return settings.kongurl() + "services/" + sname + "/routes";
} }
static newServiceUrl(){ static newServiceUrl() {
return settings.kongurl+"services"; return settings.kongurl() + "services";
} }
static newConsumerUrl(){ static newConsumerUrl() {
return settings.kongurl+"consumers"; return settings.kongurl() + "consumers";
} }
static newJwtCredUrl(consumername){ static newJwtCredUrl(consumername) {
return settings.kongurl+"consumers/"+consumername+"/jwt"; return settings.kongurl() + "consumers/" + consumername + "/jwt";
} }
static serviceUrl(sname){ static serviceUrl(sname) {
return settings.kongurl+"services/"+sname; return settings.kongurl() + "services/" + sname;
} }
static routeUrl(rname){ static routeUrl(rname) {
return settings.kongurl+"routes/"+rname; return settings.kongurl() + "routes/" + rname;
} }
static consumerUrl(consumerName){ static consumerUrl(consumerName) {
return settings.kongurl+"consumers/"+consumerName; return settings.kongurl() + "consumers/" + consumerName;
} }
} }
module.exports = ServiceBase; module.exports = ServiceBase;
icp-deliver/app/config/localsettings.js deleted 100644 → 0
var settings = {
redis: {
host: "43.247.184.32",
port: 8967,
password: "Gongsibao2018",
db: 9,
},
database: {
dbname: "ent_deliver",
user: "root",
password: "123456",
config: {
host: '127.0.0.1',
port: 3306,
dialect: 'mysql',
operatorsAliases: false,
pool: {
max: 5,
min: 0,
acquire: 90000000,
idle: 1000000
},
debug: false,
dialectOptions: {
requestTimeout: 999999,
// instanceName:'DEV'
} //设置MSSQL超时时间
}
},
};
module.exports = settings;
icp-deliver/app/config/settings.js
var path = require('path'); var path = require('path');
var ENVINPUT={ var ENVINPUT = {
DB_HOST:process.env.DB_HOST, DB_HOST: process.env.DB_HOST,
DB_PORT:process.env.DB_PORT, DB_PORT: process.env.DB_PORT,
DB_USER:process.env.DB_USER, DB_USER: process.env.DB_USER,
DB_PWD:process.env.DB_PWD, DB_PWD: process.env.DB_PWD,
DB_NAME:process.env.PAAS_DB_NAME, DB_NAME: process.env.PAAS_DB_NAME,
REDIS_HOST:process.env.REDIS_HOST, REDIS_HOST: process.env.REDIS_HOST,
REDIS_PORT:process.env.REDIS_PORT, REDIS_PORT: process.env.REDIS_PORT,
REDIS_PWD:process.env.REDIS_PWD, REDIS_PWD: process.env.REDIS_PWD,
REDIS_DB:process.env.PAAS_REDIS_DB, REDIS_DB: process.env.PAAS_REDIS_DB,
APP_ENV:process.env.APP_ENV?process.env.APP_ENV:"dev" APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev"
}; };
var settings = { var settings = {
env:ENVINPUT.APP_ENV, env: ENVINPUT.APP_ENV,
salt: "%iatpD1gcxz7iF#B", salt: "%iatpD1gcxz7iF#B",
defaultpwd:"gsb2020", defaultpwd: "gsb2020",
basepath : path.normalize(path.join(__dirname, '../..')), basepath: path.normalize(path.join(__dirname, '../..')),
port : process.env.NODE_PORT || 8002, port: process.env.NODE_PORT || 8002,
kongurl:"http://192.168.4.119:8001/", kongurl: function () { if (this.env == "dev") { return localsettings.kongurl; } else { return ENVINPUT.KONG_ADMIAN; } },
pmappid:1, pmappid: 1,
pmcompanyid:1, pmcompanyid: 1,
pmroleid:{"ta":1,"pr":2}, pmroleid: { "ta": 1, "pr": 2 },
redis:function(){ redis: function () {
if(this.env=="dev"){ if (this.env == "dev") {
var localsettings=require("./localsettings"); var localsettings = require("./localsettings");
return localsettings.redis; return localsettings.redis;
}else { } else {
return { return {
host:ENVINPUT.REDIS_HOST, host: ENVINPUT.REDIS_HOST,
port:ENVINPUT.REDIS_PORT, port: ENVINPUT.REDIS_PORT,
password:ENVINPUT.REDIS_PWD, password: ENVINPUT.REDIS_PWD,
db:ENVINPUT.REDIS_DB, db: ENVINPUT.REDIS_DB,
}; };
} }
}, },
database:function(){ database: function () {
if(this.env=="dev"){ if (this.env == "dev") {
var localsettings=require("./localsettings"); var localsettings = require("./localsettings");
return localsettings.database; return localsettings.database;
}else{ } else {
return { return {
dbname : ENVINPUT.DB_NAME, dbname: ENVINPUT.DB_NAME,
user : ENVINPUT.DB_USER, user: ENVINPUT.DB_USER,
password : ENVINPUT.DB_PWD, password: ENVINPUT.DB_PWD,
config : { config: {
host: ENVINPUT.DB_HOST, host: ENVINPUT.DB_HOST,
dialect: 'mysql', dialect: 'mysql',
operatorsAliases: false, operatorsAliases: false,
pool: { pool: {
max: 5, max: 5,
min: 0, min: 0,
acquire: 90000000, acquire: 90000000,
idle: 1000000 idle: 1000000
}, },
debug:false, debug: false,
dialectOptions:{ dialectOptions: {
requestTimeout: 999999, requestTimeout: 999999,
// instanceName:'DEV' // instanceName:'DEV'
} //设置MSSQL超时时间 } //设置MSSQL超时时间
}, },
}; };
} }
} }
}; };
settings.ENVINPUT=ENVINPUT; settings.ENVINPUT = ENVINPUT;
module.exports = settings; module.exports = settings;
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