Commit 6d6c2b18 by 孙亚楠

gsb

parent 3610b4b4
#!/bin/bash
FROM registry.cn-beijing.aliyuncs.com/hantang/node105:v2
MAINTAINER jy "jiangyong@gongsibao.com"
ADD xgg-admin /apps/xgg-admin/
WORKDIR /apps/xgg-admin/
ADD xgg-deliver /apps/xgg-deliver/
WORKDIR /apps/xgg-deliver/
RUN cnpm install -S
CMD ["node","/apps/xgg-admin/main.js"]
CMD ["node","/apps/xgg-deliver/main.js"]
......
......@@ -40,6 +40,8 @@
15. xggpc release-v15.x.x
16. xggadmin release-v16.x.x
17. xggweb release-v17.x.x
18. xggpjb release-v18.x.x
19. xggdeliver release-v19.x.x
后续号端请继续补充
查看自己项目号段到达的数字,执行git tag | grep v【号段前缀】
......
......@@ -7,8 +7,8 @@ var ENVINPUT = {
REDIS_HOST: process.env.REDIS_HOST,
REDIS_PORT: process.env.REDIS_PORT,
REDIS_PWD: process.env.REDIS_PWD,
DB_NAME: process.env.XGGADMIN_DB_NAME,
REDIS_DB: process.env.XGGADMIN_REDIS_DB,
DB_NAME: process.env.XGGDELIVER_DB_NAME,
REDIS_DB: process.env.XGGDELIVER_REDIS_DB,
APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev"
};
var settings = {
......@@ -26,7 +26,7 @@ var settings = {
salt: "%iatpD1gcxz7iF#B",
defaultpwd: "987456",
basepath: path.normalize(path.join(__dirname, '../..')),
port: process.env.NODE_PORT || 3002,
port: process.env.NODE_PORT || 3012,
reqEsAddr: function () {
if (this.env == "dev") {
var localsettings = require("./localsettings");
......@@ -40,7 +40,7 @@ var settings = {
// return "http://192.168.18.237:4001/";
return "http://192.168.18.125:4001/";
} else {
return "http://open.gongsibao.com/";
return "https://open.gongsibao.com/";
}
},
apiconfig: {
......@@ -64,7 +64,7 @@ var settings = {
var localsettings = require("./localsettings");
return localsettings.reqHomePageDevUrl;
} else {
return "http://open.gongsibao.com/";
return "https://open.gongsibao.com/";
}
},
authUrl: function () {
......@@ -72,7 +72,7 @@ var settings = {
var localsettings = require("./localsettings");
return localsettings.reqAuthUrl;
} else {
return "http://open.gongsibao.com/auth";
return "https://open.gongsibao.com/auth";
}
},
docUrl: function () {
......@@ -80,7 +80,7 @@ var settings = {
var localsettings = require("./localsettings");
return localsettings.docUrl;
} else {
return "http://open.gongsibao.com/web/common/metaCtl/getApiDoc";
return "https://open.gongsibao.com/web/common/metaCtl/getApiDoc";
}
},
redis: function () {
......
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