gsb

.gitignore

-/xgg-saas-platform/node_modules/
+/xgg-saas-merchant/node_modules/
 .idea/*
 .idea/*
\ No newline at end of file

Dockerfile

 #!/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 xgg-saas-platform /apps/xgg-saas-platform/
-WORKDIR   /apps/xgg-saas-platform/
+ADD xgg-saas-merchant /apps/xgg-saas-merchant/
+WORKDIR   /apps/xgg-saas-merchant/
 RUN cnpm install -S
 RUN cnpm install -S
-CMD  ["node","/apps/xgg-saas-platform/main.js"]
+CMD  ["node","/apps/xgg-saas-merchant/main.js"]
 
 
 
 
 
 

release-note.txt

@@ -22,7 +22,7 @@
 5、利用k8s上线镜像为运行容器（这一步后续会实现为自动化）
 5、利用k8s上线镜像为运行容器（这一步后续会实现为自动化）
 
 
 项目版本号段分配
 项目版本号段分配
-19. xggsaasplatform  release-v24.x.x
+19. xggsaasplatform  release-v25.x.x
 
 
 后续号端请继续补充
 后续号端请继续补充
 查看自己项目号段到达的数字，执行git tag | grep v【号段前缀】
 查看自己项目号段到达的数字，执行git tag | grep v【号段前缀】

xgg-saas-platform/app/config/settings.js → xgg-saas-merchant/app/config/settings.js

@@ -7,8 +7,8 @@ var ENVINPUT = {
   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,
-  DB_NAME: process.env.XGGSAASPLATFORM_DB_NAME,
-  REDIS_DB: process.env.XGGSAASPLATFORM_REDIS_DB,
+  DB_NAME: process.env.XGGSAASMERCHANT_DB_NAME,
+  REDIS_DB: process.env.XGGSAASMERCHANT_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 = {
@@ -26,7 +26,7 @@ var settings = {
   salt: "%iatpD1gcxz7iF#B",
   salt: "%iatpD1gcxz7iF#B",
   defaultpwd: "987456",
   defaultpwd: "987456",
   basepath: path.normalize(path.join(__dirname, '../..')),
   basepath: path.normalize(path.join(__dirname, '../..')),
-  port: process.env.NODE_PORT || 3701,
+  port: process.env.NODE_PORT || 3702,
   reqEsAddr: function () {
   reqEsAddr: function () {
     if (this.env == "dev") {
     if (this.env == "dev") {
       var localsettings = require("./localsettings");
       var localsettings = require("./localsettings");

xgg-saas-platform/package-lock.json → xgg-saas-merchant/package-lock.json

 {
 {
-  "name": "xgg-deliver",
+  "name": "xgg-saas-merchant",
   "version": "1.0.0",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "lockfileVersion": 1,
   "requires": true,
   "requires": true,

xgg-saas-merchant/package.json

+{
+  "name": "xgg-saas-merchant",
+  "version": "1.0.0",
+  "description": "h5framework",
+  "main": "main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "sunyanan",
+  "license": "ISC",
+  "dependencies": {
+    "MD5": "^1.3.0",
+    "after": "^0.8.2",
+    "ali-oss": "^4.12.2",
+    "axios": "^0.19.2",
+    "babel-polyfill": "^6.26.0",
+    "base64id": "^1.0.0",
+    "bluebird": "^3.5.1",
+    "body-parser": "^1.18.2",
+    "co": "^4.6.0",
+    "connect-redis": "^3.3.3",
+    "continuation-local-storage": "^3.2.1",
+    "cookie-parser": "^1.4.3",
+    "crypto": "^1.0.1",
+    "crypto-js": "^3.1.9-1",
+    "ejs": "^2.5.8",
+    "element-ui": "^2.4.0",
+    "engine.io-parser": "^2.1.2",
+    "errorhandler": "^1.5.0",
+    "exif-js": "^2.3.0",
+    "express": "^4.16.2",
+    "express-session": "^1.15.6",
+    "gm": "^1.23.1",
+    "marked": "^0.7.0",
+    "method-override": "^2.3.10",
+    "morgan": "^1.9.0",
+    "multer": "^1.3.0",
+    "mysql2": "^1.5.3",
+    "node-cron": "^2.0.1",
+    "node-uuid": "^1.4.8",
+    "qr-image": "^3.2.0",
+    "sequelize": "^4.37.8",
+    "sequelize-cli": "^4.1.1",
+    "serve-favicon": "^2.4.5",
+    "sha1": "^1.1.1",
+    "socket.io": "^2.1.1",
+    "svg-captcha": "^1.4.0",
+    "uuid": "^3.2.1"
+  },
+  "devDependencies": {
+    "element-theme": "^2.0.1",
+    "element-theme-chalk": "^2.4.0"
+  }
+}

xgg-saas-platform/package.json

-{
-  "name": "xgg-deliver",
-  "version": "1.0.0",
-  "description": "h5framework",
-  "main": "main.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "sunyanan",
-  "license": "ISC",
-  "dependencies": {
-    "MD5": "^1.3.0",
-    "after": "^0.8.2",
-    "ali-oss": "^4.12.2",
-    "axios": "^0.19.2",
-    "babel-polyfill": "^6.26.0",
-    "base64id": "^1.0.0",
-    "bluebird": "^3.5.1",
-    "body-parser": "^1.18.2",
-    "co": "^4.6.0",
-    "connect-redis": "^3.3.3",
-    "continuation-local-storage": "^3.2.1",
-    "cookie-parser": "^1.4.3",
-    "crypto": "^1.0.1",
-    "crypto-js": "^3.1.9-1",
-    "ejs": "^2.5.8",
-    "element-ui": "^2.4.0",
-    "engine.io-parser": "^2.1.2",
-    "errorhandler": "^1.5.0",
-    "exif-js": "^2.3.0",
-    "express": "^4.16.2",
-    "express-session": "^1.15.6",
-    "gm": "^1.23.1",
-    "marked": "^0.7.0",
-    "method-override": "^2.3.10",
-    "morgan": "^1.9.0",
-    "multer": "^1.3.0",
-    "mysql2": "^1.5.3",
-    "node-cron": "^2.0.1",
-    "node-uuid": "^1.4.8",
-    "qr-image": "^3.2.0",
-    "sequelize": "^4.37.8",
-    "sequelize-cli": "^4.1.1",
-    "serve-favicon": "^2.4.5",
-    "sha1": "^1.1.1",
-    "socket.io": "^2.1.1",
-    "svg-captcha": "^1.4.0",
-    "uuid": "^3.2.1"
-  },
-  "devDependencies": {
-    "element-theme": "^2.0.1",
-    "element-theme-chalk": "^2.4.0"
-  }
-}