Sfoglia il codice sorgente

测试环境分支

ccf 3 anni fa
parent
commit
5a18b44909
3 ha cambiato i file con 16 aggiunte e 4 eliminazioni
  1. 14 3
      middleware/initialize.js
  2. 1 0
      nuxt.config.js
  3. 1 1
      package.json

+ 14 - 3
middleware/initialize.js

@@ -32,11 +32,9 @@ export default function (context) {
     cookies = document.cookie;
   }
   let regx = new RegExp(
-    "((?<branch>[a-z0-9_\\-]+)\\.)?(?<env>(www|user|prod|test|local|test-jishuin|test-rooter|prod-jishuin|prod-rooter|rooter|jishuin|job|kaifain|test-job|test-kaifain))\\.proginn\\.com(\\:(?<port>\\d+))?",
+    "((?<branch>[a-z0-9_\\-]+)\\.)?(?<env>(www|user|prod|test|local|local-rooter|test-jishuin|test-rooter|prod-jishuin|prod-rooter|rooter|jishuin|job|kaifain|test-job|test-kaifain))\\.proginn\\.com(\\:(?<port>\\d+))?",
     "i"
   );
-  console.log(regx);
-  console.log(url);
   let groups = regx.exec(url).groups;
   let api = "";
   let jishuinUrl = "";
@@ -76,6 +74,19 @@ export default function (context) {
           rooterUrl = "http://rooter.local.proginn.com";
         }
         break;
+      case "local-rooter":
+        if (port && port != "80") {
+          api = "http://local.proginn.com";
+          siteUrl = "http://local.proginn.com";
+          jishuinUrl = "http://jishuin.local.proginn.com";
+          rooterUrl = "http://rooter.local.proginn.com";
+        } else {
+          api = "http://local.proginn.com";
+          siteUrl = "http://local.proginn.com";
+          jishuinUrl = "http://jishuin.local.proginn.com";
+          rooterUrl = "http://rooter.local.proginn.com";
+        }
+        break;
       case "prod":
       case "prod-jishuin":
       case "prod-rooter":

+ 1 - 0
nuxt.config.js

@@ -103,6 +103,7 @@ module.exports = {
         }
       },
     },
+    publicPath:process.env.NODE_ENV=="dev"?"_nuxtboss":"_nuxt",
     extend(config, ctx) { }
   },
   router: {

+ 1 - 1
package.json

@@ -5,7 +5,7 @@
   "author": "zweizhao",
   "private": true,
   "scripts": {
-    "dev": "npx nuxt",
+    "dev": "cross-env NODE_ENV=dev npx nuxt",
     "build": "nuxt build && nuxt generate",
     "start": "nuxt start",
     "generate": "nuxt generate"