From 0519dcda8b6fb2914987f8d4d58e1d14bcf98dc3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 30 六月 2023 14:33:06 +0800
Subject: [PATCH] 2023-06-30
---
src/views/login/index.jsx | 221 +++++++++++++++++++++++++------------------------------
1 files changed, 100 insertions(+), 121 deletions(-)
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index faa33c5..c160a08 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -1,10 +1,11 @@
import React, { Component } from 'react'
-import { message, Modal, notification } from 'antd'
+import { message, Modal } from 'antd'
import md5 from 'md5'
import moment from 'moment'
import Api from '@/api'
import Utils from '@/utils/utils.js'
+import MKEmitter from '@/utils/events.js'
import options, { styles } from '@/store/options.js'
import zhCN from '@/locales/zh-CN/login.js'
import enUS from '@/locales/en-US/login.js'
@@ -13,7 +14,7 @@
import './index.scss'
const LoginForm = asyncLoadComponent(() => import('./loginform'))
-const Resetpwd = asyncLoadComponent(() => import('@/components/header/resetpwd'))
+const Resetpwd = asyncLoadComponent(() => import('@/components/resetPassword'))
const LoginCloudForm = asyncComponent(() => import('./logincloudform'))
const iszhCN = sessionStorage.getItem('lang') !== 'en-US'
@@ -38,8 +39,6 @@
loginWays: null,
touristLogin: false,
syncing: false,
- visible: false,
- resetLoading: false
}
changelang (item) {
@@ -68,25 +67,35 @@
* @param {Object} param 鐢ㄦ埛鍚嶅瘑鐮佺瓑淇℃伅
*/
async loginsubmit (param) {
- let city = sessionStorage.getItem('city') || ''
- let ipAddress = sessionStorage.getItem('ipAddress') || ''
-
// 鐧诲綍鎻愪氦
- let res = await Api.getusermsg(param.username, param.password, false, ipAddress, city)
+ let res = await Api.getusermsg(param.username, param.password, false)
if (res.status) {
+ if (res.check_mob) {
+ let loginWays = this.state.loginWays.filter(item => item.type === 'sms_vcode')
+
+ if (loginWays.length > 0) {
+ this.setState({loginWays: null, isDisabled: false}, () => {
+ this.setState({loginWays: loginWays})
+ })
+ Modal.warning({
+ title: '涓虹‘璁ゆ槸鎮ㄦ湰浜烘搷浣滐紝璇蜂娇鐢ㄦ墜鏈虹煭淇￠獙璇佺爜杩涜韬唤璁よ瘉',
+ okText: '鐭ラ亾浜�'
+ })
+ return
+ }
+ }
+
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('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
@@ -107,16 +116,16 @@
let level = localStorage.getItem(_href + 'pwdlevel')
- if (level) {
+ if (level && process.env.NODE_ENV === 'production') {
let visible = false
let tip = '瀵嗙爜寮哄害涓嶅锛岃淇敼瀵嗙爜锛�'
if (param.password.length < 8) {
visible = true
} else if (level === 'letter_num' && /^([^0-9]*|[^a-zA-Z]*)$/.test(param.password)) {
visible = true
- } else if ((level === 'char_num' || level === 'char_num_90') && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(param.password)) {
+ } else if ((level === 'char_num' || level === 'char_num_90' || level === 'char_num_90_sms') && /^([^0-9]*|[^a-zA-Z]*|[^!@#$%^&*()_]*)$/.test(param.password)) {
visible = true
- } else if (level === 'char_num_90' && res.modifydate) {
+ } else if ((level === 'char_num_90' || level === 'char_num_90_sms') && res.modifydate) {
let s = (new Date().getTime() - new Date(res.modifydate).getTime()) / (1000 * 24 * 60 * 60)
if (!isNaN(s) && s > 90) {
visible = true
@@ -127,18 +136,23 @@
if (visible) {
message.warning(tip)
this.setState({
- isDisabled: false,
- visible: true
+ isDisabled: false
+ })
+
+ MKEmitter.emit('resetpassword', () => {
+ const input = document.getElementById('password')
+ if (input) {
+ input.select()
+ }
})
return
}
}
- let _history = sessionStorage.getItem('history')
- if (_history) {
- sessionStorage.removeItem('history')
- // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
- this.props.history.replace(_history)
+ 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')
}
@@ -169,11 +183,8 @@
}
async phoneloginsubmit (param) {
- let city = sessionStorage.getItem('city') || ''
- let ipAddress = sessionStorage.getItem('ipAddress') || ''
-
// 鐧诲綍鎻愪氦
- let res = await Api.getphoneusermsg(param.phone, param.vercode, false, ipAddress, city)
+ let res = await Api.getphoneusermsg(param.phone, param.vercode, false)
if (res.status) {
sessionStorage.setItem('UserID', res.UserID)
sessionStorage.setItem('LoginUID', res.LoginUID)
@@ -181,13 +192,11 @@
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('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
@@ -200,11 +209,10 @@
sessionStorage.removeItem('visitorUserID')
sessionStorage.removeItem('visitorLoginUID')
- let _history = sessionStorage.getItem('history')
- if (_history) {
- sessionStorage.removeItem('history')
- // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
- this.props.history.replace(_history)
+ 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')
}
@@ -232,13 +240,11 @@
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('departmentcode', res.departmentcode || '')
sessionStorage.setItem('organization', res.organization || '')
sessionStorage.setItem('mk_user_type', res.mk_user_type || '')
- sessionStorage.setItem('localRole_id', res.role_id || '')
if (res.paas_externalDatabase) {
sessionStorage.setItem('externalDatabase', res.paas_externalDatabase)
@@ -248,11 +254,10 @@
sessionStorage.removeItem('visitorUserID')
sessionStorage.removeItem('visitorLoginUID')
- let _history = sessionStorage.getItem('history')
- if (_history) {
- sessionStorage.removeItem('history')
- // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈�
- this.props.history.replace(_history)
+ 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')
}
@@ -294,31 +299,16 @@
// 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")
- // 鑾峰彇ip鍙婂煄甯備俊鎭�
- // let ipurl = window.atob('aHR0cHM6Ly9lcGMubWs5a$mkC5jbi93ZWJhcGkvaXBsb2M='.replace(/\$mk/ig, ''))
- // Api.directRequest(ipurl, 'get', null, 'true').then(res => {
- // if (!res || !res.ip) return
- // sessionStorage.setItem('ipAddress', res.ip)
- // })
- if (sessionStorage.getItem('loginError')) {
- try {
- let res = JSON.parse(sessionStorage.getItem('loginError'))
- console.info(res.url)
- console.info(res.request)
- console.info(res.response)
+ setTimeout(() => {
+ Api.delCacheConfig()
+ }, 50)
- let result = JSON.parse(res.response)
-
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- } catch (e) {}
+ if (window.GLOB.filter) {
+ let view = document.getElementById('mk-login-view')
- setTimeout(() => {
- sessionStorage.removeItem('loginError')
- }, 2000)
+ if (view) {
+ view.style.filter = 'grayscale(100%)'
+ }
}
const _addressUrl = _href + 'queryAddress'
@@ -453,7 +443,11 @@
param.sign = md5(values)
param.t = new Date().getTime()
- Api.directRequest(_rduri + '/' + _func, 'post', param, 'true').then(res => {
+ Api.directRequest({
+ url: _rduri + '/' + _func,
+ method: 'post',
+ data: JSON.stringify(param)
+ }).then(res => {
if (res.status) {
if (res.EPC === str) {
let box = []
@@ -492,6 +486,36 @@
this.setState({
auth: false,
authError: res.message
+ })
+ }
+ }, (error) => {
+ if (error && error.ErrCode === 'LoginError') {
+ let param = {
+ func: 's_visitor_login',
+ timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
+ SessionUid: _id,
+ TypeCharOne: 'pc',
+ appkey: '202004041613277377A6A2456D34A4948AE84'
+ }
+
+ param.LText = md5(window.btoa(_id + param.timestamp))
+ param.secretkey = md5(param.LText + 'mingke' + param.timestamp)
+
+ let params = {
+ url: _rduri.replace('dostars', 'dologon'),
+ method: 'post',
+ data: JSON.stringify(param)
+ }
+
+ Api.directRequest(params)
+
+ return
+ }
+
+ if (index === -1 || index > 10) {
+ this.setState({
+ auth: false,
+ authError: '缃戠粶閿欒瀵艰嚧绯荤粺鎺堟潈澶辫触锛岃鑱旂郴绠＄悊鍛樸��'
})
}
})
@@ -534,6 +558,8 @@
_param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)
Api.getSystemConfig(_param).then(res => {
+ if (!res) return
+
if (res.status) {
// positecgroup
// res.Banner = res.Banner ? res.Banner.replace(/:8080/ig, '').replace(/http:/ig, 'https:') : ''
@@ -585,7 +611,7 @@
let level = res.pwd_level || ''
- if (level && !['letter_num', 'char_num', 'char_num_90'].includes(level)) {
+ if (level && !['letter_num', 'char_num', 'char_num_90', 'char_num_90_sms'].includes(level)) {
level = ''
}
@@ -598,10 +624,12 @@
}
sessionStorage.setItem('home_background', res.index_background_color || '')
+
+ let seconds = 0
if (res.sys_datetime) {
- sessionStorage.setItem('sys_datetime', res.sys_datetime)
- sessionStorage.setItem('app_datetime', new Date().getTime())
+ seconds = Math.floor((new Date(res.sys_datetime).getTime() - new Date().getTime()) / 1000)
}
+ sessionStorage.setItem('sys_time_shim', isNaN(seconds) ? 0 : seconds)
// url鏍囬
document.title = systemMsg.platTitle
@@ -626,7 +654,11 @@
login_ways.push({
type: item.way_no,
smsId: item.sms_id
- })
+ })
+
+ if (item.way_no === 'sms_vcode' && item.sms_id) {
+ sessionStorage.setItem('mk_sms_id', item.sms_id)
+ }
})
} else {
login_ways.push({
@@ -807,48 +839,6 @@
})
}
- resetPwdSubmit = () => {
- this.formRef.handleConfirm().then(res => {
- this.setState({
- resetLoading: true
- })
-
- let _param = {
- func: 's_PwdUpt',
- LText: `select '${res.originpwd}','${res.password}'`
- }
-
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- _param.LText = Utils.formatOptions(_param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) // md5瀵嗛挜
-
- Api.getSystemConfig(_param).then(result => {
- this.setState({
- visible: !result.status,
- resetLoading: false
- })
-
- if (result.status) {
- notification.success({
- top: 92,
- message: '淇敼鎴愬姛锛岃閲嶆柊鐧诲綍銆�',
- duration: 2
- })
- const input = document.getElementById('password')
- if (input) {
- input.select()
- }
- } else {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- }
- })
- }, () => {})
- }
-
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
*/
@@ -862,7 +852,7 @@
const { lineColor, bgImage, loginlogo, copyRight, webSite, ICP, loginWays, touristLogin } = this.state
return (
- <div className="login-container" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}>
+ <div className="login-container" id="mk-login-view" style={bgImage ? {backgroundImage: 'url(' + bgImage + ')'} : {}}>
<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}
@@ -908,18 +898,7 @@
<LoginCloudForm handleSubmit={() => this.syncSubmit()} wrappedComponentRef={(inst) => this.logincloudRef = inst}/>
</Modal>
{/* 淇敼瀵嗙爜 */}
- <Modal
- title="淇敼瀵嗙爜"
- okText={this.state.dict['login.ok']}
- cancelText={this.state.dict['login.cancel']}
- visible={this.state.visible}
- onOk={this.resetPwdSubmit}
- confirmLoading={this.state.resetLoading}
- onCancel={() => this.setState({visible: false, resetLoading: false})}
- destroyOnClose
- >
- <Resetpwd wrappedComponentRef={(inst) => this.formRef = inst} resetPwdSubmit={this.resetPwdSubmit}/>
- </Modal>
+ <Resetpwd />
</div>
)
}
--
Gitblit v1.8.0