From a87ac3212afefd1d5a3050099cdac4a1f17f9edf Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 2 Sep 2026 10:05:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/controller/SysLoginController.java | 10 +- .../service/impl/SysUserTokenServiceImpl.java | 91 +++++++++++++++++-- .../main/resources/mapper/sys/SysUserDao.xml | 3 +- .../resources/mapper/sys/SysUserTokenDao.xml | 6 +- cclqms-vue/src/views/common/login-token.vue | 63 +++++++++++-- 5 files changed, 149 insertions(+), 24 deletions(-) diff --git a/cclqms-java/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java b/cclqms-java/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java index b104c9f..9c86f15 100644 --- a/cclqms-java/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java +++ b/cclqms-java/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java @@ -113,9 +113,13 @@ public class SysLoginController extends AbstractController { */ @PostMapping("/sys/loginToken") public Map loginToken(@RequestBody SysLoginForm form , HttpServletRequest request) throws Exception { - // 生成token,并保存到数据库 - R r = sysUserTokenService.createToken2(form); - return r; + try { + // 生成token,并保存到数据库 + R r = sysUserTokenService.createToken2(form); + return r; + } catch (Exception ex) { + return R.error(StringUtils.defaultIfBlank(ex.getMessage(), "登录失败")); + } } diff --git a/cclqms-java/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java b/cclqms-java/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java index 6d66128..df00dd4 100644 --- a/cclqms-java/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java +++ b/cclqms-java/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java @@ -13,8 +13,13 @@ import com.gaotao.modules.sys.service.SysUserTokenService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; +import java.util.Set; @Service("sysUserTokenService") @@ -45,8 +50,9 @@ public class SysUserTokenServiceImpl extends ServiceImpl userList = baseMapper.getUserIdByDomainControlAccount(form); - if (userList == null || userList.isEmpty()) { + String domainControlAccount = form == null ? "" : StringUtils.trimToEmpty(form.getDomainControlAccount()); + if (StringUtils.isBlank(domainControlAccount)) { + throw new RuntimeException("域控账号不能为空!"); + } + // 根据域控账号查询QMS用户(兼容 domain\\account / account@domain / account) + SysUserEntity loginUser = resolveLoginUserByDomainControlAccount(domainControlAccount); + if (loginUser == null) { throw new RuntimeException("未根据域控账号查到人员!"); } + if (Integer.valueOf(0).equals(loginUser.getStatus())) { + throw new RuntimeException("账号被锁定不允许登录"); + } // 当前时间 Date now = new Date(); // 过期时间 Date expireTime = new Date(now.getTime() + EXPIRE * 1000); // 判断是否生成过token, 有则取出当前token登录, 没有则创建token - SysUserTokenEntity tokenEntity = this.getById(userList.get(0).getUserId()); + SysUserTokenEntity tokenEntity = this.getById(loginUser.getUserId()); if (tokenEntity == null) { // 生成一个token String token = TokenGenerator.generateValue(); tokenEntity = new SysUserTokenEntity(); - tokenEntity.setUserId(userList.get(0).getUserId()); + tokenEntity.setUserId(loginUser.getUserId()); tokenEntity.setToken(token); tokenEntity.setUpdateTime(now); tokenEntity.setExpireTime(expireTime); // 保存token this.save(tokenEntity); } else { + if (StringUtils.isBlank(tokenEntity.getToken())) { + tokenEntity.setToken(TokenGenerator.generateValue()); + } // 更新token的时间 tokenEntity.setUpdateTime(now); tokenEntity.setExpireTime(expireTime); this.updateById(tokenEntity); } - String site = StringUtils.isNotBlank(form.getSite()) ? form.getSite() : userList.get(0).getSite(); + String formSite = form == null ? "" : form.getSite(); + String site = StringUtils.isNotBlank(formSite) ? formSite : loginUser.getSite(); return R.ok() .put("token", tokenEntity.getToken()) .put("expire", EXPIRE) - .put("language", userList.get(0).getLanguageDefault()) - .put("userName", userList.get(0).getUsername()) + .put("language", loginUser.getLanguageDefault()) + .put("userName", loginUser.getUsername()) .put("site", site); } + + private SysUserEntity resolveLoginUserByDomainControlAccount(String domainControlAccount) { + List accountCandidates = buildDomainControlAccountCandidates(domainControlAccount); + Map userMap = new LinkedHashMap<>(); + for (String account : accountCandidates) { + SysLoginForm queryForm = new SysLoginForm(); + queryForm.setDomainControlAccount(account); + List userList = baseMapper.getUserIdByDomainControlAccount(queryForm); + if (userList == null || userList.isEmpty()) { + continue; + } + for (SysUserEntity user : userList) { + if (user == null || user.getUserId() == null) { + continue; + } + userMap.putIfAbsent(user.getUserId(), user); + } + } + if (userMap.isEmpty()) { + return null; + } + for (SysUserEntity user : userMap.values()) { + if (!Integer.valueOf(0).equals(user.getStatus())) { + return user; + } + } + return userMap.values().iterator().next(); + } + + private List buildDomainControlAccountCandidates(String domainControlAccount) { + Set accountSet = new LinkedHashSet<>(); + String raw = StringUtils.trimToEmpty(domainControlAccount); + if (StringUtils.isBlank(raw)) { + return new ArrayList<>(); + } + accountSet.add(raw); + + String slashNormalized = raw.replace('/', '\\'); + accountSet.add(slashNormalized); + + if (slashNormalized.contains("\\")) { + String shortAccount = StringUtils.trimToEmpty(slashNormalized.substring(slashNormalized.lastIndexOf('\\') + 1)); + if (StringUtils.isNotBlank(shortAccount)) { + accountSet.add(shortAccount); + if (shortAccount.contains("@")) { + accountSet.add(StringUtils.trimToEmpty(shortAccount.substring(0, shortAccount.indexOf('@')))); + } + } + } + if (raw.contains("@")) { + accountSet.add(StringUtils.trimToEmpty(raw.substring(0, raw.indexOf('@')))); + } + return new ArrayList<>(accountSet); + } } diff --git a/cclqms-java/src/main/resources/mapper/sys/SysUserDao.xml b/cclqms-java/src/main/resources/mapper/sys/SysUserDao.xml index 7b51508..a2ef38a 100644 --- a/cclqms-java/src/main/resources/mapper/sys/SysUserDao.xml +++ b/cclqms-java/src/main/resources/mapper/sys/SysUserDao.xml @@ -23,7 +23,8 @@ diff --git a/cclqms-java/src/main/resources/mapper/sys/SysUserTokenDao.xml b/cclqms-java/src/main/resources/mapper/sys/SysUserTokenDao.xml index a97d82d..88451a5 100644 --- a/cclqms-java/src/main/resources/mapper/sys/SysUserTokenDao.xml +++ b/cclqms-java/src/main/resources/mapper/sys/SysUserTokenDao.xml @@ -16,9 +16,9 @@ language_default, site, user_display, - bu_no, - domain_control_account + domain_control_account, + status from sys_user - where domain_control_account = #{domainControlAccount} + where lower(ltrim(rtrim(isnull(domain_control_account, '')))) = lower(ltrim(rtrim(#{domainControlAccount}))) \ No newline at end of file diff --git a/cclqms-vue/src/views/common/login-token.vue b/cclqms-vue/src/views/common/login-token.vue index 8c5328b..006fa5d 100644 --- a/cclqms-vue/src/views/common/login-token.vue +++ b/cclqms-vue/src/views/common/login-token.vue @@ -17,22 +17,60 @@ export default { this.getUrlParams() }, methods: { + decodeParam (value) { + const text = String(value == null ? '' : value) + if (!text) { + return '' + } + try { + return decodeURIComponent(text) + } catch (error) { + return text + } + }, + parseHashQuery () { + const hash = String(window.location.hash || '') + const queryStart = hash.indexOf('?') + if (queryStart < 0) { + return {} + } + const queryText = hash.substring(queryStart + 1).replace(/^&+/, '') + if (!queryText) { + return {} + } + const searchParams = new URLSearchParams(queryText) + const result = {} + searchParams.forEach((value, key) => { + result[key] = this.decodeParam(value) + }) + return result + }, // 解析url参数 getUrlParams () { - const url = window.location.href - const urlStr = url.split('?')[1] || '' - const paramsArr = urlStr ? urlStr.split('&') : [] + const routeQuery = this.$route && this.$route.query ? this.$route.query : {} const obj = {} - for (let i = 0; i < paramsArr.length; i++) { - const arr = paramsArr[i].split('=') - obj[arr[0]] = arr[1] + Object.keys(routeQuery).forEach((key) => { + obj[key] = this.decodeParam(routeQuery[key]) + }) + // 兼容OA拼接异常场景,使用hash中的query兜底 + if (!obj.dca || !obj.path) { + Object.assign(obj, this.parseHashQuery()) } + obj.dca = String(obj.dca || '').trim() + obj.path = String(obj.path || 'home').trim() || 'home' + obj.token = String(obj.token || '').trim() + obj.site = String(obj.site || '').trim() + obj.docNo = String(obj.docNo || '').trim() this.urlParam = obj this.dataFormSubmit() }, // 提交表单 dataFormSubmit () { + if (!this.urlParam.dca) { + this.$message.error('登录失败:缺少域控账号参数(dca)') + return + } this.$http({ url: this.$http.adornUrl('/sys/loginToken'), method: 'post', @@ -51,7 +89,7 @@ export default { localStorage.setItem('userName', data.userName || '') localStorage.setItem('accessSite', data.site || '') this.getConfigParams() - this.$router.replace({ + const replaceResult = this.$router.replace({ name: this.urlParam.path, params: { site: data.site, @@ -59,9 +97,20 @@ export default { type: 'tokenLogin' } }) + if (replaceResult && typeof replaceResult.catch === 'function') { + replaceResult.catch(() => { + const fallbackResult = this.$router.replace({ name: 'home' }) + if (fallbackResult && typeof fallbackResult.catch === 'function') { + fallbackResult.catch(() => {}) + } + }) + } } else { this.$message.error((data && data.msg) || '登录失败') } + }).catch((error) => { + const msg = error && error.response && error.response.data ? error.response.data.msg : '' + this.$message.error(msg || (error && error.message) || '登录失败') }) },