From 4cf3c14e6cd5ababdc6c7fddad1726395ed083b7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 16 三月 2021 12:21:16 +0800
Subject: [PATCH] 2021-03-16
---
src/api/index.js | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 105519c..eaa86c6 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'
@@ -197,7 +198,10 @@
if (options.cloudServiceApi) {
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
+ }
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
@@ -212,15 +216,23 @@
* @description 鐧诲綍绯荤粺, 鑾峰彇鐢ㄦ埛淇℃伅
*/
getusermsg (username, password, isCloud = false) {
+
let param = {
// func: 'webapi_login',
UserName: username,
- Password: password,
systemType: options.sysType,
- Type: 'X'
+ Type: 'S'
}
- 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')
+ 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 || ''
if (isCloud) {
@@ -228,7 +240,10 @@
if (options.cloudServiceApi) {
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
+ }
param.rduri = window.GLOB.mainSystemApi.replace(/\/webapi(.*)/, '/webapi/dologon')
}
@@ -324,7 +339,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,19 +391,9 @@
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.rduri = options.cloudServiceApi || ''
+ param.userid = sessionStorage.getItem('CloudUserID') || ''
+ param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
param = this.encryptParam(param)
@@ -407,15 +412,11 @@
param.appkey = window.GLOB.appkey || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
- if (sessionStorage.getItem('CloudUserID') && options.cloudServiceApi) { // 瀛樺湪浜戠鐧诲綍淇℃伅锛屼笖瀛樺湪浜戠鍦板潃
+ if (options.cloudServiceApi) { // 闈炰簯绔姹�
param.rduri = options.cloudServiceApi
- param.userid = sessionStorage.getItem('CloudUserID')
+ 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 {
+ } else { // 浜戠璇锋眰
param.userid = sessionStorage.getItem('UserID')
param.LoginUID = sessionStorage.getItem('LoginUID') || ''
}
@@ -686,15 +687,15 @@
* @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 || ''
}
param = this.encryptParam(param)
@@ -723,7 +724,6 @@
method: 'post',
data: param
}).then(res => {
-
try {
const blob = new Blob([res])
--
Gitblit v1.8.0