对接平台数据

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java

@@ -81,12 +81,12 @@ public class AuthController {
     @GetMapping("/checkPdToken")
     @PermitAll
     @Operation(summary = "验证平台token")
-    public CommonResult<Boolean> checkPdToken(String pdToken) {
-        if (null != pdToken && !"".equals(pdToken)) {
-            return CommonResult.success(authService.checkPdToken(pdToken));
+    public CommonResult<PtResult<LoginUserInfo>> checkPdToken(String code, String redirect_uri) {
+        if (null != code && !"".equals(code)) {
+            return CommonResult.success(authService.checkPdToken(code, redirect_uri));
 
         }
-        return CommonResult.success(false);
+        return CommonResult.success(null);
     }
 
     @PostMapping("/logout")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/conf/PtUrlConf.java

@@ -12,6 +12,8 @@ public class PtUrlConf {
     private String logOffToken;
     private String refTokenUrl;
     private String logOffTokenAndJump;
+    private String appkey;
+    private String redirect_uri;
 
     public String getLoginUrl() {
         return loginUrl;
@@ -60,4 +62,20 @@ public class PtUrlConf {
     public void setLogOffTokenAndJump(String logOffTokenAndJump) {
         this.logOffTokenAndJump = logOffTokenAndJump;
     }
+
+    public String getAppkey() {
+        return appkey;
+    }
+
+    public void setAppkey(String appkey) {
+        this.appkey = appkey;
+    }
+
+    public String getRedirect_uri() {
+        return redirect_uri;
+    }
+
+    public void setRedirect_uri(String redirect_uri) {
+        this.redirect_uri = redirect_uri;
+    }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthService.java

 package cn.iocoder.yudao.module.system.service.auth;
 
+import cn.iocoder.yudao.module.system.controller.admin.auth.myVo.LoginUserInfo;
+import cn.iocoder.yudao.module.system.controller.admin.auth.myVo.PtResult;
 import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 
@@ -92,5 +94,5 @@ public interface AdminAuthService {
      */
     public AdminUserDO getPdUserByToken(String token);
 
-    boolean checkPdToken(String pdToken);
+    PtResult<LoginUserInfo> checkPdToken(String code, String redirect_uri);
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java

@@ -13,7 +13,11 @@ import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi;
 import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
 import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO;
 import cn.iocoder.yudao.module.system.api.social.dto.SocialUserRespDTO;
+import cn.iocoder.yudao.module.system.controller.admin.auth.myVo.LoginUserInfo;
+import cn.iocoder.yudao.module.system.controller.admin.auth.myVo.PtResult;
 import cn.iocoder.yudao.module.system.controller.admin.auth.vo.*;
+import cn.iocoder.yudao.module.system.controller.admin.conf.PtUrlConf;
+import cn.iocoder.yudao.module.system.controller.admin.myUtils.MyHttpUtils;
 import cn.iocoder.yudao.module.system.convert.auth.AuthConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
@@ -26,18 +30,23 @@ import cn.iocoder.yudao.module.system.service.member.MemberService;
 import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService;
 import cn.iocoder.yudao.module.system.service.social.SocialUserService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.google.common.annotations.VisibleForTesting;
 import com.xingyuv.captcha.model.common.ResponseModel;
 import com.xingyuv.captcha.model.vo.CaptchaVO;
 import com.xingyuv.captcha.service.CaptchaService;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.validation.Validator;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -70,6 +79,9 @@ public class AdminAuthServiceImpl implements AdminAuthService {
     @Resource
     private SmsCodeApi smsCodeApi;
 
+    @Autowired
+    private PtUrlConf ptUrlConf;
+
     /**
      * 验证码的开关，默认为 true
      */
@@ -318,10 +330,23 @@ public class AdminAuthServiceImpl implements AdminAuthService {
     }
 
     @Override
-    public boolean checkPdToken(String pdToken) {
-        if (null != pdToken && !"".equals(pdToken)) {
-            return true;
+    public PtResult<LoginUserInfo> checkPdToken(String code, String redirect_uri) {
+        if (null != code && !"".equals(code)) {
+
+            // 带参数和请求头
+            Map<String, String> headers = new HashMap<>();
+            headers.put("appkey", ptUrlConf.getAppkey());
+
+            Map<String, Object> bodyMap = new HashMap<>();
+            bodyMap.put("code", code);
+            bodyMap.put("redirect_uri", ptUrlConf.getRedirect_uri());
+
+            String rStr = MyHttpUtils.get(ptUrlConf.getGetUserByCode(), headers, bodyMap);
+
+            PtResult<LoginUserInfo> result = JSON.parseObject(rStr, new TypeReference<PtResult<LoginUserInfo>>() {});
+
+            return result;
         }
-        return false;
+        return null;
     }
 }

yudao-server/src/main/resources/application.yaml

@@ -3,8 +3,8 @@ spring:
     name: yudao-server
 
   profiles:
-    active: local
-#    active: dev
+#    active: local
+    active: dev
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
@@ -376,7 +376,8 @@ ptauth:
   logOffToken: http://59.195.13.243:8000/oauth/N1007
   refTokenUrl: http://59.195.13.243:8000/oauth/N1010
   logOffTokenAndJump: http://59.195.13.243:8000/oauth/oauth/logout?redirect_uri=
-
+  appkey: 2ae50f22f14946c1b6d288a848c6a8fd
+  redirect_uri: https://59.195.13.208
 
 basicinfo:
   userInfoUrl: http://59.195.13.243:8000/srit-open-api/data-service/api/user-info-list