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