diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java index cf8906e74..0f6cbb268 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.auth.config; +import cn.hutool.core.util.StrUtil; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import com.pig4cloud.pigx.common.security.component.PigxWebResponseExceptionTranslator; @@ -99,7 +100,7 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap tokenStore.setAuthenticationKeyGenerator(new DefaultAuthenticationKeyGenerator() { @Override public String extractKey(OAuth2Authentication authentication) { - return super.extractKey(authentication) + ":" + TenantContextHolder.getTenantId(); + return super.extractKey(authentication) + StrUtil.COLON + TenantContextHolder.getTenantId(); } }); return tokenStore; diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInterceptor.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInterceptor.java index ee34f19ff..3d8eb7660 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInterceptor.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeInterceptor.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.common.data.datascope; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.db.Db; import cn.hutool.db.Entity; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; @@ -92,7 +93,7 @@ public class DataScopeInterceptor extends AbstractSqlParserHandler implements In List roleIdList = user.getAuthorities() .stream().map(GrantedAuthority::getAuthority) .filter(authority -> authority.startsWith(SecurityConstants.ROLE)) - .map(authority -> authority.split("_")[1]) + .map(authority -> authority.split(StrUtil.UNDERLINE)[1]) .collect(Collectors.toList()); Entity query = Db.use(dataSource) @@ -107,7 +108,7 @@ public class DataScopeInterceptor extends AbstractSqlParserHandler implements In // 自定义 if (DataScopeTypeEnum.CUSTOM.getType() == dsType) { String dsScope = query.getStr("ds_scope"); - deptIds.addAll(Arrays.stream(dsScope.split(",")) + deptIds.addAll(Arrays.stream(dsScope.split(StrUtil.COMMA)) .map(Integer::parseInt).collect(Collectors.toList())); } // 查询本级及其下级 diff --git a/pigx-visual/pigx-monitor/src/main/resources/ui/login.html b/pigx-visual/pigx-monitor/src/main/resources/ui/login.html index 61577aa55..75ac41c58 100644 --- a/pigx-visual/pigx-monitor/src/main/resources/ui/login.html +++ b/pigx-visual/pigx-monitor/src/main/resources/ui/login.html @@ -1 +1 @@ -Spring Boot Admin - Login

PigX 服务状态监控

Invalid username or password

Logout successful

\ No newline at end of file +Spring Boot Admin - Login

PigX 服务状态监控

Invalid username or password

Logout successful

\ No newline at end of file