From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 79 ++++++++++++++++++++++++++++++++-------
1 files changed, 65 insertions(+), 14 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 452155b..709abca 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -81,7 +81,7 @@
* @param uuid 鍞竴鏍囪瘑
* @return 缁撴灉
*/
- public String login(String username, String password, String code, String uuid, String orgid, String campusid) {
+ public String login(String username, String password, String code, String uuid, String orgid, String campusid, String userType) {
boolean captchaEnabled = configService.selectCaptchaEnabled();
// 楠岃瘉鐮佸紑鍏�
if (captchaEnabled) {
@@ -91,7 +91,7 @@
Authentication authentication = null;
try {
if (StringUtils.isEmpty(campusid)) campusid = "1";
- UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username + "&" + orgid + "&" + campusid, password);
+ UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username + "&" + orgid + "&" + campusid + "&" + userType, password);
AuthenticationContextHolder.setContext(authenticationToken);
// 璇ユ柟娉曚細鍘昏皟鐢║serDetailsServiceImpl.loadUserByUsername
authentication = authenticationManager.authenticate(authenticationToken);
@@ -108,11 +108,32 @@
}
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+ // 鐧诲綍椤甸�夋嫨鐨勯櫌鍖鸿鍐欒繘浼氳瘽锛氬師鏉ュ彧鐢� sys_user.campusid锛堣处鍙烽粯璁ら櫌鍖猴級锛�
+ // 鐧诲綍鏃堕�変簡銆岄棽鏋楅櫌鍖恒�嶄粛鐒舵寜銆岀繝鑻戦櫌鍖恒�嶆煡鏁版嵁
+ if (StringUtils.isNotEmpty(campusid) && !"1".equals(campusid)) {
+ if (loginUser.getUser() != null) {
+ loginUser.getUser().setCampusid(campusid);
+ }
+ }
recordLoginInfo(loginUser.getUserId());
// 鐢熸垚token
return tokenService.createToken(loginUser);
}
+ public String getTokenWN(String userName, String campusid) {
+ SysUser sysUser = userService.selectUserByUserName(userName);
+ System.out.println("sysUser鐨勭粨鏋滀负锛�" + sysUser);
+
+ LoginUser loginUser = new LoginUser();
+ loginUser.setUserId(sysUser.getUserId());
+ loginUser.setDeptId(sysUser.getDeptId());
+ // 閫氱敤瀵嗙爜鐧诲綍鍚屾牱瑕佸甫涓婄櫥褰曢〉閫夋嫨鐨勯櫌鍖�
+ if (StringUtils.isNotEmpty(campusid) && !"1".equals(campusid)) {
+ sysUser.setCampusid(campusid);
+ }
+ loginUser.setUser(sysUser);
+ return tokenService.createToken(loginUser);
+ }
/**
* SSO 鍗曠偣鐧诲綍涓氬姟澶勭悊
@@ -130,7 +151,7 @@
*/
public String ssoLogin(String userName, String orgid, String deptId, String campusid, String token) {
// sltd 鐜锛氶�氳繃 SSO token 鑾峰彇鍛樺伐璐﹀彿
- if ("sltd".equals(active)) {
+ if ("sltd".equals(active) || "nhfy".equals(active)) {
userName = resolveUserNameBySltdToken(token);
if (userName == null) {
return null;
@@ -165,7 +186,12 @@
headers.put("app-key", APP_KEY);
Map<String, String> requestParams = new HashMap<>();
requestParams.put("token", token);
- String reqData = HttpUtil.postFormRequest(sltdPubPath + "/checkSsoTokenId", requestParams, headers, null);
+ String url = active != null && active.contains("nhfy")
+ ? sltdPubPath + "/hbos-thirdparty-integration/standard/ih/getHisLoginUserInfo"
+ : sltdPubPath + "/checkSsoTokenId";
+ log.info("銆怱LTD token 楠岃瘉銆戣姹傚湴鍧�锛歿}锛宼oken闀垮害锛歿}锛宼oken缁撳熬锛歿}", url, token.length(),
+ token.length() > 4 ? token.substring(token.length() - 4) : token);
+ String reqData = HttpUtil.postFormRequest(url, requestParams, headers, null);
log.info("銆怱LTD token 楠岃瘉銆戝搷搴旂粨鏋滐細{}", reqData);
if (StringUtils.isEmpty(reqData)) {
@@ -174,13 +200,31 @@
}
Map<String, Object> map = JSONObject.parseObject(reqData, Map.class);
- if (ObjectUtils.isEmpty(map) || (Integer) map.get("code") != 200) {
- log.error("銆怱LTD token 楠岃瘉銆戝搷搴旂爜寮傚父锛岄獙璇佸け璐�");
+ if (ObjectUtils.isEmpty(map)) {
+ log.error("銆怱LTD token 楠岃瘉銆戝搷搴旇В鏋愪负绌猴紝楠岃瘉澶辫触锛屽搷搴斿唴瀹癸細{}", reqData);
return null;
}
- Map<String, Object> data = (Map<String, Object>) map.get("data");
- return (String) data.get("accountNo");
+ Object codeObj = map.get("code");
+ int code = codeObj instanceof Number ? ((Number) codeObj).intValue() : -1;
+ if (code != 200) {
+ log.error("銆怱LTD token 楠岃瘉銆戝搷搴旂爜寮傚父锛岄獙璇佸け璐ワ紝code={}, message={}, 鍝嶅簲鍐呭锛歿}",
+ code, map.get("message"), reqData);
+ return null;
+ }
+
+ Object dataObj = map.get("data");
+ if (!(dataObj instanceof Map)) {
+ log.error("銆怱LTD token 楠岃瘉銆戝搷搴旂己灏慸ata鑺傜偣锛岄獙璇佸け璐ワ紝data={}", dataObj);
+ return null;
+ }
+
+ Object accountNo = ((Map<?, ?>) dataObj).get("accountNo");
+ if (accountNo == null || StringUtils.isEmpty(String.valueOf(accountNo))) {
+ log.error("銆怱LTD token 楠岃瘉銆戝搷搴攄ata涓病鏈塧ccountNo锛岄獙璇佸け璐ワ紝data={}", dataObj);
+ return null;
+ }
+ return String.valueOf(accountNo);
}
public String loginByUserName(String userName) {
@@ -222,15 +266,22 @@
}
/**
- * 璁板綍鐧诲綍淇℃伅
+ * 璁板綍鐧诲綍淇℃伅锛堝紓姝ユ墽琛岋紝涓嶉樆濉炵櫥褰曚富娴佺▼锛�
*
* @param userId 鐢ㄦ埛ID
*/
public void recordLoginInfo(Long userId) {
- SysUser sysUser = new SysUser();
- sysUser.setUserId(userId);
- sysUser.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
- sysUser.setLoginDate(DateUtils.getNowDate());
- userService.updateUserProfile(sysUser);
+ // 鍦ㄥ紓姝ュ墠鎹曡幏IP锛岄伩鍏嶅紓姝ョ嚎绋嬩腑Request涓婁笅鏂囧け鏁�
+ String loginIp = IpUtils.getIpAddr(ServletUtils.getRequest());
+ AsyncManager.me().execute(new java.util.TimerTask() {
+ @Override
+ public void run() {
+ SysUser sysUser = new SysUser();
+ sysUser.setUserId(userId);
+ sysUser.setLoginIp(loginIp);
+ sysUser.setLoginDate(DateUtils.getNowDate());
+ userService.updateUserProfile(sysUser);
+ }
+ });
}
}
--
Gitblit v1.9.3