gsb

4c532ba6 · 王昆 · d9c7f676 · 4c532ba6 · 4c532ba6 · d9c7f676
Commit 4c532ba6 authored Nov 13, 2019 by 王昆
13 changed files
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -8,7 +8,7 @@
            "type": "node",
            "request": "launch",
            "name": "Launch Program",
-            "program": "${workspaceFolder}/bigdata/main.js"
+            "program": "${workspaceFolder}/xgg-pc/main.js"
        }
    ]
 }
\ No newline at end of file
--- a/release-note.txt
+++ b/release-note.txt
+研发及发版注意事项(本文档作为主分支下的文件存在)
+
+一、项目的建立与签出
+
+1、每个项目作为一个分支存在，分支名称设定为项目名。
+2、研发签出
+   git clone -b <项目名称>   git@gitlab.gongsibao.com:jiangyong/zhichan.git.
+3、项目中不再上传 node_modules,需要设定.gitignore，内容是 node-modules/
+4、本地项目运行需要执行：
+   cnpm install 安装依赖库。
+
+二、发版流程
+
+在项目所在分支内：
+
+1、提交并推送本地代码到远程仓库
+2、git tag 查看当前已经到达哪个版本(release-v1.0.0)
+    项目版本号分配参见后面的分配表
+3、git tag release-v1.0.1(设定新的版本名称，格式必须是这种格式)
+      git push --tags------------------------------这一步很重要
+4、执行完第3步后，容器镜像将自动生成到镜像库中（构建镜像程序，只对release-vx.x.x格式敏感）
+5、利用k8s上线镜像为运行容器（这一步后续会实现为自动化）
+
+项目版本号段分配
+0、bigdata  release-v0.x.x
+1、igirl-web   release-v1.x.x
+2、igirl-zcapi release-v2.x.x
+3、igirl-channel-web release-v3.x.x
+4、igirl-channel release-v4.x.x
+5、scratch-web release-v5.x.x
+6、ipself-web release-v6.x.x
+7.  ipop-web release-v7.x.x
+8.  bpo-web  release-v8.x.x
+9.  bpo-admin  release-v9.x.x
+10. laowubao  release-v10.x.x
+11. xggsve-common  release-v11.x.x
+12. xggsve-merchant  release-v12.x.x
+13. xggsve-order  release-v13.x.x
+14. xggsve-invoice  release-v14.x.x
+15. xggpc  release-v15.x.x
+16. xggadmin  release-v16.x.x
+17. xggweb  release-v17.x.x
+
+后续号端请继续补充
+查看自己项目号段到达的数字，执行git tag | grep v【号段前缀】
+
+
+
+
+
+
+
+
--- a/xgg-pc/.ignore
+++ b/xgg-pc/.ignore
--- a/xgg-pc/app/base/controller/impl/auth/userCtl.js
+++ b/xgg-pc/app/base/controller/impl/auth/userCtl.js
@@ -5,7 +5,6 @@ var settings = require("../../../../config/settings");
 const CtlBase = require("../../ctl.base");
 const logCtl = system.getObject("web.common.oplogCtl");
 const uuidv4 = require('uuid/v4');
