Merge branch 'dev'

为了切换到存币生息模型

package.json

@@ -4,15 +4,14 @@
   "scripts": {
     "start": "umi dev",
     "build": "umi build",
-    "pub": "node scripts/pub.js",
-    "all": "npm run build && npm run pub",
     "test": "umi test",
     "lint:es": "eslint --ext .js src mock tests",
     "lint:ts": "tslint \"src/**/*.ts\" \"src/**/*.tsx\"",
     "dev": "umi dev",
     "dist": "umi build",
     "deploy": "node ./node_modules/deployer/deploy.js --type git --repo 'https://github.com/vichome/webapp' --local 'dist'",
-    "allinone": "npm run dist && npm run deploy"
+    "allinone": "npm run dist && npm run deploy",
+    "daemon.pm2": "cross-env NODE_ENV=production pm2 start ./node_modules/webserver/server.js --name vic.h5"
   },
   "dependencies": {
     "@types/react-virtualized-auto-sizer": "^1.0.0",
@@ -62,11 +61,11 @@
     "tslint-react": "^4.0.0",
     "umi": "^2.8.20",
     "umi-plugin-react": "^1.9.19",
-    "umi-types": "^0.3.17"
+    "umi-types": "^0.3.17",
+    "webserver": "git+https://git.faronear.org/npm/webserver"
   },
   "lint-staged": {
     "*.{ts,tsx}": [
-      "tslint --fix",
       "git add"
     ]
   },