From be784e31cdf09d66c37f811db84e1a6e2bfed8d2 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 15 七月 2025 15:59:33 +0800
Subject: [PATCH] 适配沃克现场(企业微信集成)的配置调整

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java
index 9e8a0f6..0d7a4c4 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java
@@ -9,6 +9,7 @@
 import me.zhyd.oauth.model.AuthResponse;
 import me.zhyd.oauth.request.AuthRequest;
 import me.zhyd.oauth.utils.AuthStateUtils;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
@@ -16,6 +17,7 @@
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.RestUtil;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.config.shiro.JwtToken;
 import org.jeecg.config.thirdapp.ThirdAppConfig;
 import org.jeecg.config.thirdapp.ThirdAppTypeItemVo;
 import org.jeecg.modules.base.service.BaseCommonService;
@@ -64,6 +66,9 @@
 	@Autowired
 	private ThirdAppDingtalkServiceImpl thirdAppDingtalkService;
 
+	/**token鏈夋晥鏃堕棿锛岀洰鍓嶇幇鍦鸿姹備紒涓氬井淇℃湁鏁堟椂闂�*/
+	public static final long EXPIRE_TIME = 30L * 24 * 60 * 60 * 1000;
+
 	@RequestMapping("/render/{source}")
     public void render(@PathVariable("source") String source, HttpServletResponse response) throws IOException {
         log.info("绗笁鏂圭櫥褰曡繘鍏ender锛�" + source);
@@ -108,6 +113,9 @@
 				String sysUserId = user.getSysUserId();
 				SysUser sysUser = sysUserService.getById(sysUserId);
 				String token = saveToken(sysUser);
+				// 浣跨敤token杩涜Shiro鐧诲綍
+				JwtToken jwtToken = new JwtToken(token);
+				SecurityUtils.getSubject().login(jwtToken); // 姝よ浠g爜浼氳Е鍙慠ealm鐨勮璇佹柟娉曪紝灏嗙敤鎴蜂俊鎭瓨鍏hiro鐨勪細璇�
     			modelMap.addAttribute("token", token);
 			}else{
 				modelMap.addAttribute("token", "缁戝畾鎵嬫満鍙�,"+""+uuid);
@@ -198,7 +206,7 @@
 		String token = JwtUtil.sign(user.getUsername(), user.getPassword());
 		redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
 		// 璁剧疆瓒呮椂鏃堕棿
-		redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
+		redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, EXPIRE_TIME / 1000);
 		return token;
 	}
 
@@ -303,7 +311,7 @@
 			// 浼佷笟鐨凜orpID
 			builder.append("?appid=").append(config.getClientId());
 			// 鎺堟潈鍚庨噸瀹氬悜鐨勫洖璋冮摼鎺ュ湴鍧�锛岃浣跨敤urlencode瀵归摼鎺ヨ繘琛屽鐞�
-			String redirectUri = RestUtil.getBaseUrl() + "/sys/thirdLogin/oauth2/wechat_enterprise/callback";
+			String redirectUri ="https://fastwoke.cn:8087/jeecg-boot/sys/thirdLogin/oauth2/wechat_enterprise/callback";
 			builder.append("&redirect_uri=").append(URLEncoder.encode(redirectUri, "UTF-8"));
 			// 杩斿洖绫诲瀷锛屾鏃跺浐瀹氫负锛歝ode
 			builder.append("&response_type=code");
@@ -394,7 +402,10 @@
 			}
 
 			String token = saveToken(loginUser);
-			state += "/oauth2-app/login?oauth2LoginToken=" + URLEncoder.encode(token, "UTF-8");
+			// ============ 鏂板 Shiro 鐧诲綍閫昏緫 ============
+			JwtToken jwtToken = new JwtToken(token);
+			SecurityUtils.getSubject().login(jwtToken);
+			state += "/h5/oauth2-app/login?oauth2LoginToken=" + URLEncoder.encode(token, "UTF-8");
 			//update-begin---author:wangshuai ---date:20220613  for锛歔issues/I5BOUF]oauth2 閽夐拤鏃犳硶鐧诲綍------------
 			state += "&thirdType=" + source;
 			//state += "&thirdType=" + "wechat_enterprise";

--
Gitblit v1.9.3