From 0bbbd746e8c39d91ad7b47a4e36e29ab972dc98c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 20 十月 2026 16:56:54 +0800
Subject: [PATCH] 处理长期任务发送问题
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 102 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 69 insertions(+), 33 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 b13fa65..fe60cf0 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
@@ -1,20 +1,6 @@
package com.ruoyi.framework.web.service;
-import javax.annotation.Resource;
-
import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.utils.HttpUtil;
-import com.ruoyi.common.utils.RSAPublicKeyExample;
-import com.smartor.service.impl.ServiceSLTDHealthcareRecordServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Component;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -24,17 +10,24 @@
import com.ruoyi.common.exception.user.CaptchaException;
import com.ruoyi.common.exception.user.CaptchaExpireException;
import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.security.context.AuthenticationContextHolder;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@@ -76,6 +69,9 @@
@Value("${spring.profiles.active}")
private String active;
+ @Value("${lwl_app_key}")
+ private String APP_KEY;
+
/**
* 鐧诲綍楠岃瘉
*
@@ -85,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) {
@@ -95,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);
@@ -117,6 +113,16 @@
return tokenService.createToken(loginUser);
}
+ public String getTokenWN(String userName) {
+ SysUser sysUser = userService.selectUserByUserName(userName);
+ System.out.println("sysUser鐨勭粨鏋滀负锛�" + sysUser);
+
+ LoginUser loginUser = new LoginUser();
+ loginUser.setUserId(sysUser.getUserId());
+ loginUser.setDeptId(sysUser.getDeptId());
+ loginUser.setUser(sysUser);
+ return tokenService.createToken(loginUser);
+ }
/**
* SSO 鍗曠偣鐧诲綍涓氬姟澶勭悊
@@ -134,7 +140,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;
@@ -166,10 +172,15 @@
*/
private String resolveUserNameBySltdToken(String token) {
Map<String, String> headers = new HashMap<>();
- headers.put("app-key", ServiceSLTDHealthcareRecordServiceImpl.APP_KEY);
+ 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)) {
@@ -178,13 +189,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) {
@@ -226,15 +255,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