update vuecli proxy

2022-09-19 16:30:50 +08:00
parent 10e454eb2a
commit e532989ddf
12 changed files with 47 additions and 17 deletions
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
  "version": "5.0.0",
  "private": true,
  "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "vue-cli-service serve --mode production",
+    "serve:dev": "vue-cli-service serve --mode development",
    "build": "vue-cli-service build",
    "build:prod": "vue-cli-service build --mode production",
    "build:sit": "vue-cli-service build --mode production.sit",
--- a/public/index.html
+++ b/public/index.html
@@ -10,7 +10,7 @@
    window.SITE_CONFIG['version'] = 'v5.0.0';
    window.SITE_CONFIG['nodeEnv'] = '<%= process.env.VUE_APP_NODE_ENV %>';
    window.SITE_CONFIG['apiURL'] = '';                      // api请求地址
-    window.SITE_CONFIG['projURL'] = '/yd-monitor';                      // api请求地址
+    window.SITE_CONFIG['projURL'] = '';                     // api请求地址
    window.SITE_CONFIG['storeState'] = {};                  // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态）
    window.SITE_CONFIG['contentTabDefault'] = {             // 内容标签页默认属性对象
      'name': '',        // 名称, 由 this.$route.name 自动赋值（默认，名称 === 路由名称 === 路由路径）
@@ -31,25 +31,25 @@
  <!-- 开发环境 -->
  <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
    <script>
-    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.28:8080';
+    window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
    </script>
  <% } %>
  <!-- 集成测试环境 -->
  <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
    <script>
-      window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/renren-admin';
+      window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
    </script>
  <% } %>
  <!-- 验收测试环境 -->
  <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
    <script>
-      window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/renren-admin';
+      window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
    </script>
  <% } %>
  <!-- 生产环境 -->
  <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
    <script>
-      window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/renren-admin';
+      window.SITE_CONFIG['apiURL'] = 'http://india.mes.picaiba.com/';
    </script>
  <% } %>
 </head>
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -7,7 +7,9 @@ import isPlainObject from 'lodash/isPlainObject'
 import merge from 'lodash/merge'

 const http = axios.create({
-  baseURL: window.SITE_CONFIG['apiURL'],
+  // baseURL: window.SITE_CONFIG['apiURL'],
+  // baseURL: '/api',
+  baseURL: process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor',
  timeout: 1000 * 180,
  withCredentials: true
 })
