From 99c6010bb75d1a6f4562802d430d67d0ae6d1592 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Fri, 15 Jul 2022 11:39:54 +0800
Subject: [PATCH] =?UTF-8?q?pref:=E6=89=93=E5=8C=85=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env.config.js  |  1 -
 nuxt.config.js | 24 ++++++++++++------------
 package.json   |  6 +++---
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/env.config.js b/env.config.js
index 7e63773..1cde6d5 100644
--- a/env.config.js
+++ b/env.config.js
@@ -28,7 +28,6 @@ const envConfig = {
 		imUrl : 'wss://you-gateway.mashibing.com'
 	}
 }
-const branch = getRepoInfo().branch; // 调用获取git信息
 let curEnvConfig = null;
 const argv = global.process.argv;
 for(key in envConfig){
diff --git a/nuxt.config.js b/nuxt.config.js
index e0dc456..b938d51 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-03 22:14:16
  * @LastEditors: ch
- * @LastEditTime: 2022-07-07 17:31:39
+ * @LastEditTime: 2022-07-15 11:39:08
  * @Description: file content
  */
 export default {
@@ -79,19 +79,19 @@ export default {
 	},
 	axios: {
 		// 表示开启代理
-		proxy: true,
+		// proxy: true,
 	},
 	proxy: {
-		'/mall/': {
-			target: 'https://you-gateway.mashibing.com/', // 目标接口域名
-			// target: 'https://k8s-horse-gateway.mashibing.cn/', // 目标接口域名
-			pathRewrite: {
-				changeOrigin: true, // 表示是否跨域
-			},
-		},
+		// '/mall/': {
+		// 	target: 'https://you-gateway.mashibing.com/', // 目标接口域名
+		// 	// target: 'https://k8s-horse-gateway.mashibing.cn/', // 目标接口域名
+		// 	pathRewrite: {
+		// 		changeOrigin: true, // 表示是否跨域
+		// 	},
+		// },
 	},
-	server: {
-		port: 3000, // default: 3000
-		host: '0.0.0.0' // default: localhost,
+	server: {	
+		port: 3000, 
+		host: '0.0.0.0' 
 	},
 }
diff --git a/package.json b/package.json
index 7a04bdc..d95b1b2 100644
--- a/package.json
+++ b/package.json
@@ -3,9 +3,9 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "dev": "node env.config.js & nuxt",
-    "dev:beta": "node env.config.js --ENV:beta & nuxt",
-    "dev:prod": "node env.config.js --ENV:prod & nuxt",
+    "server": "node env.config.js & nuxt",
+    "server:beta": "node env.config.js --ENV:beta & nuxt",
+    "server:prod": "node env.config.js --ENV:prod & nuxt",
     "build:test": "node env.config.js --ENV:test & nuxt build",
     "build:beta": "node env.config.js --ENV:beta & nuxt build",
     "build:prod": "node env.config.js --ENV:prod & nuxt build",