From 9003c36ec7ff034ab7dfdad154e5666ff450926a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 08 四月 2024 17:43:48 +0800
Subject: [PATCH] 2024-04-08
---
src/index.js | 5 ++
src/views/appcheck/header/index.jsx | 7 ++-
src/views/interface/header/index.jsx | 4 +
src/mob/header/index.jsx | 7 ++-
src/views/systemfunc/header/index.jsx | 9 ++--
src/views/design/header/index.jsx | 5 +-
src/components/header/index.jsx | 2 +
src/menu/stylecontroller/index.jsx | 7 ++-
src/views/appmanage/header/index.jsx | 7 ++-
src/views/rolemanage/header/index.jsx | 7 ++-
src/menu/header/index.jsx | 6 ++-
src/views/login/index.jsx | 14 ++++---
12 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index db0dc33..5697adb 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -439,6 +439,8 @@
sessionStorage.setItem('cloudDataM', res.dataM ? 'true' : '')
sessionStorage.setItem('cloudRole_id', res.role_id || '')
+ sessionStorage.setItem('CloudLogo', res.open_logo || '')
+
let _url = window.location.href.split('#')[0] + 'cloud'
if (param.remember) {
localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify({time: new Date().getTime(), username: param.username, password: param.password}))))
diff --git a/src/index.js b/src/index.js
index 378e09d..2b532b4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -246,6 +246,11 @@
sessionStorage.setItem('system_mark', _mark)
}
+ if (config.mainkey && GLOB.sysType !== 'cloud' && config.mainkey !== options.cakey) {
+ GLOB.localkey = GLOB.appkey
+ GLOB.appkey = config.mainkey
+ }
+
let lang = localStorage.getItem(_href + 'lang') || (config.defaultLang !== 'en-US' ? 'zh-CN' : 'en-US')
sessionStorage.setItem('lang', lang)
diff --git a/src/menu/header/index.jsx b/src/menu/header/index.jsx
index 9617900..f7a1c6d 100644
--- a/src/menu/header/index.jsx
+++ b/src/menu/header/index.jsx
@@ -7,15 +7,17 @@
class MenuHeader extends Component {
state = {
avatar: sessionStorage.getItem('CloudAvatar') || avatar,
- userName: sessionStorage.getItem('CloudUserName')
+ userName: sessionStorage.getItem('CloudUserName'),
+ logo: sessionStorage.getItem('CloudLogo') || MainLogo
}
render () {
const { menuName } = this.props
+ const { logo } = this.state
return (
<header className="menu-header-container">
- <div className="header-logo"><img src={MainLogo} alt=""/></div>
+ <div className="header-logo"><img src={logo} alt=""/></div>
<div className="menu-name">{menuName}</div>
<div className="header-setting">
<img src={this.state.avatar} alt=""/>
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index 04fb753..7a0b562 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -53,7 +53,8 @@
backgroundImage: '',
options: [],
borposition: 'outer',
- type: ''
+ type: '',
+ logo: sessionStorage.getItem('CloudLogo') || MainLogo
}
callback = null
@@ -568,7 +569,7 @@
}
render () {
- const { card, options, backgroundImage, borposition, fonts, type } = this.state
+ const { card, options, backgroundImage, borposition, fonts, type, logo } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -584,7 +585,7 @@
<Drawer
title={
<div className="header-logo">
- <img src={MainLogo} alt=""/>
+ <img src={logo} alt=""/>
</div>
}
placement="left"
diff --git a/src/mob/header/index.jsx b/src/mob/header/index.jsx
index 38c5863..6d61f1f 100644
--- a/src/mob/header/index.jsx
+++ b/src/mob/header/index.jsx
@@ -7,13 +7,16 @@
class MobHeader extends Component {
state = {
avatar: sessionStorage.getItem('CloudAvatar') || avatar,
- userName: sessionStorage.getItem('CloudUserName')
+ userName: sessionStorage.getItem('CloudUserName'),
+ logo: sessionStorage.getItem('CloudLogo') || MainLogo
}
render () {
+ const { logo } = this.state
+
return (
<header className="mob-header-container">
- <div className="header-logo"><img src={MainLogo} alt=""/></div>
+ <div className="header-logo"><img src={logo} alt=""/></div>
<div className="header-user">
<img src={this.state.avatar} alt=""/>
<span>
diff --git a/src/views/appcheck/header/index.jsx b/src/views/appcheck/header/index.jsx
index 96bba6d..a5de4ee 100644
--- a/src/views/appcheck/header/index.jsx
+++ b/src/views/appcheck/header/index.jsx
@@ -7,13 +7,16 @@
class AppManageHeader extends Component {
state = {
avatar: sessionStorage.getItem('CloudAvatar') || avatar,
- userName: sessionStorage.getItem('CloudUserName')
+ userName: sessionStorage.getItem('CloudUserName'),
+ logo: sessionStorage.getItem('CloudLogo') || MainLogo
}
render () {
+ const { logo } = this.state
+
return (
<header className="app-manage-header-container">
- <div className="header-logo"><img src={MainLogo} alt=""/></div>
+ <div className="header-logo"><img src={logo} alt=""/></div>
<div className="title">
搴旂敤绠＄悊
</div>
diff --git a/src/views/appmanage/header/index.jsx b/src/views/appmanage/header/index.jsx
index 96bba6d..a5de4ee 100644
--- a/src/views/appmanage/header/index.jsx
+++ b/src/views/appmanage/header/index.jsx
@@ -7,13 +7,16 @@
class AppManageHeader extends Component {
state = {
avatar: sessionStorage.getItem('CloudAvatar') || avatar,
- userName: sessionStorage.getItem('CloudUserName')
+ userName: sessionStorage.getItem('CloudUserName'),
+ logo: sessionStorage.getItem('CloudLogo') || MainLogo
}
render () {
+ const { logo } = this.state
+
return (
<header className="app-manage-header-container">
- <div className="header-logo"><img src={MainLogo} alt=""/></div>
+ <div className="header-logo"><img src={logo} alt=""/></div>
<div className="title">
搴旂敤绠＄悊
</div>
diff --git a/src/views/design/header/index.jsx b/src/views/design/header/index.jsx
index f9110ad..70fd769 100644
--- a/src/views/design/header/index.jsx
+++ b/src/views/design/header/index.jsx
@@ -23,6 +23,7 @@
menulist: null, // 涓�绾ц彍鍗�
userName: sessionStorage.getItem('CloudUserName'),
avatar: Utils.getrealurl(sessionStorage.getItem('CloudAvatar')),
+ logo: sessionStorage.getItem('CloudLogo') || MainLogo,
visible: false,
loading: false
}
@@ -408,11 +409,11 @@
render () {
const { mainMenu, editLevel } = this.props
- const { menulist, visible, loading } = this.state
+ const { menulist, visible, loading, logo } = this.state
return (
<header className={'sys-header-container ant-menu-dark ' + (['level2', 'level3'].includes(editLevel) ? 'mask' : '')} id="main-header-container">
- <div className="header-logo"><img src={MainLogo} alt=""/></div>
+ <div className="header-logo"><img src={logo} alt=""/></div>
<div className="header-collapse">
<MenuFoldOutlined/>
</div>
diff --git a/src/views/interface/header/index.jsx b/src/views/interface/header/index.jsx
index 903325e..a3944b8 100644
--- a/src/views/interface/header/index.jsx
+++ b/src/views/interface/header/index.jsx
@@ -9,6 +9,7 @@
state = {
userName: sessionStorage.getItem('CloudUserName'),
avatar: Utils.getrealurl(sessionStorage.getItem('CloudAvatar')),
+ logo: sessionStorage.getItem('CloudLogo') || MainLogo
}
UNSAFE_componentWillMount() {}
@@ -18,10 +19,11 @@
}
render () {
+ const { logo } = this.state
return (
<header className="interface-header-container">
- <div className="header-logo"><img src={MainLogo} alt=""/></div>
+ <div className="header-logo"><img src={logo} alt=""/></div>
<div className="title">鎺ュ彛璋冭瘯</div>
<div className="header-setting">
<span className="close" onClick={this.close}>鍏抽棴</span>
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 01d88f8..c2fa81c 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -336,6 +336,7 @@
authCode = authCode ? authCode.split(',') : []
let index = authCode.findIndex(key => key === _s)
let license = false
+ let appkey = window.GLOB.localkey || window.GLOB.appkey
if (window.GLOB.licenseKey) {
if (window.GLOB.licenseKey.length !== 20) {
@@ -344,7 +345,7 @@
okText: '鐭ラ亾浜�'
})
} else {
- let key = md5(window.GLOB.appId + 'minke_software' + window.GLOB.appkey).toUpperCase().substr(-6)
+ let key = md5(window.GLOB.appId + 'minke_software' + appkey).toUpperCase().substr(-6)
let key1 = window.GLOB.licenseKey.substring(0, 6)
let key2 = window.GLOB.licenseKey.substring(6, 14)
@@ -352,7 +353,7 @@
let key4 = md5(key1 + key2).toUpperCase().substr(-6)
if (key === key1 && key3 === key4) {
- let last = window.GLOB.appkey[window.GLOB.appkey.length - 1]
+ let last = appkey[appkey.length - 1]
let offset = 0
let keys = {}
@@ -425,7 +426,7 @@
func: _func,
AppID: window.GLOB.appId,
TimeStamp: timeStamp,
- appkey: window.GLOB.appkey,
+ appkey: appkey,
SessionUid: localStorage.getItem('SessionUid') || '',
userid: _id,
LoginUID: _id,
@@ -555,7 +556,8 @@
let _param = {
func: 's_Get_style',
TypeCharOne: 'PC',
- LText: `select '${window.GLOB.appkey}'`,
+ LText: `select '${appkey}'`,
+ appkey: appkey
}
_param.userid = result.UserID
@@ -568,7 +570,7 @@
if (res.status) {
if (window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
- if (md5(('mk' + window.GLOB.appkey + res.sys_datetime + res.member_type + res.registry_date).toLowerCase()) !== res.secret_key) {
+ if (md5(('mk' + appkey + res.sys_datetime + res.member_type + res.registry_date).toLowerCase()) !== res.secret_key) {
Modal.warning({
title: '瀵嗛挜閿欒锛岃鑱旂郴绠＄悊鍛橈紒',
okText: '鐭ラ亾浜�'
@@ -612,7 +614,7 @@
}
if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) {
- systemMsg.Member_Level = md5('mksoft' + window.GLOB.appkey + res.member_level)
+ systemMsg.Member_Level = md5('mksoft' + appkey + res.member_level)
if (!window.GLOB.memberLevel) {
Object.defineProperty(window.GLOB, 'memberLevel', {
writable: false,
diff --git a/src/views/rolemanage/header/index.jsx b/src/views/rolemanage/header/index.jsx
index d49edb8..6fd53ce 100644
--- a/src/views/rolemanage/header/index.jsx
+++ b/src/views/rolemanage/header/index.jsx
@@ -7,14 +7,17 @@
class AppManageHeader extends Component {
state = {
avatar: sessionStorage.getItem('CloudAvatar') || avatar,
- userName: sessionStorage.getItem('CloudUserName')
+ userName: sessionStorage.getItem('CloudUserName'),
+ logo: sessionStorage.getItem('CloudLogo') || MainLogo
}
render () {
const { app } = this.props
+ const { logo } = this.state
+
return (
<header className="app-manage-header-container">
- <div className="header-logo"><img src={MainLogo} alt=""/></div>
+ <div className="header-logo"><img src={logo} alt=""/></div>
<div className="title">
{`${app.remark} ${app.typename}`}
</div>
diff --git a/src/views/systemfunc/header/index.jsx b/src/views/systemfunc/header/index.jsx
index c146a84..03f2dfc 100644
--- a/src/views/systemfunc/header/index.jsx
+++ b/src/views/systemfunc/header/index.jsx
@@ -8,14 +8,11 @@
state = {
userName: sessionStorage.getItem('CloudUserName'),
avatar: sessionStorage.getItem('CloudAvatar') || avatar,
+ logo: sessionStorage.getItem('CloudLogo') || MainLogo
}
exitManage = () => {
window.close()
- }
-
- UNSAFE_componentWillMount () {
-
}
/**
@@ -28,9 +25,11 @@
}
render () {
+ const { logo } = this.state
+
return (
<header className="sys-header-container ant-menu-dark">
- <div className="header-logo"><img src={MainLogo} alt=""/></div>
+ <div className="header-logo"><img src={logo} alt=""/></div>
<div className="title">HS</div>
<div className="header-setting">
<img src={this.state.avatar} alt=""/>
--
Gitblit v1.8.0