@@ -71,7 +73,9 @@ http.interceptors.response.use(response => {
 */
 http.adornUrl = (actionName) => {
  // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
-  return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.projURL) + actionName
+  // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? window.SITE_CONFIG.projURL : '') + actionName
+  // return (process.env.NODE_ENV !== 'production' ? '/yd-monitor' : '/api') + actionName
+  return actionName
 }

 /**
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -28,6 +28,7 @@ export default {
 	mounted() {
 		// this.$store.state.sidebarMenuList = window.SITE_CONFIG['menuList']
 		this.$nextTick(() => {
+			console.log(`window.SITE_CONFIG['menuList']`, window.SITE_CONFIG['menuList'])
 			this.unhiddenMenuList = this.getUnhiddenRoutesListFrom(window.SITE_CONFIG['menuList'])
 			/** 本地保存一份，store保存一份，感觉 store 都不需要保存... */
 			this.$store.state.sidebarMenuList = this.unhiddenMenuList
--- a/src/views/modules/home.vue
+++ b/src/views/modules/home.vue
@@ -20,7 +20,6 @@
 			<h3>官方微信群</h3>
 			<ul>
 				<li>扫码下面的二维码，关注【人人开源】公众号，回复【加群】，即可根据提示加入微信群！</li>
-				<li><img src="https://cdn.renren.io/f5cef202207132229319338.jpg" alt="微信群" /></li>
 			</ul>
 		</div>
 	</el-card>
--- a/src/views/modules/monitoring/reportDesign.vue
+++ b/src/views/modules/monitoring/reportDesign.vue
@@ -11,8 +11,9 @@ export default {
 		return {
 			loading: true,
 			// url: process.env.VUE_APP_REPORT_DESIGN_URL
-			url: window.SITE_CONFIG['apiURL'] + '/yd-monitor/ureport/designer'
+			// url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/designer')
 			// url: this.$http.adornUrl('/ureport/designer')
+			url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/designer'
 		}
 	},
 	mounted() {
--- a/src/views/modules/monitoring/reportPreview.vue
+++ b/src/views/modules/monitoring/reportPreview.vue
@@ -22,7 +22,8 @@ export default {
 		return {
 			loading: true,
 			// url: process.env.VUE_APP_REPORT_VIEW_URL
-			url: window.SITE_CONFIG['apiURL'] + '/yd-monitor/ureport/preview'
+			// url: window.SITE_CONFIG['apiURL'] + this.$http.adornUrl('/ureport/preview')
+			url: (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + '/ureport/preview'
 		}
 	},
 	mounted() {
--- a/src/views/modules/monitoring/workshopSectionDialog.vue
+++ b/src/views/modules/monitoring/workshopSectionDialog.vue
@@ -230,7 +230,7 @@ export default {
 				type: 'warning'
 			}).then(() => {
 				this.$http({
-					url: '/yd-monitor/monitoring/workshopSectionEquipment',
+					url: this.$http.adornUrl('/monitoring/workshopSectionEquipment'),
 					method: 'delete',
 					data: [id]
 				}).then(({ data }) => {
@@ -274,7 +274,7 @@ export default {
 		},
 		handleCreateOrUpdate() {
 			this.$http({
-				url: '/yd-monitor/monitoring/workshopSection',
+				url: this.$http.adornUrl('/monitoring/workshopSection'),
 				method: this.dataForm.id ? 'put' : 'post',
 				data: {
 					...this.dataForm
--- a/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue
+++ b/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue
@@ -66,7 +66,7 @@ export default {
 			this.edit = true
 			// 获取信息，让用户修改排序
 			this.$http({
-				url: '/yd-monitor/monitoring/workshopSectionEquipment/' + id,
+				url: this.$http.adornUrl('/monitoring/workshopSectionEquipment/') + id,
 				method: 'get'
 			}).then(({ data: res }) => {
 				if (res.data) {
@@ -102,7 +102,7 @@ export default {
 		},
 		handleSave() {
 			this.$http({
-				url: '/yd-monitor/monitoring/workshopSectionEquipment',
+				url: this.$http.adornUrl('/monitoring/workshopSectionEquipment'),
 				method: this.edit ? 'put' : 'post',
 				data: {
 					...this.dataForm,
--- a/src/views/modules/oss/oss-upload.vue
+++ b/src/views/modules/oss/oss-upload.vue
@@ -22,7 +22,8 @@ export default {
 	methods: {
 		init() {
 			this.visible = true
-			this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}`
+			// this.url = `${window.SITE_CONFIG['apiURL']}/sys/oss/upload?token=${Cookies.get('token')}`
+			this.url = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/sys/oss/upload?token=${Cookies.get('token')}`
 			this.num = 0
 			this.fileList = []
 		},
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -102,7 +102,8 @@ export default {
 		// 获取验证码
 		getCaptcha() {
 			this.dataForm.uuid = getUUID()
-			this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}`
+			// this.captchaPath = `${window.SITE_CONFIG['apiURL']}/captcha?uuid=${this.dataForm.uuid}`
+			this.captchaPath = (process.env.NODE_ENV === 'production' ? '/api' : '/yd-monitor') + `/captcha?uuid=${this.dataForm.uuid}`
 		},
 		// 表单提交
 		dataFormSubmitHandle: debounce(
@@ -114,7 +115,9 @@ export default {
 					this.$http
 						.post(this.$http.adornUrl('/login'), this.dataForm)
 						.then(({ data: res }) => {
+							console.log('res', res)
 							if (res.code !== 0) {
+								console.log('res', res)
 								// this.getCaptcha()
 								return this.$message.error(res.msg)
 							}
--- a/vue.config.js
+++ b/vue.config.js
@@ -12,12 +12,31 @@ module.exports = {
      .loader('svg-sprite-loader')
  },
  productionSourceMap: false,
+  configureWebpack: config => {
+    if (process.env.NODE_ENV === 'production') {
+      config.performance = {
+        maxEntrypointSize: 2097152, // 大小改为2mb
+        maxAssetSize: 1572864
+      }
+    }
+  },
  devServer: {
    open: true,
    port: 8001,
    overlay: {
      errors: true,
      warnings: true
+    },
+    proxy: {
+      '/api': {
+        target: 'http://india.mes.picaiba.com/'
+      },
+      '/yd-monitor': {
+        target: 'http://192.168.1.20:8080/' // 开发地址
+      },
+      '/ureport': {
+        target: 'http://india.mes.picaiba.com/' // ureporter
+      }
    }
  }
 }