lushuncheng 6 лет назад
Родитель
Сommit
bede4c8a5c
3 измененных файлов с 53 добавлено и 7 удалено
  1. 13 7
      middleware/initialize.js
  2. 38 0
      package-lock.json
  3. 2 0
      plugins/common.js

+ 13 - 7
middleware/initialize.js

@@ -1,4 +1,4 @@
-export default function(context) {
+export default function (context) {
   console.log("initialize.........");
   console.log("initialize.........");
   let proto = "https";
   let proto = "https";
   let url = "";
   let url = "";
@@ -6,7 +6,9 @@ export default function(context) {
   // Server-side
   // Server-side
   if (process.server) {
   if (process.server) {
     console.log("server side............");
     console.log("server side............");
-    const { req } = context;
+    const {
+      req
+    } = context;
     let host = req.headers.host;
     let host = req.headers.host;
     console.log("initialize...........req.............header");
     console.log("initialize...........req.............header");
     console.log(req.headers);
     console.log(req.headers);
@@ -44,7 +46,11 @@ export default function(context) {
   let siteUrl = "";
   let siteUrl = "";
   console.log(groups);
   console.log(groups);
   if (groups) {
   if (groups) {
-    let { branch, env, port } = groups;
+    let {
+      branch,
+      env,
+      port
+    } = groups;
     switch (env) {
     switch (env) {
       case "www":
       case "www":
         api = "https://www.proginn.com";
         api = "https://www.proginn.com";
@@ -76,13 +82,13 @@ export default function(context) {
         if (port && port != "80") {
         if (port && port != "80") {
           api = "http://local.proginn.com:" + port;
           api = "http://local.proginn.com:" + port;
           siteUrl = "http://local.proginn.com:" + port;
           siteUrl = "http://local.proginn.com:" + port;
-          jishuinUrl = "http://local-jishuin.proginn.com";
-          rooterUrl = "http://local-rooter.proginn.com";
+          jishuinUrl = "http://jishuin.local.proginn.com";
+          rooterUrl = "http://rooter.local.proginn.com";
         } else {
         } else {
           api = "http://local.proginn.com";
           api = "http://local.proginn.com";
           siteUrl = "http://local.proginn.com";
           siteUrl = "http://local.proginn.com";
-          jishuinUrl = "http://local-jishuin.proginn.com";
-          rooterUrl = "http://local-rooter.proginn.com";
+          jishuinUrl = "http://jishuin.local.proginn.com";
+          rooterUrl = "http://rooter.local.proginn.com";
         }
         }
         break;
         break;
       case "prod":
       case "prod":

+ 38 - 0
package-lock.json

@@ -3430,6 +3430,16 @@
       "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
       "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
       "dev": true
       "dev": true
     },
     },
+    "clipboard": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npm.taobao.org/clipboard/download/clipboard-2.0.6.tgz?cache=0&sync_timestamp=1583389667105&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fclipboard%2Fdownload%2Fclipboard-2.0.6.tgz",
+      "integrity": "sha1-UpISlu7A/fd+rRdJQhshyWhkc3Y=",
+      "requires": {
+        "good-listener": "^1.2.2",
+        "select": "^1.1.2",
+        "tiny-emitter": "^2.0.0"
+      }
+    },
     "cliui": {
     "cliui": {
       "version": "3.2.0",
       "version": "3.2.0",
       "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz",
       "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz",
@@ -4305,6 +4315,11 @@
       "resolved": "https://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz",
       "resolved": "https://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     },
+    "delegate": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npm.taobao.org/delegate/download/delegate-3.2.0.tgz",
+      "integrity": "sha1-tmtxwxWFIuirV0T3INjKDCr1kWY="
+    },
     "delegates": {
     "delegates": {
       "version": "1.0.0",
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
       "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
@@ -5892,6 +5907,14 @@
         "minimatch": "~3.0.2"
         "minimatch": "~3.0.2"
       }
       }
     },
     },
+    "good-listener": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npm.taobao.org/good-listener/download/good-listener-1.2.2.tgz",
+      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
+      "requires": {
+        "delegate": "^3.1.2"
+      }
+    },
     "got": {
     "got": {
       "version": "6.7.1",
       "version": "6.7.1",
       "resolved": "https://registry.npm.taobao.org/got/download/got-6.7.1.tgz",
       "resolved": "https://registry.npm.taobao.org/got/download/got-6.7.1.tgz",
@@ -10220,6 +10243,11 @@
         }
         }
       }
       }
     },
     },
+    "select": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/select/download/select-1.1.2.tgz",
+      "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
+    },
     "semver": {
     "semver": {
       "version": "5.7.1",
       "version": "5.7.1",
       "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1581458265183&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz",
       "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1581458265183&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz",
@@ -11203,6 +11231,11 @@
       "resolved": "https://registry.npm.taobao.org/timsort/download/timsort-0.3.0.tgz",
       "resolved": "https://registry.npm.taobao.org/timsort/download/timsort-0.3.0.tgz",
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
     },
     },
+    "tiny-emitter": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npm.taobao.org/tiny-emitter/download/tiny-emitter-2.1.0.tgz",
+      "integrity": "sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM="
+    },
     "to-arraybuffer": {
     "to-arraybuffer": {
       "version": "1.0.1",
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz",
       "resolved": "https://registry.npm.taobao.org/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz",
@@ -11904,6 +11937,11 @@
       "resolved": "https://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.9.1.tgz",
       "resolved": "https://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.9.1.tgz",
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU="
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU="
     },
     },
+    "vuescroll": {
+      "version": "4.15.0",
+      "resolved": "https://registry.npm.taobao.org/vuescroll/download/vuescroll-4.15.0.tgz",
+      "integrity": "sha1-Xyb1y8PZlHcdic4r4Y+J9zkasos="
+    },
     "vuex": {
     "vuex": {
       "version": "3.1.2",
       "version": "3.1.2",
       "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-3.1.2.tgz",
       "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-3.1.2.tgz",

+ 2 - 0
plugins/common.js

@@ -33,6 +33,8 @@ Vue.mixin({
   methods: {
   methods: {
     async needLogin() {
     async needLogin() {
       const userInfo = await this.getUserInfo();
       const userInfo = await this.getUserInfo();
+      console.log('needLogin++++++++++++++++++');
+      console.log(userInfo);
       if (!userInfo || !userInfo.nickname) {
       if (!userInfo || !userInfo.nickname) {
         this.goLogin();
         this.goLogin();
       }
       }