From f316cadfdd20c70aeb35c12995c0069efcead2b6 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 29 八月 2025 21:27:19 +0800
Subject: [PATCH] 代码配置修改
---
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 89 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 81 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
index 774366d..640c8e5 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
@@ -3,7 +3,9 @@
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.aliyun.dingtalkcontact_1_0.models.GetUserHeaders;
import com.aliyun.dingtalkcontact_1_0.models.GetUserResponseBody;
import com.aliyun.dingtalkoauth2_1_0.models.GetUserTokenRequest;
@@ -14,9 +16,7 @@
import com.dingtalk.api.DingTalkClient;
import com.dingtalk.api.request.*;
import com.dingtalk.api.response.OapiUserGetbyunionidResponse;
-import com.dingtalk.api.response.OapiUserGetuserinfoResponse;
import com.dingtalk.api.response.OapiV2UserGetResponse;
-import com.dingtalk.api.response.OapiV2UserGetuserinfoResponse;
import com.taobao.api.ApiException;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
@@ -33,6 +33,7 @@
import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
import org.dromara.common.social.config.properties.SocialProperties;
import org.dromara.common.social.utils.SocialUtils;
@@ -50,12 +51,17 @@
import org.dromara.web.service.IAuthStrategy;
import org.dromara.web.service.SysLoginService;
import org.dromara.web.service.SysRegisterService;
+import org.dromara.web.utils.RZTHttpUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.aliyun.teaopenapi.models.Config;
import java.net.URL;
+import java.time.Duration;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 璁よ瘉
@@ -79,6 +85,7 @@
private final ISysClientService clientService;
private final ISysUserService userService;
private final SysUserMapper userMapper;
+ private final RZTHttpUtils rzthttpUtils;
/**
@@ -246,6 +253,7 @@
//鎺ュ彛鍦板潃锛氭敞鎰�/auth涓庨拤閽夌櫥褰曚笌鍒嗕韩鐨勫洖璋冨煙鍚嶅湴鍧�涓�鑷�
@RequestMapping(value = "/dingdingLogin", method = RequestMethod.GET)
public String getAccessToken(@RequestParam(value = "authCode") String authCode, @RequestParam(value = "code") String code) throws Exception {
+
com.aliyun.dingtalkoauth2_1_0.Client client = authClient();
GetUserTokenRequest getUserTokenRequest = new GetUserTokenRequest()
@@ -257,11 +265,16 @@
.setCode(authCode)
.setGrantType("authorization_code");
GetUserTokenResponse getUserTokenResponse = client.getUserToken(getUserTokenRequest);
- //鑾峰彇鐢ㄦ埛涓汉token
- String accessToken = getUserTokenResponse.getBody().getAccessToken();
- GetUserResponseBody userResponseBody = getUserinfoNoId(accessToken);
- String userId = getUserId(accessToken, userResponseBody.getUnionId());
- OapiV2UserGetResponse.UserGetResponse userGetResponse = getUserinfo(accessToken, userId);
+ System.out.println(getUserTokenResponse.getBody());
+ if ("dingf4816bf92d85d84435c2f4657eb6378f".equals(getUserTokenResponse.getBody().getCorpId())) {
+
+ //鑾峰彇鐢ㄦ埛涓汉token
+ String accessToken = getUserTokenResponse.getBody().getAccessToken();
+ GetUserResponseBody userResponseBody = getUserinfoNoId(accessToken);
+ return userResponseBody.mobile;
+ }
+
+
return "";
}
@@ -294,7 +307,10 @@
OapiUserGetbyunionidRequest req = new OapiUserGetbyunionidRequest();
req.setUnionid(unionId);
OapiUserGetbyunionidResponse rsp = client.execute(req, accessToken);
- return rsp.getResult().getUserid();
+ if (rsp.isSuccess()) {
+ return rsp.getResult().getUserid();
+ }
+ return null;
}
public OapiV2UserGetResponse.UserGetResponse getUserinfo(String accessToken, String userId) throws Exception {
@@ -306,4 +322,61 @@
return rsp.getResult();
}
+
+ final String redisKey = "RZT_TOKEN";
+
+ @RequestMapping(value = "/rztLogin", method = RequestMethod.GET)
+ public String getRztAccessToken(@RequestParam(value = "code") String code) {
+ try {
+
+ log.info("code鍊硷細{}", code);
+ String accessToken = getRztToken();
+ log.info("accessToken鍊硷細{}", accessToken);
+ if (StrUtil.isNotBlank(accessToken)) {
+ Map<String, String> hashMap = new HashMap<>();
+ hashMap.put("code", code);
+ hashMap.put("token", accessToken);
+ String userJson = rzthttpUtils.sendGetRequest("/login/info", hashMap);
+ log.info("鐢ㄦ埛淇℃伅锛歿}", userJson);
+ JSONObject userObject = JSON.parseObject(userJson);
+ if (userObject.getIntValue("errcode") == 0) {
+ return userObject.getString("userid");
+ } else {
+ log.error("鑾峰彇鐢ㄦ埛淇℃伅澶辫触锛歿}", userObject.getString("errmsg"));
+ }
+ }
+
+ } catch (Exception e) {
+ log.error("鑾峰彇鐢ㄦ埛淇℃伅寮傚父锛歿}", e.getMessage());
+ }
+ return "";
+ }
+
+ @Value("${rzt.corpId}")
+ private String corpId;
+
+ @Value("${rzt.corpSecret}")
+ private String corpSecret;
+
+ private String getRztToken() throws Exception {
+ String token = RedisUtils.getCacheObject(redisKey);
+ if (StrUtil.isEmpty(token)) {
+
+ String accessJson = rzthttpUtils.sendGetRequest("/gettoken?corpId=" + corpId + "&corpsecret=" + corpSecret, null);
+ log.info("getRztToken accessJson鍊硷細{}", accessJson);
+ JSONObject jsonObject = JSON.parseObject(accessJson);
+ if (jsonObject.getIntValue("errcode") == 0) {
+ String accessToken = jsonObject.getString("access_token");
+ Integer expiresIn = jsonObject.getIntValue("expires_in");
+ RedisUtils.setCacheObject(redisKey, accessToken, Duration.ofSeconds(expiresIn));
+ return accessToken;
+ } else {
+ log.error("鑾峰彇token澶辫触锛歿},{}", jsonObject.getIntValue("errcode"), jsonObject.getString("errmsg"));
+ return null;
+ }
+
+ } else {
+ return token;
+ }
+ }
}
--
Gitblit v1.8.0