-var svgCaptcha = require('svg-captcha');

 var cacheBaseComp = null;
 class UserCtl extends CtlBase {

--- a/xgg-pc/app/base/controller/impl/common/businessscopeCtl.js
+++ b/xgg-pc/app/base/controller/impl/common/businessscopeCtl.js
@@ -3,7 +3,6 @@ var settings = require("../../../../config/settings");
 const CtlBase = require("../../ctlms.base");
 const uuidv4 = require('uuid/v4');
 var moment = require("moment");
-var svgCaptcha = require('svg-captcha');

 class BusinessscopeCtl extends CtlBase {
  constructor() {

--- a/xgg-pc/app/base/controller/impl/common/captchaCtl.js
+++ b/xgg-pc/app/base/controller/impl/common/captchaCtl.js
@@ -3,7 +3,6 @@ var settings = require("../../../../config/settings");
 const CtlBase = require("../../ctlms.base");
 const uuidv4 = require('uuid/v4');
 var moment = require("moment");
-var svgCaptcha = require('svg-captcha');

 class CaptchaCtl extends CtlBase {
  constructor() {

--- a/xgg-pc/app/base/controller/impl/common/deliverCtl.js
+++ b/xgg-pc/app/base/controller/impl/common/deliverCtl.js
@@ -3,7 +3,6 @@ var settings = require("../../../../config/settings");
 const CtlBase = require("../../ctlms.base");
 const uuidv4 = require('uuid/v4');
 var moment = require("moment");
-var svgCaptcha = require('svg-captcha');

 class DeliverCtl extends CtlBase {
  constructor() {

--- a/xgg-pc/app/base/controller/impl/common/domicileCtl.js
+++ b/xgg-pc/app/base/controller/impl/common/domicileCtl.js
@@ -3,7 +3,6 @@ var settings = require("../../../../config/settings");
 const CtlBase = require("../../ctlms.base");
 const uuidv4 = require('uuid/v4');
 var moment = require("moment");
-var svgCaptcha = require('svg-captcha');

 class DomicileCtl extends CtlBase {
  constructor() {

--- a/xgg-pc/app/base/controller/impl/common/invoicecontentCtl.js
+++ b/xgg-pc/app/base/controller/impl/common/invoicecontentCtl.js
@@ -3,7 +3,6 @@ var settings = require("../../../../config/settings");
 const CtlBase = require("../../ctlms.base");
 const uuidv4 = require('uuid/v4');
 var moment = require("moment");
-var svgCaptcha = require('svg-captcha');

 class InvoicecontentCtl extends CtlBase {
  constructor() {

--- a/xgg-pc/app/base/controller/impl/merchant/merchanttradeprocessCtl.js
+++ b/xgg-pc/app/base/controller/impl/merchant/merchanttradeprocessCtl.js
@@ -5,7 +5,6 @@ var settings = require("../../../../config/settings");
 const CtlBase = require("../../ctl.base");
 const logCtl = system.getObject("web.common.oplogCtl");
 const uuidv4 = require('uuid/v4');
-var svgCaptcha = require('svg-captcha');

 var cacheBaseComp = null;
 class MerchanttradeprocessCtl extends CtlBase {

--- a/xgg-pc/app/config/settings.js
+++ b/xgg-pc/app/config/settings.js
@@ -19,7 +19,7 @@ var settings = {
  passroleid: 2,
  tanentroleid: 1,
  protocalPrefix: "http://",
-  appKey: "wx76a324c5d201d1a4",
+  appKey: "40d64e586551405c9bcafab87266bb04",
  secret: "f99d413b767f09b5dff0b3610366cc46",
  salt: "%iatpD1gcxz7iF#B",
  defaultpwd: "987456",

--- a/xgg-pc/package-lock.json
+++ b/xgg-pc/package-lock.json
@@ -6625,14 +6625,6 @@
      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
      "dev": true
    },
-    "svg-captcha": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/svg-captcha/-/svg-captcha-1.4.0.tgz",
-      "integrity": "sha512-/fkkhavXPE57zRRCjNqAP3txRCSncpMx3NnNZL7iEoyAtYwUjPhJxW6FQTQPG5UPEmCrbFoXS10C3YdJlW7PDg==",
-      "requires": {
-        "opentype.js": "^0.7.3"
-      }
-    },
    "tar": {
      "version": "2.2.1",
      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",

--- a/xgg-pc/package.json
+++ b/xgg-pc/package.json
@@ -43,7 +43,6 @@
    "serve-favicon": "^2.4.5",
    "sha1": "^1.1.1",
    "socket.io": "^2.1.1",
-    "svg-captcha": "^1.4.0",
    "uuid": "^3.2.1"
  },
  "devDependencies": {