Merge branch 'brg' of gitlab.gongsibao.com:jiangyong/zhichan into brg

brg/package.json

-{
-  "name": "bigdata",
-  "version": "1.0.0",
-  "description": "h5framework",
-  "main": "main.js",
-  "scripts": {
-    "dev": "nodemon main.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "license": "ISC",
-  "dependencies": {
-    "@alicloud/pop-core": "^1.7.7",
-    "MD5": "^1.3.0",
-    "after": "^0.8.2",
-    "ali-oss": "^4.12.2",
-    "aliyun-api-gateway": "^1.1.6",
-    "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",
-    "node-xlsx": "^0.15.0",
-    "nodemailer": "^6.3.0",
-    "pinyin": "^2.9.0",
-    "puppeteer": "^1.20.0",
-    "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",
-    "uuid": "^3.4.0"
-  },
-  "devDependencies": {
-    "element-theme": "^2.0.1",
-    "element-theme-chalk": "^2.4.0"
-  }
-}
+{
+  "name": "bigdata",
+  "version": "1.0.0",
+  "description": "h5framework",
+  "main": "main.js",
+  "scripts": {
+    "dev": "nodemon main.js",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "license": "ISC",
+  "dependencies": {
+    "@alicloud/pop-core": "^1.7.7",
+    "MD5": "^1.3.0",
+    "after": "^0.8.2",
+    "ali-oss": "^4.12.2",
+    "aliyun-api-gateway": "^1.1.6",
+    "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",
+    "node-xlsx": "^0.15.0",
+    "nodemailer": "^6.3.0",
+    "pinyin": "^2.9.0",
+    "puppeteer": "^1.20.0",
+    "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",
+    "uuid": "^3.4.0"
+  },
+  "devDependencies": {
+    "element-theme": "^2.0.1",
+    "element-theme-chalk": "^2.4.0"
+  }
+}