Skip to content

Z
zhichan
Commit 40d518bd by 孙亚楠
Options

Merge branch 'xgg-admin' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-admin

parents 787ac126 97b37c6e
Showing with 4 additions and 3 deletions
settings.js
......@@ -4,11 +4,11 @@ var ENVINPUT = {
DB_PORT: process.env.DB_PORT,
DB_USER: process.env.DB_USER,
DB_PWD: process.env.DB_PWD,
DB_NAME: process.env.PAAS_DB_NAME,
DB_NAME: process.env.XGGADMIN_DB_NAME,
REDIS_HOST: process.env.REDIS_HOST,
REDIS_PORT: process.env.REDIS_PORT,
REDIS_PWD: process.env.REDIS_PWD,
REDIS_DB: process.env.PAAS_REDIS_DB,
REDIS_DB: process.env.XGGADMIN_REDIS_DB,
APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev"
};
var settings = {
......
xgg-admin/app/base/system.js
......@@ -166,6 +166,7 @@ class System {
}
static microsetting() {
console.log(settings.env, "-------------- microsetting env ------------------");
var path = "/api/op/action/springboard";
if (settings.env == "dev") {
var domain = "http://192.168.18.237";
......@@ -180,7 +181,7 @@ class System {
// merchant: "http://127.0.0.1:3101" + path,
// 订单服务
order: domain +":3103" + path,
order: domain + ":3103" + path,
// order: "http://127.0.0.1:3103" + path,
// 发票服务
......
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