From 43e66ea9c607f6ae881a63878dee96e0af9389f1 Mon Sep 17 00:00:00 2001 From: chy Date: Tue, 10 Mar 2026 11:09:46 +0800 Subject: [PATCH 1/3] =?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) { // 删除访问令牌 From de1774b2d3ab76be2dcbfbd0562c8eb71d38bf12 Mon Sep 17 00:00:00 2001 From: chy Date: Tue, 10 Mar 2026 11:13:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-local.yaml | 24 ++++++------------- .../src/main/resources/application-prod.yaml | 10 ++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lidee-admin/src/main/resources/application-local.yaml b/lidee-admin/src/main/resources/application-local.yaml index 22ded7a..7710c33 100644 --- a/lidee-admin/src/main/resources/application-local.yaml +++ b/lidee-admin/src/main/resources/application-local.yaml @@ -9,43 +9,33 @@ spring: datasource: master: # MYSQL数据库 主库，业务库 -# url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 - url: jdbc:mysql://192.168.126.128:33306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 username: root password: root lideeyunji: # 从库，框架库 -# url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 - url: jdbc:mysql://192.168.126.128:33306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 username: root password: root slave: # 日志库单独 lazy: true # 开启懒加载，保证启动速度 -# url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 - url: jdbc:mysql://192.168.126.128:33306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 username: root password: root oracle_gryybi: # 报表平台 oracle + driver-class-name: oracle.jdbc.driver.OracleDriver url: jdbc:oracle:thin:@//192.168.1.247:1521/gryy?oracle.jdbc.defaultNChar=true&oracle.jdbc.convertNcharLiterals=true username: GRYYBI password: xxb147258367 -# driver-class-name: oracle.jdbc.OracleDriver - driver-class-name: oracle.jdbc.driver.OracleDriver erp_bi_data: # 报表平台 mysql -# url: jdbc:mysql://127.0.0.1:3306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 - url: jdbc:mysql://192.168.126.128:33306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://127.0.0.1:3306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 username: root password: root -# redis: -# host: 127.0.0.1 # 地址 -# port: 6379 # 端口 -# database: 2 # 数据库索引 -# password: lidee@123 # 密码，建议生产环境开启 redis: - host: 192.168.126.128 # 地址 + host: 127.0.0.1 # 地址 port: 6379 # 端口 database: 2 # 数据库索引 - password: 123456 # 密码，建议生产环境开启 + password: lidee@123 # 密码，建议生产环境开启 --- #################### 地代码平台相关配置 #################### diff --git a/lidee-admin/src/main/resources/application-prod.yaml b/lidee-admin/src/main/resources/application-prod.yaml index d6e988d..5e78dcd 100644 --- a/lidee-admin/src/main/resources/application-prod.yaml +++ b/lidee-admin/src/main/resources/application-prod.yaml @@ -21,6 +21,16 @@ spring: url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 username: root password: gryy@8888 + oracle_gryybi: # 报表平台 oracle + url: jdbc:oracle:thin:@//192.168.1.247:1521/gryy?oracle.jdbc.defaultNChar=true&oracle.jdbc.convertNcharLiterals=true + username: GRYYBI + password: xxb147258367 + # driver-class-name: oracle.jdbc.OracleDriver + driver-class-name: oracle.jdbc.driver.OracleDriver + erp_bi_data: # 报表平台 mysql + url: jdbc:mysql://127.0.0.1:3306/erp_bi_data?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + username: root + password: root redis: host: 127.0.0.1 # 地址 port: 6379 # 端口 From 56cb31c61638c850031ef27684b8fead34b0805d Mon Sep 17 00:00:00 2001 From: chy Date: Tue, 10 Mar 2026 14:23:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B9=E6=8D=AEtokne=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 --- .../src/main/resources/application-prod.yaml | 6 +++--- lidee-core/.flattened-pom.xml | 5 +++++ .../lidee-service-system-biz/.flattened-pom.xml | 5 +++++ .../system/controller/AuthController.java | 5 +---- .../system/service/IAdminAuthService.java | 2 +- .../system/service/IOAuth2TokenService.java | 4 ++++ .../service/impl/AdminAuthServiceImpl.java | 6 +++--- .../service/impl/OAuth2TokenServiceImpl.java | 17 +++++++++++++++++ 8 files changed, 39 insertions(+), 11 deletions(-) diff --git a/lidee-admin/src/main/resources/application-prod.yaml b/lidee-admin/src/main/resources/application-prod.yaml index 5e78dcd..f95a5b0 100644 --- a/lidee-admin/src/main/resources/application-prod.yaml +++ b/lidee-admin/src/main/resources/application-prod.yaml @@ -9,16 +9,16 @@ spring: datasource: master: # MYSQL数据库 主库，业务库 - url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 username: root password: gryy@8888 lideeyunji: # 从库，框架库 - url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 username: root password: gryy@8888 slave: # 日志库单独 lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://127.0.0.1:3306/gr_repoort?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://127.0.0.1:3306/gr_report?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 username: root password: gryy@8888 oracle_gryybi: # 报表平台 oracle diff --git a/lidee-core/.flattened-pom.xml b/lidee-core/.flattened-pom.xml index b1741c2..ed7a0d8 100644 --- a/lidee-core/.flattened-pom.xml +++ b/lidee-core/.flattened-pom.xml @@ -78,5 +78,10 @@ lidee-service-infra-api ${lidee.version} + + com.oracle.database.nls + orai18n + 21.1.0.0 + diff --git a/lidee-service/lidee-service-system-biz/.flattened-pom.xml b/lidee-service/lidee-service-system-biz/.flattened-pom.xml index 6268ff8..8094005 100644 --- a/lidee-service/lidee-service-system-biz/.flattened-pom.xml +++ b/lidee-service/lidee-service-system-biz/.flattened-pom.xml @@ -97,6 +97,11 @@ com.tencentcloudapi tencentcloud-sdk-java-sms + + com.github.yulichang + mybatis-plus-join-boot-starter + 1.4.11 + com.lideeyunji lidee-module-api 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 1856c42..f6ea6d2 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 @@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil; import com.lideeyunji.service.system.config.convert.auth.AuthConvert; import com.lideeyunji.service.system.constant.ErrorCodeConstants; import com.lideeyunji.service.system.controller.vo.auth.*; -import com.lideeyunji.service.system.controller.vo.auth.*; import com.lideeyunji.service.system.controller.vo.user.user.UserRespVO; import com.lideeyunji.service.system.entity.AdminUserDO; import com.lideeyunji.service.system.entity.MenuDO; @@ -23,7 +22,6 @@ import com.lideeyunji.tool.framework.operatelog.core.annotations.OperateLog; import com.lideeyunji.tool.framework.security.config.SecurityProperties; import com.lideeyunji.tool.framework.security.core.util.SecurityFrameworkUtils; import com.lideeyunji.tool.framework.tenant.core.context.TenantContextHolder; -import com.lideeyunji.service.system.service.*; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -165,8 +163,7 @@ public class AuthController { @Operation(tags = "根据token获取用户信息",summary = "根据token获取用户信息") @Parameter(name = "refreshToken", description = "根据token获取用户信息", required = true) @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 - public CommonResult getUerInfo(@RequestParam("refreshToken") String refreshToken) { - //跟 + public CommonResult getUerInfo(@RequestParam("refreshToken") String refreshToken) { return success(authService.getTokenTouserInfo(refreshToken)); } 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 75df1b7..cb9e62a 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,6 +78,6 @@ public interface IAdminAuthService { */ AuthLoginRespVO refreshToken(String refreshToken); - AuthLoginRespVO getTokenTouserInfo(String refreshToken); + AdminUserDO 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 0cdc837..ae6e893 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 @@ -1,5 +1,6 @@ package com.lideeyunji.service.system.service; +import com.lideeyunji.service.system.entity.AdminUserDO; import com.lideeyunji.tool.framework.common.pojo.PageResult; import com.lideeyunji.service.system.controller.vo.oauth2.token.OAuth2AccessTokenPageReqVO; import com.lideeyunji.service.system.entity.OAuth2AccessTokenDO; @@ -41,6 +42,9 @@ public interface IOAuth2TokenService { */ OAuth2AccessTokenDO refreshAccessToken(String refreshToken, String clientId); + AdminUserDO getTokenTouserInfo(String refreshToken); + + /** * 获得访问令牌 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 d9bd37c..4f9bcbe 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 @@ -364,9 +364,9 @@ public class AdminAuthServiceImpl implements IAdminAuthService { @Override - public AuthLoginRespVO getTokenTouserInfo(String refreshToken) { - OAuth2AccessTokenDO accessTokenDO = oauth2TokenService.refreshAccessToken(refreshToken, OAuth2ClientConstants.CLIENT_ID_DEFAULT); - return AuthConvert.INSTANCE.convert(accessTokenDO); + public AdminUserDO getTokenTouserInfo(String refreshToken) { + AdminUserDO user= oauth2TokenService.getTokenTouserInfo(refreshToken); + return user; } diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/OAuth2TokenServiceImpl.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/OAuth2TokenServiceImpl.java index 68efbf2..e9c4fcc 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/OAuth2TokenServiceImpl.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/service/impl/OAuth2TokenServiceImpl.java @@ -61,6 +61,7 @@ public class OAuth2TokenServiceImpl implements IOAuth2TokenService { @Lazy // 懒加载，避免循环依赖 private IAdminUserService adminUserService; + @Override public OAuth2AccessTokenDO createAccessToken(Long userId, Long lastLoginDeptId, Long lastLoginRoleId, Integer userType, String clientId, List scopes) { return createAccessToken(userId, lastLoginDeptId, lastLoginRoleId, userType, clientId, scopes,false); @@ -77,6 +78,16 @@ public class OAuth2TokenServiceImpl implements IOAuth2TokenService { } + + + @Override + public AdminUserDO getTokenTouserInfo(String refreshToken ) { + // 获得用户基本信息 + OAuth2AccessTokenDO accessTokenDO= oauth2AccessTokenMapper.selectByAccessToken(refreshToken); + AdminUserDO user = adminUserService.getUser(accessTokenDO.getUserId()); + return user; + } + @Override public OAuth2AccessTokenDO refreshAccessToken(String refreshToken, String clientId) { boolean supAdmin = SecurityFrameworkUtils.isSupAdmin(); @@ -110,6 +121,12 @@ public class OAuth2TokenServiceImpl implements IOAuth2TokenService { return createOAuth2AccessToken(refreshTokenDO, clientDO, supAdmin); } + + + + + + @Override public OAuth2AccessTokenDO getAccessToken(String accessToken) { // 优先从 Redis 中获取