wgl 4 роки тому
батько
коміт
4ee7765cdb
6 змінених файлів з 48 додано та 5 видалено
  1. 1 0
      .env.development
  2. 1 0
      .env.production
  3. 1 0
      .env.test
  4. 1 0
      package.json
  5. 39 5
      src/projects/business/utils/request.js
  6. 5 0
      yarn.lock

+ 1 - 0
.env.development

@@ -3,6 +3,7 @@ VUE_APP_NODE_NAME=devlopment
 OUT_PUT_NAME=dev
 VUE_APP_LOCAL_STORAGE_PREFIX=dev
 VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
+VUE_APP_MIRROR_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=

+ 1 - 0
.env.production

@@ -3,6 +3,7 @@ VUE_APP_NODE_NAME=production
 OUT_PUT_NAME=prod
 VUE_APP_LOCAL_STORAGE_PREFIX=prod
 VUE_APP_BACKEND_URL=https://xpgjapi.xiaoxinda.com/
+VUE_APP_MIRROR_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=

+ 1 - 0
.env.test

@@ -3,6 +3,7 @@ VUE_APP_NODE_NAME=test
 OUT_PUT_NAME=test
 VUE_APP_LOCAL_STORAGE_PREFIX=test
 VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
+VUE_APP_MIRROR_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=

+ 1 - 0
package.json

@@ -16,6 +16,7 @@
 		"core-js": "^3.6.4",
 		"echarts": "^4.9.0",
 		"hls.js": "^0.14.11",
+		"jquery": "^3.5.1",
 		"qrcodejs2": "^0.0.2",
 		"v-viewer": "^1.5.1",
 		"vconsole": "^3.3.4",

+ 39 - 5
src/projects/business/utils/request.js

@@ -3,6 +3,7 @@ import store from '$project/store';
 import router from '@/router';
 import Vue from 'vue';
 import Qs from 'qs';
+import $ from 'jquery';
 
 import {
 	getToken,
@@ -11,13 +12,46 @@ import {
 
 axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'
 
-/* var checkApi = async function() {
-	await axios.get(process.env.VUE_APP_BACKEND_URL + '/mobile/companyInfoApi/link', {}, {
-		timeout: 1000 * 3
-	});
+//检测是否可以访问通
+var isBackend = false;
+var checkApiGetBackendUrl = function() {
+	$.ajax({
+		url: process.env.VUE_APP_BACKEND_URL + '/mobile/companyInfoApi/link',
+		type: 'GET',
+		async: false, //同步
+		data: {},
+		timeout: 3000,
+		success: function(data, textStatus, jqXHR) {
+			console.log('直连正常')
+			isBackend = true;
+		},
+		error: function(xhr, textStatus) {
+			console.log('直连异常')
+			isBackend = false;
+		},
+		complete: function() {
+			console.log('接口通畅校验完成')
+		}
+	})
+}
+checkApiGetBackendUrl();
+
+//只有当刷新的时候才会访问一次校验,
+/* if (store.state.api_type) {
+	if (store.state.api_type = 'mirror') {
+		console.log('镜像地址')
+		var BACKEND_URL = process.env.VUE_APP_MIRROR_BACKEND_URL;
+	} else {
+		var BACKEND_URL = process.env.VUE_APP_BACKEND_URL;
+	}
+} else {
+	console.log(isBackend);
+	store.commit('SET_API_TYPE', isBackend ? 'backend' : 'mirror');
+	var BACKEND_URL = isBackend ? process.env.VUE_APP_BACKEND_URL : process.env.VUE_APP_MIRROR_BACKEND_URL;
 } */
+store.commit('SET_API_TYPE', isBackend ? 'backend' : 'mirror');
+var BACKEND_URL = isBackend ? process.env.VUE_APP_BACKEND_URL : process.env.VUE_APP_MIRROR_BACKEND_URL;
 
-var BACKEND_URL = process.env.VUE_APP_BACKEND_URL
 
 // 创建axios实例
 const service = axios.create({

+ 5 - 0
yarn.lock

@@ -4872,6 +4872,11 @@ jest-worker@^25.4.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
+jquery@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.npm.taobao.org/jquery/download/jquery-3.5.1.tgz?cache=0&sync_timestamp=1588633260500&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjquery%2Fdownload%2Fjquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
+  integrity sha1-17TQjhv9uGrS8aPQOeoXMEcXq7U=
+
 js-base64@^2.1.8:
   version "2.6.4"
   resolved "https://registry.npm.taobao.org/js-base64/download/js-base64-2.6.4.tgz?cache=0&sync_timestamp=1599897619557&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"