Browse Source

改登录

master
fengyuan_yang 3 months ago
parent
commit
a87ac3212a
  1. 10
      cclqms-java/src/main/java/com/gaotao/modules/sys/controller/SysLoginController.java
  2. 91
      cclqms-java/src/main/java/com/gaotao/modules/sys/service/impl/SysUserTokenServiceImpl.java
  3. 3
      cclqms-java/src/main/resources/mapper/sys/SysUserDao.xml
  4. 6
      cclqms-java/src/main/resources/mapper/sys/SysUserTokenDao.xml
  5. 63
      cclqms-vue/src/views/common/login-token.vue

10
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<String, Object> 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(), "登录失败"));
}
}

91
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<SysUserTokenDao, SysUse
//保存token
this.save(tokenEntity);
}else{
// 允许重复登陆
//tokenEntity.setToken(token);
if (StringUtils.isBlank(tokenEntity.getToken())) {
tokenEntity.setToken(token);
}
tokenEntity.setUpdateTime(now);
tokenEntity.setExpireTime(expireTime);
@ -78,40 +84,105 @@ public class SysUserTokenServiceImpl extends ServiceImpl<SysUserTokenDao, SysUse
*/
@Override
public R createToken2(SysLoginForm form) {
// 根据域控账号查询QMS用户
List<SysUserEntity> 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<String> accountCandidates = buildDomainControlAccountCandidates(domainControlAccount);
Map<Long, SysUserEntity> userMap = new LinkedHashMap<>();
for (String account : accountCandidates) {
SysLoginForm queryForm = new SysLoginForm();
queryForm.setDomainControlAccount(account);
List<SysUserEntity> 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<String> buildDomainControlAccountCandidates(String domainControlAccount) {
Set<String> 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);
}
}

3
cclqms-java/src/main/resources/mapper/sys/SysUserDao.xml

@ -23,7 +23,8 @@
<!--按照域控账号查询-->
<select id="queryByDomainControlAccount" resultType="com.gaotao.modules.sys.entity.SysUserEntity">
select * from sys_user where domain_control_account = #{username}
select * from sys_user
where lower(ltrim(rtrim(isnull(domain_control_account, '')))) = lower(ltrim(rtrim(#{username})))
</select>
<!--根据域控账号查询OA用户-->

6
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})))
</select>
</mapper>

63
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) || '登录失败')
})
},

Loading…
Cancel
Save