diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/UrlTokenDTO.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/UrlTokenDTO.java new file mode 100644 index 000000000..7e2c48744 --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/UrlTokenDTO.java @@ -0,0 +1,9 @@ +package com.bsd.pjcloud.thirdparty.dto; + + +import lombok.Data; + +@Data +public class UrlTokenDTO { + private String token; +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyLogController.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyLogController.java index a5ee704b8..231ed2712 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyLogController.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyLogController.java @@ -48,6 +48,7 @@ public class ThirdPartyLogController { @PreAuthorize("@pms.hasPermission('thirdparty_thirdPartyLog_view')" ) public R getThirdPartyLogPage(@ParameterObject Page page, @ParameterObject ThirdPartyLogEntity thirdPartyLog) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.orderByDesc(ThirdPartyLogEntity::getCreateTime); return R.ok(thirdPartyLogService.page(page, wrapper)); } 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 baeb7878f..db8811776 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 @@ -10,6 +10,7 @@ import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.annotation.Inner; import com.bsd.pjcloud.thirdparty.dto.SHJNSSODTO; +import com.bsd.pjcloud.thirdparty.dto.UrlTokenDTO; import com.bsd.pjcloud.thirdparty.dto.ZZDUserDTO; import com.bsd.pjcloud.thirdparty.entity.ThirdPartyUserEntity; import com.bsd.pjcloud.thirdparty.service.ThirdPartyOAuth2Service; @@ -68,13 +69,14 @@ public class ThirdPartyOAth2Cotroller { * @param token 浙政钉前端获取的token * @return */ - @GetMapping("/zzdsso/{token}") + @PostMapping("/zzdsso") @Operation(summary = "浙政钉单点登录") @SysLog("浙政钉单点登录") @Inner(value = false) @GlobalTransactional @Transactional(rollbackFor = Exception.class) - public R zzdsso(@PathVariable(name = "token") String token) { + public R zzdsso(@RequestBody UrlTokenDTO urlTokenDTO) { + String token = urlTokenDTO.getToken(); if (StringUtils.isBlank(token)){ return R.failed("token不能为空"); } 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 659f1754f..3e4e0e5c7 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 @@ -431,7 +431,7 @@ public class ThirdPartyOAuth2Service { thirdPartyLogEntity.setHttpStatus(response.getStatusCode().toString()); thirdPartyLogEntity.setCreateBy("thirdPartylog"); thirdPartyLogService.saveLog(thirdPartyLogEntity); - throw new RuntimeException("获取浙政钉用户信息失败"); + throw new RuntimeException(response.getBody().getDescription()); } return response.getBody().getData(); } catch (HttpStatusCodeException e) {