APP更新，token验证

CallCenterWeb.UI/RMYY/src/utils/auth.js

@@ -1,14 +1,14 @@
-const TokenKey = 'Admin-Token'
-const storage = window.localStorage
+const TokenKey = "Admin-Token";
+const storage = window.localStorage;
 export function getToken() {
-  return storage.getItem(TokenKey)
+  return storage.getItem(TokenKey);
 }
 
 export function setToken(token) {
-  token = 'Bearer ' + token
-  return storage.setItem(TokenKey, token)
+  // token = "Bearer " + token;
+  return storage.setItem(TokenKey, token);
 }
 
 export function removeToken() {
-  return storage.removeItem(TokenKey)
+  return storage.removeItem(TokenKey);
 }

CallCenterWeb.UI/RMYY/src/utils/request.js

@@ -1,11 +1,11 @@
-import axios from 'axios'
-import qs from 'qs' // 引入axios时同时引入qs即可。
-import { Message, MessageBox } from 'element-ui'
-import store from '../store'
-import { getToken } from '@/utils/auth'
+import axios from "axios";
+import qs from "qs"; // 引入axios时同时引入qs即可。
+import { Message, MessageBox } from "element-ui";
+import store from "../store";
+import { getToken } from "@/utils/auth";
 
 // 正在进行中的请求列表
-const reqList = []
+const reqList = [];
 /**
  * 阻止重复请求
  * @param {array} reqList - 请求缓存列表
@@ -14,15 +14,15 @@ const reqList = []
  * @param {string} errorMessage - 请求中断时需要显示的错误信息
  */
 const stopRepeatRequest = function(reqList, url, cancel, errorMessage) {
-  const errorMsg = errorMessage || ''
+  const errorMsg = errorMessage || "";
   for (let i = 0; i < reqList.length; i++) {
     if (reqList[i] === url) {
-      cancel(errorMsg)
-      return
+      cancel(errorMsg);
+      return;
     }
   }
-  reqList.push(url)
-}
+  reqList.push(url);
+};
 
 /**
  * 允许某个请求可以继续进行
@@ -32,20 +32,32 @@ const stopRepeatRequest = function(reqList, url, cancel, errorMessage) {
 const allowRequest = function(reqList, url) {
   for (let i = 0; i < reqList.length; i++) {
     if (reqList[i] === url) {
-      reqList.splice(i, 1)
-      break
+      reqList.splice(i, 1);
+      break;
     }
   }
-  console.log(reqList)
-}
+  console.log(reqList);
+};
+axios.interceptors.request.use(
+  config => {
+    if (config.method === "post") {
+      config.data = qs.stringify(config.data);
+    }
 
+    return config;
+  },
+  error => {
+    return Promise.reject(error);
+  }
+);
 // const baseURL = process.env.BASE_API
 // 创建axios实例
 const service = axios.create({
-  // baseURL: baseURL, // api的base_url
+  // baseURL: baseURL, // api的base_url  axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
+
   timeout: 30000, // 请求超时时间
   headers: {
-    'Content-Type': 'application/x-www-form-urlencoded'
+    "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
   },
   // `transformRequest` 允许在向服务器发送前，修改请求数据
   // 只能用在 'PUT', 'POST' 和 'PATCH' 这几个请求方法
@@ -54,7 +66,7 @@ const service = axios.create({
   transformRequest: [
     function(data) {
       // 对 data 进行任意转换处理
-      return qs.stringify(data)
+      return qs.stringify(data);
     }
   ],
 
@@ -65,38 +77,40 @@ const service = axios.create({
   // return qs.stringify({ids: [1, 2, 3]}, {arrayFormat: 'brackets'})  // 形式：ids[]=1&ids[]=2&ids[]=3
   // return qs.stringify({ids: [1, 2, 3]}, {arrayFormat: 'repeat'})  // 形式： ids=1&ids=2&id=3
   paramsSerializer: function(params) {
-    return qs.stringify(params, { arrayFormat: 'indices' }) // 形式：ids=1&ids=2&id=3
+    return qs.stringify(params, { arrayFormat: "indices" }); // 形式：ids=1&ids=2&id=3
   }
-})
+});
 // request拦截器
 service.interceptors.request.use(
   config => {
     if (store.getters.token) {
-      config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+      // config.headers["Authorization"] = getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改 Bearer
     }
-    let cancel
-    if (config.method === 'post') {
+    config.url = config.url + "?token=" + getToken();
+    let cancel;
+    if (config.method === "post") {
       // 设置cancelToken对象
       config.cancelToken = new axios.CancelToken(function(c) {
-        cancel = c
-      })
+        cancel = c;
+      });
       // 阻止重复请求。当上个请求未完成时，相同的请求不会进行
       stopRepeatRequest(
         reqList,
         config.url,
         cancel,
         `${config.url} 请求被中断`
-      )
+      );
       // stopRepeatRequest(reqList, config.url, cancel, `请求被中断`)
+    } else {
     }
 
-    return config
+    return config;
   },
   error => {
     // Do something with request error
-    Promise.reject(error)
+    Promise.reject(error);
   }
-)
+);
 
 // respone拦截器
 service.interceptors.response.use(
@@ -105,130 +119,130 @@ service.interceptors.response.use(
      * state为非"success"时抛错
      */
     // 增加延迟，相同请求不得在短时间内重复发送
