From bb839b724afdaf9b4ea8a80c2d8963d2b9c2934c Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期四, 17 七月 2025 09:50:06 +0800
Subject: [PATCH] 企业微信静默登录修改手动授权登录
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 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 0d7a4c4..18317b2 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,7 +9,6 @@
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;
@@ -17,7 +16,6 @@
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;
@@ -113,9 +111,6 @@
String sysUserId = user.getSysUserId();
SysUser sysUser = sysUserService.getById(sysUserId);
String token = saveToken(sysUser);
- // 浣跨敤token杩涜Shiro鐧诲綍
- JwtToken jwtToken = new JwtToken(token);
- SecurityUtils.getSubject().login(jwtToken); // 姝よ浠ｇ爜浼氳Е鍙慠ealm鐨勮璇佹柟娉曪紝灏嗙敤鎴蜂俊鎭瓨鍏hiro鐨勪細璇�
modelMap.addAttribute("token", token);
}else{
modelMap.addAttribute("token", "缁戝畾鎵嬫満鍙�,"+""+uuid);
@@ -206,7 +201,7 @@
String token = JwtUtil.sign(user.getUsername(), user.getPassword());
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
// 璁剧疆瓒呮椂鏃堕棿
- redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, EXPIRE_TIME / 1000);
+ redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
return token;
}
@@ -311,15 +306,17 @@
// 浼佷笟鐨凜orpID
builder.append("?appid=").append(config.getClientId());
// 鎺堟潈鍚庨噸瀹氬悜鐨勫洖璋冮摼鎺ュ湴鍧�锛岃浣跨敤urlencode瀵归摼鎺ヨ繘琛屽鐞�
- String redirectUri ="https://fastwoke.cn:8087/jeecg-boot/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");
// 搴旂敤鎺堟潈浣滅敤鍩熴��
// snsapi_base锛氶潤榛樻巿鏉冿紝鍙幏鍙栨垚鍛樼殑鐨勫熀纭�淇℃伅锛圲serId涓嶥eviceId锛夛紱
- builder.append("&scope=snsapi_base");
+// builder.append("&scope=snsapi_base");
+ builder.append("&scope=snsapi_privateinfo"); // 鎵嬪姩鎺堟潈浣滅敤鍩�
// 閲嶅畾鍚戝悗浼氬甫涓妔tate鍙傛暟锛岄暱搴︿笉鍙秴杩�128涓瓧鑺�
builder.append("&state=").append(state);
+ builder.append("&agentid=").append(config.getAgentId()); // 琛ュ厖AgentID
// 缁堢浣跨敤姝ゅ弬鏁板垽鏂槸鍚﹂渶瑕佸甫涓婅韩浠戒俊鎭�
builder.append("#wechat_redirect");
url = builder.toString();
@@ -402,9 +399,6 @@
}
String token = saveToken(loginUser);
- // ============ 鏂板 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;
--
Gitblit v1.9.3