Merge remote-tracking branch 'origin/master'

ah-jjzhgd-web/src/utils/request.js

@@ -4,6 +4,7 @@ import store from '@/store'
 import { getToken, removeToken,tansParams } from '@/utils/auth'
 import router from '@/router' // @表示src目录
 import cache from '@/utils/cache'
+import { encryptCBC, decryptCBC } from '@/utils/aescbc'
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
@@ -39,10 +40,22 @@ service.interceptors.request.use(config => {
   if (getToken() && !isToken) {
     config.headers['Authorization'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
+  config.headers['Content-Type']='application/json'
+  //参数加密
+  if (config.method === 'post' && config.data) {
+    config.data = encryptCBC(JSON.stringify(config.data))
+  }
   // get请求映射params参数
   if (config.method === 'get' && config.params) {
-    let url = config.url + '?' + tansParams(config.params);
-    url = url.slice(0, -1);
+    //未加密
+    // let url = config.url + '?' + tansParams(config.params);
+    // url = url.slice(0, -1);
+    //加密
+    // console.log(tansParams(config.params))
+    let urlStr = tansParams(config.params);
+    urlStr = urlStr.slice(0, -1);
+    // console.log(urlStr)
+    let url = config.url + '?params='+ encryptCBC(tansParams(urlStr))
     config.params = {};
     config.url = url;
   }