-    if (response.config.method === 'post') {
+    if (response.config.method === "post") {
       setTimeout(() => {
-        const replaceList = response.config.url.split('/')
+        const replaceList = response.config.url.split("/");
         const newUrl =
           replaceList[replaceList.length - 2] +
-          '/' +
-          replaceList[replaceList.length - 1]
-        allowRequest(reqList, newUrl)
-      }, 1000)
+          "/" +
+          replaceList[replaceList.length - 1];
+        allowRequest(reqList, newUrl);
+      }, 1000);
     }
-    const res = response.data
-    if (res.state && res.state.toLowerCase() !== 'success') {
+    const res = response.data;
+    if (res.state && res.state.toLowerCase() !== "success") {
       Message({
         message: res.message,
-        type: 'error',
+        type: "error",
         duration: 5 * 1000
-      })
+      });
       // 50008:非法的token; 50012:其他客户端登录了;  "notoken":Token 过期了
       if (
         res.state.toLowerCase() === 50008 ||
         res.state.toLowerCase() === 50012 ||
-        res.state.toLowerCase() === 'notoken'
+        res.state.toLowerCase() === "notoken"
       ) {
         MessageBox.confirm(
-          '你已被登出，可以取消继续留在该页面，或者重新登录',
-          '确定登出',
+          "你已被登出，可以取消继续留在该页面，或者重新登录",
+          "确定登出",
           {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
+            confirmButtonText: "重新登录",
+            cancelButtonText: "取消",
+            type: "warning"
           }
         ).then(() => {
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-        })
+          store.dispatch("FedLogOut").then(() => {
+            location.reload(); // 为了重新实例化vue-router对象 避免bug
+          });
+        });
       }
-      return Promise.reject('error')
+      return Promise.reject("error");
     } else {
-      if (response.config.responseType === 'blob') {
-        return response
+      if (response.config.responseType === "blob") {
+        return response;
       }
-      return response.data
+      return response.data;
     }
   },
   error => {
-    if (error && !error.message && error.response.config.method === 'post') {
+    if (error && !error.message && error.response.config.method === "post") {
       setTimeout(() => {
-        const replaceList = error.response.config.url.split('/')
+        const replaceList = error.response.config.url.split("/");
         const newUrl =
           replaceList[replaceList.length - 2] +
-          '/' +
-          replaceList[replaceList.length - 1]
-        allowRequest(reqList, newUrl)
-      }, 500)
+          "/" +
+          replaceList[replaceList.length - 1];
+        allowRequest(reqList, newUrl);
+      }, 500);
     }
