Merge branch 'master' of http://114.67.93.201/xulili/ybf

ybf_admin/src/api/login/main.js

 import request from '@/utils/request'
 import qs from 'qs'
 
+// export function ApiTestGet() {
+//   return request({
+//     url: '/admin/common/findLoginType',
+//     method: 'get'
+//   })
+// }
+// export function ApiLoginSubmit(inData) {
+//   return request({
+//     url: '/admin/common/login',
+//     method: 'post',
+//     data: qs.stringify(inData)
+//   })
+// }
 export function ApiTestGet() {
   return request({
     url: '/admin/common/findLoginType',

ybf_wx/src/api/test/main.js

@@ -13,8 +13,8 @@ export function ApiTestCfPost(inData) {
     }
     return request({
         url: '',
-        method: 'post',
-        data: postData
+        method: 'get',
+        params: postData
     })
 }
 

ybf_wx/src/utils/bRequestEa.js

@@ -2,7 +2,8 @@ import axios from 'axios'
 import md5 from "js-md5"
 
 // let BASE_API = "https://gd.chfatech.com/guangdian"
-let BASE_API = "/api/"
+// let BASE_API = "/api/"
+let BASE_API = "/api"
 
 const zlog = console.log.bind(console)
 
@@ -18,7 +19,7 @@ const createSign = (inPostData, inAppSecret) => {
 
     // URL 编码
     for (let key in args) {
-      res += encodeURIComponent(key) + "%3d" + encodeURIComponent(args[key]).toLowerCase() + "%26";
+        res += encodeURIComponent(key) + "%3d" + encodeURIComponent(args[key]).toLowerCase() + "%26";
     }
     res = res.slice(0, -3);
 
@@ -26,12 +27,14 @@ const createSign = (inPostData, inAppSecret) => {
     res += `&appUser=${appUser}&appCode=${appCode}&${ts} ${appSecret}`
 
     return res;
-  };
+};
 
 // Basic Info
 let basicInfo = {
-    appUser: "user001",
+    // appUser: "user001",
+    appUser: "YBF001",
     ver: "v2.17",
+    // appSecret: "JeC0mmE2ZjZmOfdmTGImYzU5Yjg1AYU2M3F="
     appSecret: "JeC0mmE2ZjZmOfdmTGImYzU5Yjg1AYU2M3F="
 }
 
@@ -44,31 +47,59 @@ const service = axios.create({
 // request 拦截器
 service.interceptors.request.use(
     req => {
-        // log('--->axios: req.data:', req.data)
-        let oldPostData = JSON.parse(JSON.stringify(req.data))
-        let newPostData = {
-            appUser: basicInfo.appUser,
-            appCode: oldPostData.args.appCode,
-            ts: String(Date.parse(new Date())),
-            ver: basicInfo.ver,
-            args: oldPostData.args
+        // zlog('--->axios: req.params: start:', req.params)
+        let apiMethod = req.method
+
+        if (apiMethod === 'post') {
+            // log('--->axios: req.data:', req.data)
+            let oldPostData = JSON.parse(JSON.stringify(req.data))
+            let newPostData = {
+                appUser: basicInfo.appUser,
+                appCode: oldPostData.args.appCode,
+                ts: String(Date.parse(new Date())),
+                ver: basicInfo.ver,
+                args: oldPostData.args
+            }
+
+            delete newPostData.args.appCode
+
+            let postData = {
+                appUser: newPostData.appUser,
+                appCode: newPostData.appCode,
+                ts: newPostData.ts,
+                sign: md5(createSign(newPostData, basicInfo.appSecret)),
+                ver: newPostData.ver,
+                args: newPostData.args
+            }
+
+            req.data = postData
         }
-
-        delete newPostData.args.appCode
-
-        let postData = {
-            appUser: newPostData.appUser,
-            appCode: newPostData.appCode,
-            ts: newPostData.ts,
-            sign: md5(createSign(newPostData, basicInfo.appSecret)),
-            ver: newPostData.ver,
-            args: newPostData.args
+        if (apiMethod === 'get') {
+            // log('--->axios: req.data:', req.data)
+            let oldPostData = JSON.parse(JSON.stringify(req.params))
+            let newPostData = {
+                appUser: basicInfo.appUser,
+                appCode: oldPostData.args.appCode,
+                ts: String(Date.parse(new Date())),
+                ver: basicInfo.ver,
+                args: oldPostData.args
+            }
+
+            delete newPostData.args.appCode
+
+            let postData = {
+                appUser: newPostData.appUser,
+                appCode: newPostData.appCode,
+                ts: newPostData.ts,
+                sign: md5(createSign(newPostData, basicInfo.appSecret)),
+                ver: newPostData.ver,
+                args: newPostData.args
+            }
+
+            req.params = postData
         }
 
-        zlog()
-
-        req.data = postData
-
+        // zlog('--->axios: req.params: end:', req.params)
         return req
     },
     error => {

ybf_wx/vue.config.js

@@ -16,7 +16,7 @@ module.exports = {
     proxy: {
       '/api': {
         ws: false,
-        target: 'http://111.26.165.55:8010',
+        target: 'http://111.26.165.55:8010/crminterface.ashx',
         changeOrigin: true,
         pathRewrite: {
           '^/api': ''