From 7b6bb095cc3323411ce517b37071d182ccfc75a3 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Tue, 1 Apr 2025 18:34:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8D=95=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/constant/UserTypeEnum.java | 21 +++++++++++++++++++ .../controller/ThirdPartyOAth2Cotroller.java | 12 +++++------ .../entity/ThirdPartyLogEntity.java | 4 ++++ .../service/ThirdPartyOAuth2Service.java | 19 ++++++++++++----- 4 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/constant/UserTypeEnum.java diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/constant/UserTypeEnum.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/constant/UserTypeEnum.java new file mode 100644 index 000000000..b6471e012 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/constant/UserTypeEnum.java @@ -0,0 +1,21 @@ +package com.bsd.pjcloud.thirdparty.constant; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 出库入口 + */ +@AllArgsConstructor +@Getter +public enum UserTypeEnum { + + ZZD("1", "浙政钉用户"), + SH("2", "诗画"), + ; + private final String type; + private final String description; + + + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java index 1f8f0099d..baeb7878f 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java @@ -49,12 +49,12 @@ public class ThirdPartyOAth2Cotroller { private final ThirdPartyUserService thirdPartyUserService; - @Operation(summary = "浙政钉token" ) - @GetMapping("/zzd/sso" ) - public R getThirdPartyzzdsso(@RequestParam("token")String token) { - return R.ok(thirdPartyOAuth2Service.getZZDUserInfo(token)); - - } +// @Operation(summary = "浙政钉token" ) +// @GetMapping("/zzd/sso" ) +// public R getThirdPartyzzdsso(@RequestParam("token")String token) { +// return R.ok(thirdPartyOAuth2Service.getZZDUserInfo(token)); +// +// } @Operation(summary = "诗画token" ) @GetMapping("/sh/sso" ) diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/entity/ThirdPartyLogEntity.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/entity/ThirdPartyLogEntity.java index c8dbb2b39..0cd669569 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/entity/ThirdPartyLogEntity.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/entity/ThirdPartyLogEntity.java @@ -104,4 +104,8 @@ public class ThirdPartyLogEntity extends Model { */ @Schema(description="租户编号") private Long tenantId; + + + @Schema(description="请求参数") + private String requestParameter; } \ No newline at end of file diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdPartyOAuth2Service.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdPartyOAuth2Service.java index 6e9873e56..80e2042de 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdPartyOAuth2Service.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/ThirdPartyOAuth2Service.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.bsd.pjcloud.admin.api.entity.SysUser; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.thirdparty.config.OAuth2ClientConfig; +import com.bsd.pjcloud.thirdparty.constant.UserTypeEnum; import com.bsd.pjcloud.thirdparty.dto.*; import com.bsd.pjcloud.thirdparty.entity.ThirdPartyDeptEntity; import com.bsd.pjcloud.thirdparty.entity.ThirdPartyLogEntity; @@ -367,7 +368,7 @@ public class ThirdPartyOAuth2Service { //使用token获取当前登录人的信息(浙政钉和诗画的在一起) // ZZDUserDTO zzdUser = getZZDUserInfo(zzdToken); - ZZDUserDTO zzdUser = getZZDUserInfo(token); + ZZDUserDTO zzdUser = getZZDUserInfo(token,UserTypeEnum.ZZD.getType()); return zzdUser; } @@ -390,7 +391,7 @@ public class ThirdPartyOAuth2Service { * @param zzdToken * @return */ - public ZZDUserDTO getZZDUserInfo(String zzdToken) { + public ZZDUserDTO getZZDUserInfo(String zzdToken,String type) { // 构建请求URL try { @@ -413,10 +414,15 @@ public class ThirdPartyOAuth2Service { if (response.getBody().getCode().equals("-1")){ log.error("获取浙政钉/诗画用户信息失败"); log.error("token",zzdToken); - log.error("response",response.getBody()); ThirdPartyLogEntity thirdPartyLogEntity = new ThirdPartyLogEntity(); - thirdPartyLogEntity.setApiName("获取浙政钉/诗画用户信息失败"); + if (type.equals(UserTypeEnum.ZZD.getType())){ + thirdPartyLogEntity.setApiName(UserTypeEnum.ZZD.getDescription()); + }else if (type.equals(UserTypeEnum.SH.getType())){ + thirdPartyLogEntity.setApiName(UserTypeEnum.SH.getDescription()); + } +// thirdPartyLogEntity.setApiName("获取浙政钉/诗画用户信息失败"); thirdPartyLogEntity.setRequestUrl(url); + thirdPartyLogEntity.setRequestParameter(zzdToken); thirdPartyLogEntity.setResponseBody(JSON.toJSONString(response.getBody())); thirdPartyLogEntity.setErrorCode(response.getBody().getCode()); thirdPartyLogEntity.setErrorMsg(response.getBody().getDescription()); @@ -542,7 +548,10 @@ public class ThirdPartyOAuth2Service { */ public ZZDUserDTO shjnsso(String accountId, String sessionId) { String shjnToken = getSHJNToken(accountId, sessionId); - ZZDUserDTO zzdUserDTO = getZZDUserInfo(shjnToken); + if (StringUtils.isEmpty(shjnToken)){ + throw new RuntimeException("获取诗画江南token失败"); + } + ZZDUserDTO zzdUserDTO = getZZDUserInfo(shjnToken,UserTypeEnum.SH.getType()); return zzdUserDTO; } } \ No newline at end of file