Merge branch 'master' into dev

2025-01-30 13:20:24 +08:00 · 2018-01-12 20:07:18 +08:00 · 2018-01-12 20:07:18 +08:00 · 9ff8097dae
commit 9ff8097dae
parent 823dd07cb1 77b934a3ae
15 changed files with 6 additions and 6 deletions
--- a/server/utils/commons.js
+++ b/server/utils/commons.js
@ -115,7 +115,7 @@ exports.randStr = () => {
 exports.getIp = (ctx) => {
  let ip;
  try {
-    ip = ctx.ip.match(/\d+.\d+.\d+.\d+/)[0];
+    ip = ctx.ip.match(/\d+.\d+.\d+.\d+/) ? ctx.ip.match(/\d+.\d+.\d+.\d+/)[0] : 'localhost';
  } catch (e) {
    ip = null;
  }
--- a/static/prd/assets.js
+++ b/static/prd/assets.js
@ -1 +1 @@
-window.WEBPACK_ASSETS = {"index.js":{"js":"index@784b94e9094428f5637e.js","css":"index@784b94e9094428f5637e.css"},"lib":{"js":"lib@8944c3e5df6f7a53e2a6.js"},"lib2":{"js":"lib2@f60b8bd0c5cee11ac9fd.js"},"manifest":{"js":"manifest@b67af9f8b578904e66c5.js"}}
+window.WEBPACK_ASSETS = {"index.js":{"js":"index@e84f8a281e6d0a0c90d1.js","css":"index@e84f8a281e6d0a0c90d1.css"},"lib":{"js":"lib@decab4d9f880a3c20aa0.js"},"lib2":{"js":"lib2@2069f50880083ab20bf6.js"},"manifest":{"js":"manifest@b67af9f8b578904e66c5.js"}}
--- a/static/prd/index@784b94e9094428f5637e.css
+++ b/static/prd/index@784b94e9094428f5637e.css
--- a/static/prd/index@784b94e9094428f5637e.css.gz
+++ b/static/prd/index@784b94e9094428f5637e.css.gz
--- a/static/prd/index@784b94e9094428f5637e.js.gz
+++ b/static/prd/index@784b94e9094428f5637e.js.gz
--- a/static/prd/index@e84f8a281e6d0a0c90d1.css
+++ b/static/prd/index@e84f8a281e6d0a0c90d1.css
--- a/static/prd/index@e84f8a281e6d0a0c90d1.css.gz
+++ b/static/prd/index@e84f8a281e6d0a0c90d1.css.gz
--- a/static/prd/index@e84f8a281e6d0a0c90d1.js
+++ b/static/prd/index@e84f8a281e6d0a0c90d1.js
--- a/static/prd/index@e84f8a281e6d0a0c90d1.js.gz
+++ b/static/prd/index@e84f8a281e6d0a0c90d1.js.gz
--- a/static/prd/lib2@2069f50880083ab20bf6.js
+++ b/static/prd/lib2@2069f50880083ab20bf6.js
--- a/static/prd/lib2@2069f50880083ab20bf6.js.gz
+++ b/static/prd/lib2@2069f50880083ab20bf6.js.gz
--- a/static/prd/lib2@f60b8bd0c5cee11ac9fd.js.gz
+++ b/static/prd/lib2@f60b8bd0c5cee11ac9fd.js.gz
--- a/static/prd/lib@8944c3e5df6f7a53e2a6.js.gz
+++ b/static/prd/lib@8944c3e5df6f7a53e2a6.js.gz
--- a/static/prd/lib@decab4d9f880a3c20aa0.js
+++ b/static/prd/lib@decab4d9f880a3c20aa0.js
--- a/static/prd/lib@decab4d9f880a3c20aa0.js.gz
+++ b/static/prd/lib@decab4d9f880a3c20aa0.js.gz