From 1779677cece5864b62a65df4b01a4a69496e149a Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 13 五月 2025 20:51:15 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/views/login/index.jsx | 381 ++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 269 insertions(+), 112 deletions(-) diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx index 91d7ff8..c6ad6c2 100644 --- a/src/views/login/index.jsx +++ b/src/views/login/index.jsx @@ -1,5 +1,5 @@ import React, { Component } from 'react' -import { message, Modal } from 'antd' +import { message, Modal, notification } from 'antd' import md5 from 'md5' import moment from 'moment' @@ -14,13 +14,10 @@ const LoginForm = asyncLoadComponent(() => import('./loginform')) const Resetpwd = asyncLoadComponent(() => import('@/components/resetPassword')) const LoginCloudForm = asyncComponent(() => import('./logincloudform')) -const iszhCN = sessionStorage.getItem('lang') !== 'en-US' - -const _href = window.location.href.split('#')[0] +const LoginCodeForm = asyncComponent(() => import('./logincodeform')) class Login extends Component { state = { - selectedlang: iszhCN ? 'zh-CN' : 'en-US', isDisabled: false, auth: false, authError: '', @@ -31,6 +28,8 @@ ICP: window.GLOB.ICP || '', lineColor: window.GLOB.lineColor || '', webSite: window.GLOB.webSite || '', + prolType: window.GLOB.prolType || '', + prolCont: window.GLOB.prolCont || '', langList: [], syncApp: false, loginWays: null, @@ -91,13 +90,10 @@ window.GLOB.externalDatabase = `[${res.paas_externalDatabase}]..` } - localStorage.setItem(_href + 'lang', param.lang || 'zh-CN') - sessionStorage.setItem('lang', param.lang || 'zh-CN') - sessionStorage.removeItem('visitorUserID') sessionStorage.removeItem('visitorLoginUID') - let users = localStorage.getItem(_href + 'users') + let users = localStorage.getItem(window.GLOB.sysSign + 'users') if (users) { try { @@ -109,6 +105,16 @@ } else { users = [] } + + // positecgroup + if (res.token) { + this.setState({ + isDisabled: false, + verify: {...res, $password: param.password}, + codeVisible: true + }) + return + } users = users.filter(item => item.username !== param.username) @@ -118,9 +124,9 @@ users.unshift({username: param.username, password: param.remember ? param.password : ''}) - localStorage.setItem(_href + 'users', window.btoa(window.encodeURIComponent(JSON.stringify(users)))) + localStorage.setItem(window.GLOB.sysSign + 'users', window.btoa(window.encodeURIComponent(JSON.stringify(users)))) - let level = localStorage.getItem(_href + 'pwdlevel') + let level = localStorage.getItem(window.GLOB.sysSign + 'pwdlevel') if (level && process.env.NODE_ENV === 'production') { let visible = false @@ -155,12 +161,31 @@ } } - let iframe = sessionStorage.getItem('iframe') - if (iframe) { - sessionStorage.removeItem('iframe') - this.props.history.replace(iframe.replace(/@loginuid@/, res.LoginUID)) + if (['20210626201522493D7AD7591D7A547278685', '20210626201956190740F1DF384914A3CA9EF'].includes(window.GLOB.appkey) && process.env.NODE_ENV === 'production' && param.username !== 'IF_DMS_APP') { + let _param = { + UserName: param.username, + Password: param.password, + BasePath: '/' + } + Api.loginAndRedirect(_param).then(result => { + if (result.IsError) { + this.setState({ + isDisabled: false + }) + message.warning('鐧诲綍澶辫触,鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒!') + } else { + let lang = sessionStorage.getItem('lang') !== 'en-US' ? '/zh-CN' : '/en-US' + window.location.replace(document.location.origin + lang + '/Home/Index') + } + }) } else { - this.props.history.replace('/main') + let iframe = sessionStorage.getItem('iframe') + if (iframe) { + sessionStorage.removeItem('iframe') + this.props.history.replace(iframe.replace(/@loginuid@/, res.LoginUID)) + } else { + this.props.history.replace('/main') + } } } else if (res.ErrCode === 'Need_Get_Appkey' && window.GLOB.sysType === 'SSO') { message.warning('搴旂敤灏氭湭鍒涘缓锛岃鍚戜簯绔悓姝ュ簲鐢紒') @@ -209,9 +234,6 @@ sessionStorage.setItem('externalDatabase', res.paas_externalDatabase) window.GLOB.externalDatabase = `[${res.paas_externalDatabase}]..` } - - localStorage.setItem(_href + 'lang', param.lang || 'zh-CN') - sessionStorage.setItem('lang', param.lang || 'zh-CN') sessionStorage.removeItem('visitorUserID') sessionStorage.removeItem('visitorLoginUID') @@ -306,7 +328,6 @@ // md5("/ws/location/v1/ip?callback=callbackFunction&key=key&output=jsonp secret key") // md5("/ws/location/v1/ip?callback=callbackFunction&key=BA7BZ-4QB65-LFCIA-QPDA6-4G6O7-MJB4Q&output=jsonpuThL4ZM3XOj642ksEQh76tyHFjh4") - sessionStorage.removeItem('subLangList') sessionStorage.removeItem('langList') setTimeout(() => { @@ -321,14 +342,14 @@ } } - const _addressUrl = _href + 'queryAddress' + const _addressUrl = window.location.href.split('#')[0] + 'queryAddress' if (localStorage.getItem(_addressUrl) === 'true') { this.queryAddress() } const timeStamp = new Date().getTime() - const _authUrl = _href + 'AuthCode' + const _authUrl = window.location.href.split('#')[0] + 'AuthCode' let authCode = localStorage.getItem(_authUrl) let _s = md5('mksoft' + moment().format('YYYYMMDD')) @@ -375,7 +396,7 @@ lictime = Math.floor(new Date(lictime).getTime() / 86400000) let curtime = Math.floor(new Date().getTime() / 86400000) let licday = lictime - curtime - let _mindUrl = _href + 'notMind' + let _mindUrl = window.location.href.split('#')[0] + 'notMind' if (licday < 0 || isNaN(licday)) { Modal.warning({ @@ -465,12 +486,12 @@ localStorage.setItem(_authUrl, box) if (res.e_files === 'true') { - localStorage.setItem(_href + 'files', md5(_href + 'files')) - localStorage.setItem(_href + 'filesDate', res.e_files_end_date) + localStorage.setItem(window.GLOB.sysSign + 'files', md5(window.GLOB.sysSign + 'files')) + localStorage.setItem(window.GLOB.sysSign + 'filesDate', res.e_files_end_date) window.GLOB.storeFiles = true window.GLOB.storeDate = Math.ceil((new Date(res.e_files_end_date).getTime() - new Date().getTime()) / 86400000) } else { - localStorage.removeItem(_href + 'files') + localStorage.removeItem(window.GLOB.sysSign + 'files') window.GLOB.storeFiles = false } @@ -486,7 +507,7 @@ } } else { localStorage.removeItem(_authUrl) - localStorage.removeItem(_href + 'files') + localStorage.removeItem(window.GLOB.sysSign + 'files') window.GLOB.storeFiles = false this.setState({ @@ -495,10 +516,15 @@ } if (res.query_address !== 'true') { - localStorage.setItem(_addressUrl, 'false') + localStorage.removeItem(_addressUrl) } else { localStorage.setItem(_addressUrl, 'true') this.queryAddress() + } + if (res.deekseek !== 'true') { + localStorage.removeItem(window.GLOB.sysSign + 'ds') + } else { + localStorage.setItem(window.GLOB.sysSign + 'ds', 'true') } } else if (res.ErrCode === 'N') { localStorage.removeItem(_authUrl) @@ -568,6 +594,10 @@ appkey: appkey } + if (window.GLOB.style_appkey) { + _param.style_appkey = window.GLOB.style_appkey + } + _param.userid = result.UserID _param.LoginUID = result.LoginUID _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') @@ -577,31 +607,45 @@ if (!res) return if (res.status) { - if (res.member_type && window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') { - if (md5(('mk' + appkey + res.sys_datetime + res.member_type + res.registry_date).toLowerCase()) !== res.secret_key) { - Modal.warning({ - title: '瀵嗛挜閿欒锛岃鑱旂郴绠$悊鍛橈紒', - okText: '鐭ラ亾浜�' - }) - this.setState({ - auth: false, - authError: '瀵嗛挜閿欒锛岃鑱旂郴绠$悊鍛橈紒' - }) - return - } else if (res.member_type === 'personal' && res.registry_date) { - let saveDelay = 0 - try { - saveDelay = parseInt((new Date().getTime() - new Date(res.registry_date).getTime()) / 4320000) - sessionStorage.setItem('mkDelay', saveDelay) - } catch(e) {} - } - } + // positecgroup + // if (res.member_type && 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) { + // Modal.warning({ + // title: '瀵嗛挜閿欒锛岃鑱旂郴绠$悊鍛橈紒', + // okText: '鐭ラ亾浜�' + // }) + // this.setState({ + // auth: false, + // authError: '瀵嗛挜閿欒锛岃鑱旂郴绠$悊鍛橈紒' + // }) + // return + // } else if (res.member_type === 'personal' && res.registry_date) { + // let saveDelay = 0 + // try { + // saveDelay = parseInt((new Date().getTime() - new Date(res.registry_date).getTime()) / 4320000) + // sessionStorage.setItem('mkDelay', saveDelay) + // } catch(e) {} + // } + // } if (!['shutter', 'linkage_navigation', 'linkage', 'menu_board', 'menu_board_navigation'].includes(res.menu_type)) { res.menu_type = 'shutter' } + + let loginOtop = '' + let loginOleft = '' + let windowWidth = window.innerWidth + let fix = null + res.login_screen_offset && res.login_screen_offset.forEach(item => { + if (!item.offset_x && !item.offset_y) return - let _url = _href + 'system' + if (fix === null || Math.abs(windowWidth - item.resolution_width) < fix) { + fix = Math.abs(windowWidth - item.resolution_width) + loginOtop = item.offset_y + item.y_unit + loginOleft = item.offset_x + item.x_unit + } + }) + let systemMsg = { favicon: res.titlelogo || '', platTitle: res.titleName || '', @@ -615,10 +659,27 @@ style: res.CSS || '', showline: res.split_line_show || 'true', webSite: res.WebSite || '', + prolType: '', + prolCont: '', navBar: res.menu_type, // shutter 鐧惧彾绐椼�乴inkage_navigation 鑱斿姩鑿滃崟銆乴inkage 鑱斿姩鑿滃崟_鏃犲鑸爮銆乵enu_board 鑿滃崟闈㈡澘銆乵enu_board_navigation 鑿滃崟闈㈡澘_鏍囩椤� app_version: res.app_version, Member_Level: 0, - appname: res.appname || '' + appname: res.appname || '', + loginOtop: loginOtop, + loginOleft: loginOleft + } + + if (['every_time', 'once', 'not_required'].includes(res.require_legal_consent) && res.legal_documents) { + systemMsg.prolCont = res.legal_documents + try { + systemMsg.prolCont = window.decodeURIComponent(window.atob(systemMsg.prolCont)) + if (res.require_legal_consent !== 'not_required') { + systemMsg.prolType = res.require_legal_consent + } + } catch(e) { + systemMsg.prolType = '' + systemMsg.prolCont = '' + } } if ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100].includes(res.member_level)) { @@ -637,15 +698,9 @@ level = '' } - localStorage.setItem(_href + 'pwdlevel', level) + localStorage.setItem(window.GLOB.sysSign + 'pwdlevel', level) - if (res.srcid) { - localStorage.setItem(_href + 'srcId', res.srcid) - } else { - localStorage.removeItem(_href + 'srcId') - } - - sessionStorage.setItem('home_background', res.index_background_color || '') + res.index_background_color && sessionStorage.setItem('home_background', res.index_background_color) let seconds = 0 if (res.sys_datetime) { @@ -657,15 +712,20 @@ document.title = systemMsg.platTitle try { - localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify(systemMsg)))) + localStorage.setItem(window.GLOB.sysSign + 'system', window.btoa(window.encodeURIComponent(JSON.stringify(systemMsg)))) } catch (e) { - localStorage.removeItem(_url) + localStorage.removeItem(window.GLOB.sysSign + 'system') } - if (res.lang_translation_js && res.lang_data && res.lang_data[0] && (res.lang_data.length > 1 || res.lang_data[0].Lang !== 'zh-CN')) { let lang = sessionStorage.getItem('lang') let js_trans = res.lang_translation_js.map(item => { + if (['not_empty', 'not_zero', 'max_limit', 'less_limit'].includes(item.msn_code)) { + item.translation = ' ' + item.translation + } + if (['input_tip', 'select_tip', 'max_limit', 'less_limit'].includes(item.msn_code)) { + item.translation = item.translation + ' ' + } if (lang === item.lang) { window.GLOB.dict[item.msn_code] = item.translation } @@ -677,10 +737,10 @@ } }) - localStorage.setItem(_href + 'js_trans', JSON.stringify(js_trans)) + localStorage.setItem(window.GLOB.sysSign + 'js_trans', JSON.stringify(js_trans)) } - let _loginurl = _href + 'loginways' + let _loginurl = window.GLOB.sysSign + 'loginways' let login_ways = [] if (res.login_ways && res.login_ways.length > 0) { res.login_ways.forEach(item => { @@ -711,25 +771,27 @@ } if (res.lang_data && res.lang_data.length > 1 && window.GLOB.systemType !== 'production') { - let list = res.lang_data.map(item => item.Lang) - let lang = 'zh-CN' - if (window.GLOB.defLang && list.includes(window.GLOB.defLang)) { - lang = window.GLOB.defLang - } - - if (list.includes(lang)) { - list = [lang, ...list.filter(item => item !== lang)] - if (lang === sessionStorage.getItem('lang')) { - sessionStorage.setItem('langList', JSON.stringify(list)) - } else { - sessionStorage.setItem('subLangList', JSON.stringify(list)) - } - } + let list = res.lang_data.map(item => item.Lang).filter(n => n !== 'zh-CN') + sessionStorage.setItem('langList', JSON.stringify(list)) } + + if (res.lang_data.length === 1 && res.lang_data[0].Lang !== sessionStorage.getItem('lang')) { + localStorage.setItem(window.location.href.split('#')[0] + 'lang', res.lang_data[0].Lang) + sessionStorage.setItem('lang', res.lang_data[0].Lang) + window.location.reload() + return + } + + let langList = res.lang_data.map(item => ({Lang: item.Lang, LangName: item.LangName})) + + localStorage.setItem(window.GLOB.sysSign + 'langList', JSON.stringify(langList)) + + window.GLOB.loginOtop = systemMsg.loginOtop + window.GLOB.loginOleft = systemMsg.loginOleft this.setState({ loginWays: login_ways, - langList: res.lang_data || [], + langList: langList, ...systemMsg }) @@ -752,32 +814,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 (['20210626201522493D7AD7591D7A547278685', '20210626201956190740F1DF384914A3CA9EF'].includes(window.GLOB.appkey) && 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) } @@ -787,7 +849,7 @@ } }) - let loginWays = localStorage.getItem(_href + 'loginways') + let loginWays = localStorage.getItem(window.GLOB.sysSign + 'loginways') if (loginWays) { try { loginWays = JSON.parse(window.decodeURIComponent(window.atob(loginWays))) @@ -797,6 +859,19 @@ this.setState({ loginWays: loginWays + }) + } + + let langs = localStorage.getItem(window.GLOB.sysSign + 'langList') + if (langs) { + try { + langs = JSON.parse(langs) + } catch (e) { + langs = [] + } + + this.setState({ + langList: langs }) } } @@ -887,6 +962,59 @@ }) } + codeSubmit = () => { + const { verify } = this.state + this.codeRef.handleConfirm().then(res => { + this.setState({ + codeLoading: true + }) + Api.verifycode({...verify, code: res.code}).then(result => { + this.setState({ + codeVisible: false, + codeLoading: false + }) + + if (result.verifyResult === 'success') { + let level = localStorage.getItem(window.GLOB.sysSign + 'pwdlevel') + if (level) { + let visible = false + let tip = '瀵嗙爜寮哄害涓嶅锛岃淇敼瀵嗙爜锛�' + if (verify.$password.length < 8) { + visible = true + } else if (level === 'letter_num' && /^([^0-9]*|[^a-zA-Z]*)$/.test(verify.$password)) { + visible = true + } else if ((level === 'char_num' || level === 'char_num_90') && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(verify.$password)) { + visible = true + } else if (level === 'char_num_90' && verify.modifydate) { + let s = (new Date().getTime() - new Date(verify.modifydate).getTime()) / (1000 * 24 * 60 * 60) + if (!isNaN(s) && s > 90) { + visible = true + tip = '鎮ㄥ凡90澶╂湭淇敼瀵嗙爜锛岃鏇存崲瀵嗙爜鍚庝娇鐢紒' + } + } + + if (visible) { + message.warning(tip) + this.setState({ + isDisabled: false, + visible: true + }) + return + } + } + + this.props.history.replace('/main') + } else { + notification.warning({ + top: 92, + message: '楠岃瘉鐮佹棤鏁堬紝璇烽噸鏂扮櫥褰曪紒', + duration: 5 + }) + } + }) + }, () => {}) + } + /** * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊 */ @@ -897,10 +1025,22 @@ } render () { - const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays } = this.state + const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays, prolType, prolCont } = this.state + + let wrapStyle = {} + + if (bgImage) { + wrapStyle.backgroundImage = `url(${bgImage})` + } + if (window.GLOB.loginOtop) { + wrapStyle['--mk-login-offset-top'] = window.GLOB.loginOtop + } + if (window.GLOB.loginOleft) { + wrapStyle['--mk-login-offset-left'] = window.GLOB.loginOleft + } return ( - <div className="login-container" id="mk-login-view" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}> + <div className="login-container" id="mk-login-view" style={wrapStyle}> <div className="logo" style={lineColor ? {borderColor: lineColor} : {}}> {loginlogo ? <img src={loginlogo} alt=""/> : null} {this.state.platName ? <p className="plat-name">{this.state.platName}</p> : null} @@ -910,7 +1050,8 @@ auth={this.state.auth} authError={this.state.authError} loginWays={loginWays} - lang={this.state.selectedlang} + prolType={prolType} + prolCont={prolCont} langList={this.state.langList} isDisabled={this.state.isDisabled} handleSubmit={() => this.handleSubmit()} @@ -919,11 +1060,13 @@ /> : null} </div> <div className="login-bottom"> - {webSite && copyRight ? - <a target="_blank" rel="noopener noreferrer" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, ' ') }}></a> : - <p dangerouslySetInnerHTML={{ __html: copyRight ? copyRight.replace(/\s/ig, ' ') : '' }}></p> - } - <br/> + <p> + {webSite && copyRight ? + <a target="_blank" rel="noopener noreferrer" href={webSite} dangerouslySetInnerHTML={{ __html: copyRight.replace(/\s/ig, ' ') }}></a> : + <span dangerouslySetInnerHTML={{ __html: copyRight ? copyRight.replace(/\s/ig, ' ') : '' }}></span> + } + {prolCont && !prolType ? <span style={{marginLeft: '15px'}} dangerouslySetInnerHTML={{ __html: prolCont }}></span> : null} + </p> {ICP ? <a target="_blank" rel="noopener noreferrer" href="https://beian.miit.gov.cn/#/Integrated/index" dangerouslySetInnerHTML={{ __html: ICP.replace(/\s/ig, ' ') }}></a> : null} </div> {/* 缂栬緫鐘舵�佺櫥褰� */} @@ -942,6 +1085,20 @@ </Modal> {/* 淇敼瀵嗙爜 */} <Resetpwd /> + {/* 浜屾楠岃瘉 */} + <Modal + title="浜屾楠岃瘉" + okText={window.GLOB.dict['ok'] || '纭畾'} + cancelText={window.GLOB.dict['cancel'] || '鍙栨秷'} + visible={this.state.codeVisible} + onOk={this.codeSubmit} + maskClosable={false} + confirmLoading={this.state.codeLoading} + onCancel={() => this.setState({codeVisible: false, codeLoading: false})} + destroyOnClose + > + <LoginCodeForm verify={this.state.verify} wrappedComponentRef={(inst) => this.codeRef = inst} handleSubmit={this.codeSubmit}/> + </Modal> </div> ) } -- Gitblit v1.8.0