From 43e66ea9c607f6ae881a63878dee96e0af9389f1 Mon Sep 17 00:00:00 2001 From: chy Date: Tue, 10 Mar 2026 11:09:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEticket=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lidee-admin/src/main/resources/application.yaml | 2 +- .../core/framework/config/job/SaSetdtlSyncJob.java | 2 +- .../core/framework/config/job/anyToGrBiSasetdtl.java | 3 --- .../service/system/controller/AuthController.java | 3 ++- .../system/controller/OAuth2ClientController.java | 2 +- .../service/system/service/IAdminAuthService.java | 2 ++ .../service/system/service/IOAuth2TokenService.java | 1 + .../system/service/impl/AdminAuthServiceImpl.java | 9 +++++++++ 8 files changed, 17 insertions(+), 7 deletions(-) diff --git a/lidee-admin/src/main/resources/application.yaml b/lidee-admin/src/main/resources/application.yaml index 78f3ff4..50ca7c0 100644 --- a/lidee-admin/src/main/resources/application.yaml +++ b/lidee-admin/src/main/resources/application.yaml @@ -3,7 +3,7 @@ spring: name: lideeyunji-server profiles: active: local # 读取配置 - #active: prod # 读取配置 +# active: prod # 读取配置 main: allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。 diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/SaSetdtlSyncJob.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/SaSetdtlSyncJob.java index 2c55526..68434dd 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/SaSetdtlSyncJob.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/SaSetdtlSyncJob.java @@ -13,8 +13,8 @@ import org.springframework.stereotype.Component; * 同步销售明细表 * oracle gryybi GR_BI_SA_SETDTL --> mysql erp_bi_data GR_BI_SA_SETDTL */ -@Component @Slf4j +@Component("SaSetdtlSyncJob") public class SaSetdtlSyncJob implements JobHandler { @Autowired diff --git a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/anyToGrBiSasetdtl.java b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/anyToGrBiSasetdtl.java index fb52951..44f06c7 100644 --- a/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/anyToGrBiSasetdtl.java +++ b/lidee-core/src/main/java/com/lideeyunji/core/framework/config/job/anyToGrBiSasetdtl.java @@ -60,9 +60,6 @@ public class anyToGrBiSasetdtl implements JobHandler { while (rs.next()) { //写入到数据中台表 - - - System.out.println(rs.getString("SASETTLEDTLID")); } diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java index 495b839..1856c42 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/AuthController.java @@ -166,7 +166,8 @@ public class AuthController { @Parameter(name = "refreshToken", description = "根据token获取用户信息", required = true) @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 public CommonResult getUerInfo(@RequestParam("refreshToken") String refreshToken) { - return success(authService.refreshToken(refreshToken)); + //跟 + return success(authService.getTokenTouserInfo(refreshToken)); } @GetMapping("/get-permission-info") diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/OAuth2ClientController.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/OAuth2ClientController.java index c05c1c9..692402f 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/OAuth2ClientController.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/OAuth2ClientController.java @@ -73,7 +73,7 @@ public class OAuth2ClientController { @GetMapping("/myPage") @Operation(tags = "OAuth2.0管理",summary = "获得用户角色下 OAuth2 客户端分页") - @PreAuthorize("@ss.hasPermission('system:oauth2-client:query')") +// @PreAuthorize("@ss.hasPermission('system:oauth2-client:query')") public CommonResult> getMyPage(@Valid OAuth2ClientPageReqVO pageVO) { PageResult pageResult = oAuth2ClientService.getMyPage(pageVO); return success(BeanUtils.toBean(pageResult, OAuth2ClientRespVO.class)); diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/IAdminAuthService.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/IAdminAuthService.java index 9d6f8fd..75df1b7 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/IAdminAuthService.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/IAdminAuthService.java @@ -78,4 +78,6 @@ public interface IAdminAuthService { */ AuthLoginRespVO refreshToken(String refreshToken); + AuthLoginRespVO getTokenTouserInfo(String refreshToken); + } diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/IOAuth2TokenService.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/IOAuth2TokenService.java index 258a543..0cdc837 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/IOAuth2TokenService.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/IOAuth2TokenService.java @@ -41,6 +41,7 @@ public interface IOAuth2TokenService { */ OAuth2AccessTokenDO refreshAccessToken(String refreshToken, String clientId); + /** * 获得访问令牌 * diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/AdminAuthServiceImpl.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/AdminAuthServiceImpl.java index e19f837..d9bd37c 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/AdminAuthServiceImpl.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/AdminAuthServiceImpl.java @@ -362,6 +362,15 @@ public class AdminAuthServiceImpl implements IAdminAuthService { return AuthConvert.INSTANCE.convert(accessTokenDO); } + + @Override + public AuthLoginRespVO getTokenTouserInfo(String refreshToken) { + OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.refreshAccessToken(refreshToken, OAuth2ClientConstants.CLIENT_ID_DEFAULT); + return AuthConvert.INSTANCE.convert(accessTokenDO); + } + + + @Override public void logout(String token, Integer logType) { // 删除访问令牌