Merge pull request #22 from John-Hong/John/Microservices

John/microservices

src/App.vue

@@ -192,7 +192,7 @@ export default {
         // window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
         // window.api = 'qaApi';
         window.env = 'dev';
-        window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
+        window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/c/api';
         window.api = 'devApi';
         return;
       }
@@ -207,11 +207,16 @@ export default {
       window.api = 'api';
     },
     requestInit() {
+      let baseURL = window.profileApi + '/temporary-parking/v1';
+      if (window.location.href.indexOf('tparking.') < 0 ) {
+        baseURL = '/msApi'
+      }
       window.requestms = createAxiosByinterceptors({
         // baseURL: `https://dev-kip-service-internal.kerryonvip.com/`,
         // baseURL: `http://tp.hht.test/`,
         // baseURL: window.profileApi, // TODO: 微服务发布到DEV环境之后取消注释
-        baseURL: `/msApi`,
+        baseURL
+        // baseURL: `/msApi`,
       });
     },
     // websocket 链接

src/api/request.js

@@ -1,6 +1,7 @@
 import uni from '@/utils/uniHooks';
 import { getUTMSource } from '@/utils/utils';
 import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
+import {md} from '@/utils/common'
 // import { Message } from 'element-ui';
 // import { jumpLogin } from '@/utils';
 // import { Loading } from 'element-ui';
@@ -20,6 +21,7 @@ const CONTENT_TYPE_ARRAY = {
 };
 
 function getHeaders(config = {}) {
+  console.log(24, '接口返送出去的config', config);
   const { contentType = 'json' } = config;
   const ct = CONTENT_TYPE_ARRAY[contentType];
   let header = {
@@ -140,8 +142,19 @@ function XUser(config) {
   console.log(140140140140, params);
   return JSON.stringify(params);
 }
-
+function getSign(config) {
+  let params = {}
+  if(config.method === 'get' && config?.params) {
+    params = config.params
+  }
+  if(config.method === 'post' && config?.data) {
+    params = JSON.parse(config.data)
+  }
+  const newHeader = md(params, true)
+  return newHeader
+}
 export const createAxiosByinterceptors = (config) => {
+  console.log('接口返送出去的config', config);
   const instance = axios.create({
     timeout: 100000, //超时配置
     baseURL: `${window.profileApi}/temporary-parking-service`,
@@ -154,12 +167,13 @@ export const createAxiosByinterceptors = (config) => {
     function (config) {
       // 在发送请求之前做些什么
       const { loading = true } = config;
-      console.log('configconfig:', config);
+      console.log('接口返送出去的config160:', config);
       if (loading) addLoading();
       // 设置 headers
       config.headers = {
         ...config.headers,
         ...handleConfig().header,
+        ...getSign(config),
         'XConversationId': uuidv4(),
         'X-User': XUser(config),
       };

src/utils/common.js

@@ -1,8 +1,9 @@
 // 验签
 var log = require('@/utils/log.js')
 import uni from './uniHooks'
+import md5 from 'js-md5';
 
-export function md(params) {
+export function md(params, callback = false) {
   let signStr = '';
   let timeStamp = '10000';
   let password = '123456'
@@ -18,8 +19,8 @@ export function md(params) {
   })
   signStr = signStr + password + "&" + timeStamp;
   log.info('MD5签名参数:' + signStr)
-  var sign = this.$md5(signStr);
-  uni.setStorageSync('handleUser', JSON.stringify({
+  let sign = callback ? md5(signStr) : this.$md5(signStr);
+  const headers = {
     'Content-Type': 'application/json; charset=utf-8',
     // #ifdef MP-WEIXIN
     // 'user': 'sys_miniprogram',
@@ -29,7 +30,11 @@ export function md(params) {
     // #endif
     'timeStamp': timeStamp,
     'sign': sign
-  }))
+  }
+  uni.setStorageSync('handleUser', JSON.stringify(headers))
+  if(callback) {
+    return headers
+  }
 }
 
 // 手机号码隐藏中间4位