Commit 44eff855 by 王昆

gs

parent 23b297b2
node_modules/ node_modules/
.idea/ .idea/
xggsve-common/node_modules/ xggsve-trade/node_modules/
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"type": "node", "type": "node",
"request": "launch", "request": "launch",
"name": "Launch Program", "name": "Launch Program",
"program": "${workspaceFolder}/xggsve-common/main.js" "program": "${workspaceFolder}/xggsve-trade/main.js"
} }
] ]
} }
\ No newline at end of file
#!/bin/bash #!/bin/bash
FROM registry.cn-beijing.aliyuncs.com/hantang2/node105:v2 FROM registry.cn-beijing.aliyuncs.com/hantang2/node105:v2
MAINTAINER jy "jiangyong@gongsibao.com" MAINTAINER jy "jiangyong@gongsibao.com"
ADD xggsve-common /apps/xggsve-common/ ADD xggsve-trade /apps/xggsve-trade/
WORKDIR /apps/xggsve-common/ WORKDIR /apps/xggsve-trade/
RUN cnpm install -S RUN cnpm install -S
CMD ["node","/apps/xggsve-common/main.js"] CMD ["node","/apps/xggsve-trade/main.js"]
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
5、利用k8s上线镜像为运行容器(这一步后续会实现为自动化) 5、利用k8s上线镜像为运行容器(这一步后续会实现为自动化)
项目版本号段分配 项目版本号段分配
11. xggsve-common release-v11.x.x 11. xggsve-trade release-v26.x.x
后续号端请继续补充 后续号端请继续补充
查看自己项目号段到达的数字,执行git tag | grep v【号段前缀】 查看自己项目号段到达的数字,执行git tag | grep v【号段前缀】
......
...@@ -4,11 +4,11 @@ var ENVINPUT = { ...@@ -4,11 +4,11 @@ var ENVINPUT = {
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.XGGSVECOMMON_DB_NAME, DB_NAME: process.env.XGGSVETRADE_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.XGGSVECOMMON_REDIS_DB, REDIS_DB: process.env.XGGSVETRADE_REDIS_DB,
APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev" APP_ENV: process.env.APP_ENV ? process.env.APP_ENV : "dev"
}; };
...@@ -46,7 +46,6 @@ var settings = { ...@@ -46,7 +46,6 @@ var settings = {
return 1; return 1;
} }
}, },
homePage: function () { homePage: function () {
if (this.env == "dev") { if (this.env == "dev") {
var localsettings = require("./localsettings"); var localsettings = require("./localsettings");
......
{ {
"name": "xggsve-common", "name": "xggsve-trade",
"version": "1.0.0", "version": "1.0.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
......
{ {
"name": "xggsve-common", "name": "xggsve-trade",
"version": "1.0.0", "version": "1.0.0",
"description": "h5framework", "description": "h5framework",
"main": "main.js", "main": "main.js",
......
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