From bebeca442cee4b83de0d00df29a6514b3f723c4f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 13:41:06 +0800
Subject: [PATCH] 2021-07-28

---
 src/api/index.js |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 4ef1cb0..c5f65d9 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -46,6 +46,16 @@
       let _href = window.location.href.split('#')
       localStorage.setItem(_href[0] + 'paramsmain', _href[1])
     }
+    localStorage.removeItem('UserID')
+    localStorage.removeItem('LoginUID')
+    localStorage.removeItem('User_Name')
+    localStorage.removeItem('Full_Name')
+    localStorage.removeItem('avatar')
+    localStorage.removeItem('dataM')
+    localStorage.removeItem('localDataM')
+    localStorage.removeItem('debug')
+    localStorage.removeItem('role_id')
+    localStorage.removeItem('localRole_id')
 
     sessionStorage.clear()
     sessionStorage.setItem('loginError', JSON.stringify({request: res.config ? res.config.data : '', response: JSON.stringify(res.data)}))
@@ -102,7 +112,25 @@
   }
 
   /**
-   * @description 鐩存帴璇锋眰
+   * @description 浣跨敤dostar鎺ュ彛锛岃烦杩囬獙璇�
+   * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
+   */
+  loginAndRedirect (param) {
+    let url = ''
+    if (process.env.NODE_ENV === 'production') {
+      url = document.location.origin + '/Home/LoginAndRedirect'
+    } else {
+      url = '/Home/LoginAndRedirect'
+    }
+
+    return axios({
+      url: url,
+      method: 'post',
+      data: param
+    })
+  }
+
+  /* @description 鐩存帴璇锋眰
    * @param {Object} param 鏌ヨ鍙婃彁浜ゅ弬鏁�
    */
   directRequest (url, method = 'post', param, cross) {
@@ -227,8 +255,6 @@
       login_id_address: ipAddress
     }
 
-    // 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')
@@ -238,12 +264,22 @@
       param.timestamp = moment(sys_datetime, 'YYYY-MM-DD HH:mm:ss').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss')
     }
     
+    // Type: 'S' 鏃�
+    let shaObj = new jsSHA('SHA-1', 'TEXT')
     shaObj.update(password)
     param.Password = shaObj.getHash('HEX').toUpperCase()
     param.Password = md5(username + param.Password + param.timestamp)
 
+    // Type: 'mk_' 鏃�
+    // param.Type = '鍏挜'
+    // let shaObj = new jsSHA('SHA-1', 'TEXT')
+    // 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'
 
@@ -289,9 +325,14 @@
       return new Promise((resolve, reject) => {
         CacheUtils.getWebSqlVersion().then(msg => {
           appVersion.oldVersion = msg.version || ''
+          let modifydate = msg.createDate || curTime
+          if (modifydate.indexOf('Invalid date') > -1) {
+            modifydate = curTime
+          }
+
           let param = {
             func: 's_get_app_version',
-            modifydate: msg.createDate || curTime,
+            modifydate
           }
   
           this.getSystemConfig(param).then(res => {
@@ -335,9 +376,13 @@
       return new Promise((resolve, reject) => {
         CacheUtils.getIndexDBVersion().then(msg => {
           appVersion.oldVersion = msg.version || ''
+          let modifydate = msg.createDate || curTime
+          if (modifydate.indexOf('Invalid date') > -1) {
+            modifydate = curTime
+          }
           let param = {
             func: 's_get_app_version',
-            modifydate: msg.createDate || curTime,
+            modifydate
           }
 
           this.getSystemConfig(param).then(res => {

--
Gitblit v1.8.0