From 945ec2bc1fc213361376442f16a923afd6857cf2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 七月 2023 00:08:30 +0800
Subject: [PATCH] 2023-07-28
---
src/index.js | 26 +++---
src/api/index.js | 20 ++--
src/tabviews/zshare/actionList/changeuserbutton/index.jsx | 44 +++++-----
src/views/login/index.jsx | 100 ++++++++++++------------
4 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 00f9a74..3fe754c 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -46,16 +46,16 @@
onOk: () => {
window.GLOB.$error = false
- 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('mk_user_type')
+ // 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('mk_user_type')
sessionStorage.clear()
if (!!(window.history && window.history.pushState)) {
diff --git a/src/index.js b/src/index.js
index f1d09e9..7dad99c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -44,19 +44,19 @@
}
// bms
-sessionStorage.setItem('UserID', localStorage.getItem('UserID') || '')
-sessionStorage.setItem('LoginUID', localStorage.getItem('LoginUID') || '')
-sessionStorage.setItem('User_Name', localStorage.getItem('User_Name') || '')
-sessionStorage.setItem('Full_Name', localStorage.getItem('Full_Name') || '')
-sessionStorage.setItem('avatar', localStorage.getItem('avatar') || '')
-sessionStorage.setItem('dataM', localStorage.getItem('dataM') || '')
-sessionStorage.setItem('localDataM', localStorage.getItem('localDataM') || '')
-sessionStorage.setItem('debug', localStorage.getItem('debug') || '')
-sessionStorage.setItem('role_id', localStorage.getItem('role_id') || '')
-sessionStorage.setItem('departmentcode', localStorage.getItem('departmentcode') || '')
-sessionStorage.setItem('organization', localStorage.getItem('organization') || '')
-sessionStorage.setItem('mk_user_type', localStorage.getItem('mk_user_type') || '')
-sessionStorage.setItem('lang', 'zh-CN')
+// sessionStorage.setItem('UserID', localStorage.getItem('UserID') || '')
+// sessionStorage.setItem('LoginUID', localStorage.getItem('LoginUID') || '')
+// sessionStorage.setItem('User_Name', localStorage.getItem('User_Name') || '')
+// sessionStorage.setItem('Full_Name', localStorage.getItem('Full_Name') || '')
+// sessionStorage.setItem('avatar', localStorage.getItem('avatar') || '')
+// sessionStorage.setItem('dataM', localStorage.getItem('dataM') || '')
+// sessionStorage.setItem('localDataM', localStorage.getItem('localDataM') || '')
+// sessionStorage.setItem('debug', localStorage.getItem('debug') || '')
+// sessionStorage.setItem('role_id', localStorage.getItem('role_id') || '')
+// sessionStorage.setItem('departmentcode', localStorage.getItem('departmentcode') || '')
+// sessionStorage.setItem('organization', localStorage.getItem('organization') || '')
+// sessionStorage.setItem('mk_user_type', localStorage.getItem('mk_user_type') || '')
+// sessionStorage.setItem('lang', 'zh-CN')
if (sessionStorage.getItem('loginError')) {
try {
diff --git a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
index 9311874..6d22822 100644
--- a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
@@ -180,29 +180,29 @@
Api.genericInterface(param).then(res => {
resolve()
if (res.status) {
- // sessionStorage.setItem('UserID', res.UserID)
- // sessionStorage.setItem('LoginUID', res.LoginUID)
- // sessionStorage.setItem('User_Name', res.UserName)
- // sessionStorage.setItem('Full_Name', res.FullName)
- // sessionStorage.setItem('avatar', res.icon || '')
- // sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
- // sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
- // sessionStorage.setItem('debug', res.debug || '')
- // sessionStorage.setItem('role_id', res.role_id || '')
- // sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
+ sessionStorage.setItem('UserID', res.UserID)
+ sessionStorage.setItem('LoginUID', res.LoginUID)
+ sessionStorage.setItem('User_Name', res.UserName)
+ sessionStorage.setItem('Full_Name', res.FullName)
+ sessionStorage.setItem('avatar', res.icon || '')
+ sessionStorage.setItem('dataM', res.dataM ? 'true' : '')
+ sessionStorage.setItem('localDataM', res.dataM ? 'true' : '')
+ sessionStorage.setItem('debug', res.debug || '')
+ sessionStorage.setItem('role_id', res.role_id || '')
+ sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- localStorage.setItem('UserID', res.UserID)
- localStorage.setItem('LoginUID', res.LoginUID)
- localStorage.setItem('User_Name', res.UserName)
- localStorage.setItem('Full_Name', res.FullName)
- localStorage.setItem('avatar', res.icon || '')
- localStorage.setItem('dataM', res.dataM ? 'true' : '')
- localStorage.setItem('localDataM', res.dataM ? 'true' : '')
- localStorage.setItem('debug', res.debug || '')
- localStorage.setItem('role_id', res.role_id || '')
- localStorage.setItem('departmentcode', res.departmentcode || '')
- localStorage.setItem('organization', res.organization || '')
- localStorage.setItem('mk_user_type', res.mk_user_type || '')
+ // localStorage.setItem('UserID', res.UserID)
+ // localStorage.setItem('LoginUID', res.LoginUID)
+ // localStorage.setItem('User_Name', res.UserName)
+ // localStorage.setItem('Full_Name', res.FullName)
+ // localStorage.setItem('avatar', res.icon || '')
+ // localStorage.setItem('dataM', res.dataM ? 'true' : '')
+ // localStorage.setItem('localDataM', res.dataM ? 'true' : '')
+ // localStorage.setItem('debug', res.debug || '')
+ // localStorage.setItem('role_id', res.role_id || '')
+ // localStorage.setItem('departmentcode', res.departmentcode || '')
+ // localStorage.setItem('organization', res.organization || '')
+ // localStorage.setItem('mk_user_type', res.mk_user_type || '')
sessionStorage.removeItem('CloudAvatar')
sessionStorage.removeItem('cloudDataM')
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 2183c9c..c4a8283 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -43,15 +43,15 @@
}
UNSAFE_componentWillMount() {
- 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('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')
sessionStorage.clear()
}
@@ -99,20 +99,20 @@
return
}
}
- localStorage.setItem('UserID', res.UserID)
- localStorage.setItem('LoginUID', res.LoginUID)
- localStorage.setItem('User_Name', res.UserName)
- localStorage.setItem('Full_Name', res.FullName)
- localStorage.setItem('avatar', res.icon || '')
- localStorage.setItem('dataM', res.dataM ? 'true' : '')
- localStorage.setItem('localDataM', res.dataM ? 'true' : '')
- localStorage.setItem('debug', res.debug || '')
- localStorage.setItem('role_id', res.role_id || '')
- localStorage.setItem('departmentcode', res.departmentcode || '')
- localStorage.setItem('organization', res.organization || '')
- localStorage.setItem('mk_user_type', res.mk_user_type || '')
+ // localStorage.setItem('UserID', res.UserID)
+ // localStorage.setItem('LoginUID', res.LoginUID)
+ // localStorage.setItem('User_Name', res.UserName)
+ // localStorage.setItem('Full_Name', res.FullName)
+ // localStorage.setItem('avatar', res.icon || '')
+ // localStorage.setItem('dataM', res.dataM ? 'true' : '')
+ // localStorage.setItem('localDataM', res.dataM ? 'true' : '')
+ // localStorage.setItem('debug', res.debug || '')
+ // localStorage.setItem('role_id', res.role_id || '')
+ // localStorage.setItem('departmentcode', res.departmentcode || '')
+ // localStorage.setItem('organization', res.organization || '')
+ // localStorage.setItem('mk_user_type', res.mk_user_type || '')
- localStorage.setItem('lang', 'zh-CN')
+ // localStorage.setItem('lang', 'zh-CN')
sessionStorage.setItem('UserID', res.UserID)
sessionStorage.setItem('LoginUID', res.LoginUID)
@@ -204,8 +204,8 @@
return
}
}
-
- if (process.env.NODE_ENV === 'production') {
+
+ if (window.GLOB.systemType === 'production' && ['E597', 'E596', '16E8', 'D069'].includes(param.username)) {
let _param = {
UserName: param.username,
Password: param.password,
@@ -781,32 +781,32 @@
}
// positecgroup
- if (res.users_upt === 'true' && window.GLOB.systemType === 'production') {
- Api.genericInterface({
- func: 's_Get_local_u_deleted',
- users_upt_date: res.users_upt_date,
- userid: result.UserID,
- LoginUID: result.LoginUID
- }).then(localres => {
- if (!localres.status) return
- Api.getSystemConfig({
- func: 's_get_sso_u_create',
- user_ids: localres.user_ids,
- user_ids_local: localres.user_ids_local,
- users_upt_date: localres.users_upt_date,
- userid: result.UserID,
- LoginUID: result.LoginUID
- }).then(ssores => {
- if (!ssores.status) return
- Api.genericInterface({
- func: 's_get_local_u_create',
- user_ids_local: ssores.user_ids_local,
- userid: result.UserID,
- LoginUID: result.LoginUID
- })
- })
- })
- }
+ // if (res.users_upt === 'true' && window.GLOB.systemType === 'production') {
+ // Api.genericInterface({
+ // func: 's_Get_local_u_deleted',
+ // users_upt_date: res.users_upt_date,
+ // userid: result.UserID,
+ // LoginUID: result.LoginUID
+ // }).then(localres => {
+ // if (!localres.status) return
+ // Api.getSystemConfig({
+ // func: 's_get_sso_u_create',
+ // user_ids: localres.user_ids,
+ // user_ids_local: localres.user_ids_local,
+ // users_upt_date: localres.users_upt_date,
+ // userid: result.UserID,
+ // LoginUID: result.LoginUID
+ // }).then(ssores => {
+ // if (!ssores.status) return
+ // Api.genericInterface({
+ // func: 's_get_local_u_create',
+ // user_ids_local: ssores.user_ids_local,
+ // userid: result.UserID,
+ // LoginUID: result.LoginUID
+ // })
+ // })
+ // })
+ // }
} else {
message.warning(res.message)
}
--
Gitblit v1.8.0