From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02

---
 src/api/index.js |  261 +++++++++++++++++++++++++--------------------------
 1 files changed, 127 insertions(+), 134 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 105519c..87db4d9 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -2,6 +2,7 @@
 import qs from 'qs'
 import { notification } from 'antd'
 import md5 from 'md5'
+import jsSHA from 'jssha'
 import moment from 'moment'
 import Utils from '@/utils/utils.js'
 import CacheUtils from './cacheutils'
@@ -23,14 +24,14 @@
 
 axios.defaults.crossDomain = true
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
-axios.defaults.withCredentials = true
+axios.defaults.withCredentials = false
 
 axios.interceptors.request.use((config) => {
   if (config.url.includes('LoginAndRedirect') || config.url.includes('getjsonresult') || config.url.includes('wxNativePay')) {
     config.data = qs.stringify(config.data)
   } else if (config.url.includes('Upload') || config.url.includes('doupload') || config.url.includes('dopreload')) {
     config.headers = { 'Content-Type': 'multipart/form-data' }
-  } else if (config.method === 'post') {
+  } else if (config.method === 'post' && config.data) {
     config.data = JSON.stringify(config.data)
   }
 
@@ -82,7 +83,7 @@
     if (process.env.NODE_ENV === 'production') {
       axios.defaults.baseURL = document.location.origin + '/' + window.GLOB.service
     } else {
-      // axios.defaults.baseURL = 'http://127.0.0.1:8888'
+      axios.defaults.baseURL = window.GLOB.location + '/' + window.GLOB.service
     }
   }
   
@@ -104,7 +105,20 @@
    * @description 鐩存帴璇锋眰
    * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
    */
-  directRequest (url, method = 'post', param) {
+  directRequest (url, method = 'post', param, cross) {
+    if (cross === 'true' && param) {
+      return axios({
+        url,
+        method,
+        data: param
+      })
+    } else if (cross === 'true') {
+      return axios({
+        url,
+        method
+      })
+    }
+
     let params = { method: 'post' }
     let _url = url
 
@@ -119,27 +133,9 @@
     }
 
     _url = _url.replace(/&/ig, '%26')
-    // _url = window.btoa(_url)
     params.url = '/trans/redirect?rd=' + _url + '&method=' + method
 
     return axios(params)
-  }
-
-  /**
-   * @description 浣跨敤dostar鎺ュ彛锛岃烦杞嚦dostars
-   * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
-   */
-  dostarToDostars (param) {
-    param.userid = param.userid || sessionStorage.getItem('UserID') || ''
-    param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
-
-    param = this.encryptParam(param)
-
-    return axios({
-      url: '/webapi/dostar',
-      method: 'post',
-      data: param
-    })
   }
 
   /**
@@ -165,12 +161,14 @@
 
     param.appkey = window.GLOB.appkey || ''
 
+    let url = '/webapi/dologon/s_visitor_login'
     if (window.GLOB.mainSystemApi) {
-      param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
+      // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
+      param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon/s_visitor_login')
     }
 
     return axios({
-      url: '/webapi/dologon',
+      url: url,
       method: 'post',
       data: param
     })
@@ -179,7 +177,7 @@
   /**
    * @description 鎵嬫満鍙烽獙璇佺爜鐧诲綍
    */
-  getphoneusermsg (phoneNo, checkcode, isCloud = false) {
+  getphoneusermsg (phoneNo, checkcode, isCloud = false, ipAddress, city) {
     let param = {
       // func: 'webapi_login',
       mob: phoneNo,
@@ -187,22 +185,30 @@
       Password: '',
       check_code: checkcode,
       way_no: 'sms_vcode',
-      systemType: options.sysType
+      systemType: options.sysType,
+      login_city: city,
+      login_id_address: ipAddress
     }
 
     param.appkey = window.GLOB.appkey || ''
 
+    let url = '/webapi/dologon'
     if (isCloud) {
       param.debug = 'Y'
       if (options.cloudServiceApi) {
+        // url = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
         param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
       }
-    } else if (!isCloud && window.GLOB.mainSystemApi) {
+    } else if (window.GLOB.mainSystemApi) {
+      if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
+        param.linkurl = window.GLOB.linkurl
+      }
+      // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
       param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
     }
 
     return axios({
-      url: '/webapi/dologon',
+      url,
       method: 'post',
       data: param
     })
@@ -211,29 +217,52 @@
   /**
    * @description 鐧诲綍绯荤粺, 鑾峰彇鐢ㄦ埛淇℃伅
    */
-  getusermsg (username, password, isCloud = false) {
+  getusermsg (username, password, isCloud = false, ipAddress, city) {
     let param = {
       // func: 'webapi_login',
       UserName: username,
-      Password: password,
       systemType: options.sysType,
-      Type: 'X'
+      Type: 'S',
+      login_city: city,
+      login_id_address: ipAddress
     }
 
-    param.Password = Utils.formatOptions(param.Password)
+    // Type: 'S' 鏃�
+    let shaObj = new jsSHA('SHA-1', 'TEXT')
+    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+
+    let sys_datetime = sessionStorage.getItem('sys_datetime')
+    let app_datetime = sessionStorage.getItem('app_datetime')
+    if (sys_datetime && app_datetime) {
+      let seconds = Math.floor((new Date().getTime() - app_datetime) / 1000)
+      param.timestamp = moment(sys_datetime, 'YYYY-MM-DD HH:mm:ss').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss')
+    }
+    
+    shaObj.update(password)
+    param.Password = shaObj.getHash('HEX').toUpperCase()
+    param.Password = md5(username + param.Password + param.timestamp)
+
+    // Type: 'X' 鏃�
+    // param.Password = Utils.formatOptions(password)
     param.appkey = window.GLOB.appkey || ''
+    let url = '/webapi/dologon'
 
     if (isCloud) {
       param.debug = 'Y'
       if (options.cloudServiceApi) {
+        // url = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
         param.rduri = options.cloudServiceApi.replace(/\/webapi(.*)/, '/webapi/dologon')
       }
-    } else if (!isCloud && window.GLOB.mainSystemApi) {
+    } else if (window.GLOB.mainSystemApi) {
+      if (options.sysType !== 'cloud' && window.GLOB.systemType !== 'production') {
+        param.linkurl = window.GLOB.linkurl
+      }
+      // url = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
       param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
     }
 
     return axios({
-      url: '/webapi/dologon',
+      url,
       method: 'post',
       data: param
     })
@@ -248,11 +277,18 @@
       return Promise.reject()
     }
 
+    let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+    let sys_datetime = sessionStorage.getItem('sys_datetime')
+    let app_datetime = sessionStorage.getItem('app_datetime')
+    if (sys_datetime && app_datetime) {
+      let seconds = Math.floor((new Date().getTime() - app_datetime) / 1000)
+      curTime = moment(sys_datetime, 'YYYY-MM-DD HH:mm:ss').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss') + '.000'
+    }
+
     if (window.GLOB.WebSql) {
       return new Promise((resolve, reject) => {
         CacheUtils.getWebSqlVersion().then(msg => {
           appVersion.oldVersion = msg.version || ''
-          let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
           let param = {
             func: 's_get_app_version',
             modifydate: msg.createDate || curTime,
@@ -299,7 +335,6 @@
       return new Promise((resolve, reject) => {
         CacheUtils.getIndexDBVersion().then(msg => {
           appVersion.oldVersion = msg.version || ''
-          let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
           let param = {
             func: 's_get_app_version',
             modifydate: msg.createDate || curTime,
@@ -324,7 +359,7 @@
 
               if (clear) {
                 CacheUtils.clearIndexDBConfig()
-              } else if (res.menu_data && res.menu_data.length > 0) {
+              } else {
                 let keys = res.menu_data.map(mid => `'${mid.menuid}'`)
                 CacheUtils.delIndexDBConfig(keys)
               }
@@ -376,99 +411,46 @@
     param.lang = param.lang || sessionStorage.getItem('lang') || ''
     param.appkey = window.GLOB.appkey || ''
     param.SessionUid = localStorage.getItem('SessionUid') || ''
-
-    if (sessionStorage.getItem('CloudUserID') && options.cloudServiceApi) { // 瀛樺湪浜戠鐧诲綍淇℃伅锛屼笖瀛樺湪浜戠鍦板潃
-      param.rduri = options.cloudServiceApi
-      param.userid = sessionStorage.getItem('CloudUserID')
-      param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
-    } else if (window.GLOB.mainSystemApi) {
-      param.rduri = window.GLOB.mainSystemApi
-      param.userid = sessionStorage.getItem('UserID')
-      param.LoginUID = sessionStorage.getItem('LoginUID') || ''
-    } else {
-      param.userid = sessionStorage.getItem('UserID')
-      param.LoginUID = sessionStorage.getItem('LoginUID') || ''
-    }
+    param.userid = sessionStorage.getItem('CloudUserID') || ''
+    param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
 
     param = this.encryptParam(param)
 
+    let url = options.cloudServiceApi ? options.cloudServiceApi : '/webapi/dostars'
+    if (param.func) {
+      url = url + '/' + param.func
+    }
+
     return axios({
-      url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+      url,
       method: 'post',
       data: param
     })
   }
 
   /**
-   * @description 鑾峰彇浜戠閰嶇疆锛屽苟缂撳瓨淇℃伅
-   */
-  getCloudCacheConfig (param) {
-    param.lang = param.lang || sessionStorage.getItem('lang') || ''
-    param.appkey = window.GLOB.appkey || ''
-    param.SessionUid = localStorage.getItem('SessionUid') || ''
-
-    if (sessionStorage.getItem('CloudUserID') && options.cloudServiceApi) { // 瀛樺湪浜戠鐧诲綍淇℃伅锛屼笖瀛樺湪浜戠鍦板潃
-      param.rduri = options.cloudServiceApi
-      param.userid = sessionStorage.getItem('CloudUserID')
-      param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
-    } else if (window.GLOB.mainSystemApi) {
-      param.rduri = window.GLOB.mainSystemApi
-      param.userid = sessionStorage.getItem('UserID')
-      param.LoginUID = sessionStorage.getItem('LoginUID') || ''
-    } else {
-      param.userid = sessionStorage.getItem('UserID')
-      param.LoginUID = sessionStorage.getItem('LoginUID') || ''
-    }
-
-    let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
-    delete _param.timestamp
-    delete _param.secretkey
-    delete _param.open_key
-    _param = JSON.stringify(_param)
-    _param  = md5(_param)
-    
-    if (window.GLOB.CacheMap.has(_param)) {
-      return Promise.resolve(window.GLOB.CacheMap.get(_param))
-    } else {
-      param = this.encryptParam(param)
-
-      return new Promise(resolve => {
-        axios({
-          url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
-          method: 'post',
-          data: param
-        }).then(res => {
-          if (res.status) {
-            window.GLOB.CacheMap.set(_param, res)
-          }
-          resolve(res)
-        })
-      })
-    }
-  }
-
-  /**
    * @description 鑾峰彇鎴栦慨鏀圭郴缁熼厤缃紝澧炲姞appkey
    */
   getSystemConfig (param) {
-    param.userid = sessionStorage.getItem('UserID') || ''
+    param.userid = param.userid || sessionStorage.getItem('UserID') || ''
     param.lang = param.lang || sessionStorage.getItem('lang') || ''
     param.SessionUid = localStorage.getItem('SessionUid') || ''
-    param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+    param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
 
+    let url = '/webapi/dostars'
     if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
-      param.rduri = options.cloudServiceApi
+      url = options.cloudServiceApi
       param.userid = sessionStorage.getItem('CloudUserID') || ''
       param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
     } else if (window.GLOB.mainSystemApi) {
-      param.rduri = window.GLOB.mainSystemApi
+      url = window.GLOB.mainSystemApi
     }
 
     param = this.encryptParam(param)
 
     return axios({
-      url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+      url: `${url}${param.func ? '/' + param.func : ''}`,
       method: 'post',
       data: param
     })
@@ -478,16 +460,22 @@
    * @description 鑾峰彇鎴栦慨鏀规湰鍦伴厤缃紝澧炲姞appkey
    */
   getLocalConfig (param) {
-    param.userid = sessionStorage.getItem('UserID') || ''
+    param.userid = param.userid || sessionStorage.getItem('UserID') || ''
     param.lang = param.lang || sessionStorage.getItem('lang') || ''
     param.SessionUid = localStorage.getItem('SessionUid') || ''
-    param.LoginUID = sessionStorage.getItem('LoginUID') || ''
+    param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
+
+    let url = '/webapi/dostars'
+    if (param.rduri) {
+      url = param.rduri
+      delete param.rduri
+    }
 
     param = this.encryptParam(param)
 
     return axios({
-      url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+      url: `${url}${param.func ? '/' + param.func : ''}`,
       method: 'post',
       data: param
     })
@@ -504,14 +492,15 @@
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
 
+    let url = '/webapi/dostars'
     if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
       if (options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
-        param.rduri = options.cloudServiceApi
+        url = options.cloudServiceApi
         param.userid = sessionStorage.getItem('CloudUserID') || ''
         param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
       }
     } else if (window.GLOB.mainSystemApi) {
-      param.rduri = window.GLOB.mainSystemApi
+      url = window.GLOB.mainSystemApi
     }
 
     let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
@@ -528,7 +517,7 @@
         }, () => {
           param = this.encryptParam(param)
           axios({
-            url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+            url: `${url}${param.func ? '/' + param.func : ''}`,
             method: 'post',
             data: param
           }).then(res => {
@@ -548,7 +537,7 @@
         }, () => {
           param = this.encryptParam(param)
           axios({
-            url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+            url: `${url}${param.func ? '/' + param.func : ''}`,
             method: 'post',
             data: param
           }).then(res => {
@@ -574,7 +563,7 @@
 
       return new Promise(resolve => {
         axios({
-          url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+          url: `${url}${param.func ? '/' + param.func : ''}`,
           method: 'post',
           data: param
         }).then(res => {
@@ -597,10 +586,6 @@
     param.SessionUid = localStorage.getItem('SessionUid') || ''
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
-
-    if (window.GLOB.mainSystemApi) {
-      param.rduri = window.GLOB.mainSystemApi
-    }
 
     let _param  = md5(JSON.stringify(param))
     
@@ -655,6 +640,12 @@
     param.LoginUID = param.LoginUID || sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
 
+    let url = '/webapi/dostars'
+    if (param.rduri) {
+      url = param.rduri
+      delete param.rduri
+    }
+
     let _param = JSON.parse(JSON.stringify(param)) // 缂撳瓨鏍￠獙锛屽幓闄ゆ椂闂村拰鍔犲瘑瀛楃
     delete _param.timestamp
     delete _param.secretkey
@@ -669,7 +660,7 @@
 
       return new Promise(resolve => {
         axios({
-          url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
+          url: `${url}${param.func ? '/' + param.func : ''}`,
           method: 'post',
           data: param
         }).then(res => {
@@ -686,16 +677,23 @@
    * @description 鑾峰彇涓氬姟閫氱敤鎺ュ彛
    */
   genericInterface (param) {
-    param.userid = sessionStorage.getItem('UserID')
+    param.userid = sessionStorage.getItem('UserID') || ''
     param.lang = sessionStorage.getItem('lang') || ''
     param.SessionUid = localStorage.getItem('SessionUid') || ''
     param.LoginUID = sessionStorage.getItem('LoginUID') || ''
     param.appkey = window.GLOB.appkey || ''
 
     if (options.cloudServiceApi && param.rduri === options.cloudServiceApi) { // HS涓嬭彍鍗�
-      param.userid = sessionStorage.getItem('CloudUserID') || ''
-      param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+      param.userid = sessionStorage.getItem('CloudUserID') || param.userid || ''
+      param.LoginUID = sessionStorage.getItem('CloudLoginUID') || param.LoginUID || ''
     }
+
+    // 寰呬紭鍖栵紝澧炲姞鏄惁鏀寔璺ㄥ煙璇锋眰
+    // let url = '/webapi/dostars'
+    // if (param.rduri) {
+    //   url = param.rduri
+    //   delete param.rduri
+    // }
 
     param = this.encryptParam(param)
 
@@ -723,7 +721,6 @@
         method: 'post',
         data: param
       }).then(res => {
-
         try {
           const blob = new Blob([res])
           
@@ -774,21 +771,17 @@
 
     param = this.encryptParam(param)
 
+    let url = '/webapi/SaveBase64Image'
     if (param.rduri) {
-      param.rduri = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image')
-
-      return axios({
-        url: '/webapi/dostars',
-        method: 'post',
-        data: param
-      })
-    } else {
-      return axios({
-        url: '/webapi/SaveBase64Image',
-        method: 'post',
-        data: param
-      })
+      url = param.rduri.replace(/webapi(.*)$/, 'webapi/SaveBase64Image')
+      delete param.rduri
     }
+
+    return axios({
+      url,
+      method: 'post',
+      data: param
+    })
   }
 
   /**

--
Gitblit v1.8.0