From 0e05e86f59fdffe695f8e172c9ca3b420ea7e1f0 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Sat, 19 Aug 2023 14:29:40 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=80=BB=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 --- .../kicc/auth/config/AuthorizationServerConfiguration.java | 5 +++-- .../system/bigscreen/service/impl/VisualDbServiceImpl.java | 7 +------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/kicc-auth/src/main/java/com/cloud/kicc/auth/config/AuthorizationServerConfiguration.java b/kicc-auth/src/main/java/com/cloud/kicc/auth/config/AuthorizationServerConfiguration.java index 53e33996..c85f68d9 100644 --- a/kicc-auth/src/main/java/com/cloud/kicc/auth/config/AuthorizationServerConfiguration.java +++ b/kicc-auth/src/main/java/com/cloud/kicc/auth/config/AuthorizationServerConfiguration.java @@ -2,6 +2,7 @@ package com.cloud.kicc.auth.config; import com.cloud.kicc.common.core.constant.SecurityConstants; import com.cloud.kicc.common.data.entity.CasUser; +import com.cloud.kicc.common.data.entity.KiccUser; import com.cloud.kicc.common.security.grant.app.ResourceOwnerCustomeAppTokenGranter; import com.cloud.kicc.common.security.override.KiccClientDetailsService; import com.cloud.kicc.common.security.override.KiccCustomTokenServices; @@ -103,8 +104,8 @@ public class AuthorizationServerConfiguration extends AuthorizationServerConfigu return accessToken; } - CasUser casUser = (CasUser) authentication.getUserAuthentication().getPrincipal(); - additionalInfo.put(SecurityConstants.DETAILS_USER, casUser); + KiccUser kiccUser = (KiccUser) authentication.getUserAuthentication().getPrincipal(); + additionalInfo.put(SecurityConstants.DETAILS_USER, kiccUser); ((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo); return accessToken; }; diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualDbServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualDbServiceImpl.java index 9e323ab6..665b40f3 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualDbServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/bigscreen/service/impl/VisualDbServiceImpl.java @@ -57,14 +57,9 @@ public class VisualDbServiceImpl extends ServiceImpl i BeanUtils.copyProperties(visualDb, dynamicDataSource); DynamicDataSourceUtil.switchToDataSource(dynamicDataSource); // 获取user信息 - CasUser casUser = SecurityUtils.getCasUser(); KiccUser kiccUser = SecurityUtils.getUser(); // 获取user参数 - Map map = MapUtil.newHashMap(); - if (ObjectUtil.isNotEmpty(casUser)) { - map.putAll(BeanUtil.beanToMap(casUser)); - map.putAll(BeanUtil.beanToMap(kiccUser)); - } + Map map = ObjectUtil.isEmpty(kiccUser) ? MapUtil.newHashMap() : BeanUtil.beanToMap(kiccUser); // 替换user占位符 String dynamicSql = PlaceholderUtil.getDefaultResolver().resolveByMap(sql, map); // 执行自定义sql