-    console.log('err:' + error) // for debug
+    console.log("err:" + error); // for debug
     if (error && error.response) {
       switch (
         error.response.status // 跨域存在获取不到状态码的情况
       ) {
         case 400:
-          error.message = `请求错误(400):${error.response.config.url}`
-          break
+          error.message = `请求错误(400):${error.response.config.url}`;
+          break;
 
         case 401:
-          error.message = `未授权，请登录(401):${error.response.config.url}`
-          store.dispatch('FedLogOut').then(() => {
-            location.reload() // 为了重新实例化vue-router对象 避免bug
-          })
-          break
+          error.message = `未授权，请登录(401):${error.response.config.url}`;
+          store.dispatch("FedLogOut").then(() => {
+            location.reload(); // 为了重新实例化vue-router对象 避免bug
+          });
+          break;
 
         case 403:
-          error.message = `拒绝访问(403):${error.response.config.url}`
-          break
+          error.message = `拒绝访问(403):${error.response.config.url}`;
+          break;
 
         case 404:
-          error.message = `请求地址出错(404): ${error.response.config.url}`
-          break
+          error.message = `请求地址出错(404): ${error.response.config.url}`;
+          break;
 
         case 408:
-          error.message = `请求超时(408):${error.response.config.url}`
-          break
+          error.message = `请求超时(408):${error.response.config.url}`;
+          break;
 
         case 500:
-          error.message = `服务器内部错误(500):${error.response.config.url}`
-          break
+          error.message = `服务器内部错误(500):${error.response.config.url}`;
+          break;
 
         case 501:
-          error.message = `服务未实现(501):${error.response.config.url}`
-          break
+          error.message = `服务未实现(501):${error.response.config.url}`;
+          break;
 
         case 502:
-          error.message = `网关错误(502):${error.response.config.url}`
-          break
+          error.message = `网关错误(502):${error.response.config.url}`;
+          break;
 
         case 503:
-          error.message = `服务不可用(503):${error.response.config.url}`
-          break
+          error.message = `服务不可用(503):${error.response.config.url}`;
+          break;
 
         case 504:
-          error.message = `网关超时(504):${error.response.config.url}`
-          break
+          error.message = `网关超时(504):${error.response.config.url}`;
+          break;
 
         case 505:
-          error.message = `HTTP版本不受支持(505):${error.response.config.url}`
-          break
+          error.message = `HTTP版本不受支持(505):${error.response.config.url}`;
+          break;
 
         default:
-          error.message = `连接错误:${error.response.status}`
-          break
+          error.message = `连接错误:${error.response.status}`;
+          break;
       }
-    } else if (error.message.indexOf('请求被中断') !== -1) {
-      error.message = '请勿重复请求!'
+    } else if (error.message.indexOf("请求被中断") !== -1) {
+      error.message = "请勿重复请求!";
     } else {
-      error.message = '网络出现问题，请稍后重试!'
+      error.message = "网络出现问题，请稍后重试!";
     }
     Message({
       message: error.message,
-      type: 'error',
+      type: "error",
       duration: 5 * 1000
-    })
-    return Promise.reject(error)
+    });
+    return Promise.reject(error);
   }
-)
+);
 
-export default service
+export default service;

CallCenterWeb.UI/RMYYAPP/pages/myTask/myTask.vue

@@ -86,7 +86,7 @@
 					});	
 				}, 5000)
 				
-				// this.upData()
+				this.upData()
 				// #endif
 				this.bannnerData = this.$mConstDataConfig.bannnerData
 				this.getMenuPermissions() //获取用户权限
@@ -160,7 +160,7 @@
 						console.log(data)
 						//NewCode_ = data.data.F_VersionCode; 
 						const nowVersionCode = uni.getStorageSync('versionCode')
-						const serveVersionCode = data.F_VersionCode
+						const serveVersionCode = data.F_VersionCode 
 						console.log(nowVersionCode + "---" +serveVersionCode)
 						if (nowVersionCode !== serveVersionCode) {
 							if(typeUp === 0){
@@ -177,7 +177,18 @@
 									}
 								});
 							}else if(typeUp === 1){
-								plus.runtime.openURL('https://apps.apple.com/cn/app/%E9%83%91%E5%B7%9E%E4%BA%BA%E6%B0%91%E5%8C%BB%E9%99%A2%E7%BB%BC%E5%90%88%E6%9C%8D%E5%8A%A1%E4%BF%9D%E9%9A%9C%E8%B0%83%E5%BA%A6%E5%B9%B3%E5%8F%B0/id6444557705');
+								uni.showModal({
+									title: '更新',
+									content: '是否更新',
+									success: function (res) {
+										if (res.confirm) {
+											plus.runtime.openURL(data.F_Url);
+										} else if (res.cancel) {
+											this.$mHelper.toast("取消更新");
+										}
+									}
+								});
+								
 							}
 							
 							
@@ -189,7 +200,7 @@
 				})
 			},
 			
-			getMenuPermissions() {
+			getMenuPermissions() { 
 				let code = uni.getStorageSync("roleCode")
 				this.$http.get("InternalMessages/GetCount").then((response) => {
 						if (response.state.toLowerCase() === "success") {