diff --git a/cf-dependencies/pom.xml b/cf-dependencies/pom.xml index 8efca4043..3a92dec32 100644 --- a/cf-dependencies/pom.xml +++ b/cf-dependencies/pom.xml @@ -195,7 +195,7 @@ - com.github.xingfudeshi + com.github.xingfudeshi knife4j-openapi3-jakarta-spring-boot-starter ${knife4j.version} @@ -207,7 +207,7 @@ com.github.xiaoymin knife4j-gateway-spring-boot-starter - 4.5.0 + 4.5.0 diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/cache/CacheUtils.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/cache/CacheUtils.java index 40351bd65..1e0994115 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/cache/CacheUtils.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/cache/CacheUtils.java @@ -21,7 +21,7 @@ public class CacheUtils { // 只阻塞当前数据加载线程，其他线程返回旧值 .refreshAfterWrite(duration) // 通过 asyncReloading 实现全异步加载，包括 refreshAfterWrite 被阻塞的加载线程 - .build(CacheLoader.asyncReloading(loader, Executors.newCachedThreadPool())); // TODO 芋艿：可能要思考下，未来要不要做成可配置 + .build(CacheLoader.asyncReloading(loader, Executors.newCachedThreadPool())); // TODO 可能要思考下，未来要不要做成可配置 } /** diff --git a/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/datasource/config/ChenfengDataSourceAutoConfiguration.java b/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/datasource/config/ChenfengDataSourceAutoConfiguration.java index 575bbd47e..be2d5f7c2 100644 --- a/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/datasource/config/ChenfengDataSourceAutoConfiguration.java +++ b/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/datasource/config/ChenfengDataSourceAutoConfiguration.java @@ -23,13 +23,13 @@ public class ChenfengDataSourceAutoConfiguration { * 创建 DruidAdRemoveFilter 过滤器，过滤 common.js 的广告 */ @Bean - @ConditionalOnProperty(name = "spring.datasource.druid.web-stat-filter.enabled", havingValue = "true") + @ConditionalOnProperty(name = "spring.datasource.druid.stat-view-servlet.enabled", havingValue = "true") public FilterRegistrationBean druidAdRemoveFilterFilter(DruidStatProperties properties) { // 获取 druid web 监控页面的参数 DruidStatProperties.StatViewServlet config = properties.getStatViewServlet(); // 提取 common.js 的配置路径 String pattern = config.getUrlPattern() != null ? config.getUrlPattern() : "/druid/*"; - String commonJsPattern = pattern.replace("\\*", "js/common.js"); + String commonJsPattern = pattern.replaceAll("\\*", "js/common.js"); // 创建 DruidAdRemoveFilter Bean FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); registrationBean.setFilter(new DruidAdRemoveFilter()); diff --git a/cf-gateway/src/main/resources/application-local.yaml b/cf-gateway/src/main/resources/application-local.yaml index 7c90ad852..37ab95ab6 100644 --- a/cf-gateway/src/main/resources/application-local.yaml +++ b/cf-gateway/src/main/resources/application-local.yaml @@ -16,7 +16,7 @@ spring: # 日志文件配置 logging: level: - org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 芋艿：先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示 + org.springframework.context.support.PostProcessorRegistrationDelegate: ERROR # TODO 先禁用，Spring Boot 3.X 存在部分错误的 WARN 提示 chenfeng: diff --git a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/security/config/SecurityConfiguration.java b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/security/config/SecurityConfiguration.java index 5d9618183..b98286cdd 100644 --- a/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/security/config/SecurityConfiguration.java +++ b/cf-module-infra/cf-module-infra-biz/src/main/java/com/cf/imes/module/infra/framework/security/config/SecurityConfiguration.java @@ -39,7 +39,7 @@ public class SecurityConfiguration { // 文件读取 registry.requestMatchers(buildAdminApi("/infra/file/*/get/**")).permitAll(); - // TODO 芋艿：这个每个项目都需要重复配置，得捉摸有没通用的方案 + // TODO 这个每个项目都需要重复配置，得捉摸有没通用的方案 // RPC 服务的安全配置 registry.requestMatchers(ApiConstants.PREFIX + "/**").permitAll(); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/security/config/SecurityConfiguration.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/security/config/SecurityConfiguration.java index ec0de153d..8e9086ece 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/security/config/SecurityConfiguration.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/framework/security/config/SecurityConfiguration.java @@ -24,7 +24,7 @@ public class SecurityConfiguration { @Override public void customize(AuthorizeHttpRequestsConfigurer.AuthorizationManagerRequestMatcherRegistry registry) { - // TODO 芋艿：这个每个项目都需要重复配置，得捉摸有没通用的方案 + // TODO 这个每个项目都需要重复配置，得捉摸有没通用的方案 // Swagger 接口文档 registry.requestMatchers("/v3/api-docs/**").permitAll() .requestMatchers("/webjars/**").permitAll() diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/framework/security/config/SecurityConfiguration.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/framework/security/config/SecurityConfiguration.java index 745b54bde..7f0738fec 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/framework/security/config/SecurityConfiguration.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/framework/security/config/SecurityConfiguration.java @@ -24,7 +24,7 @@ public class SecurityConfiguration { @Override public void customize(AuthorizeHttpRequestsConfigurer.AuthorizationManagerRequestMatcherRegistry registry) { - // TODO 芋艿：这个每个项目都需要重复配置，得捉摸有没通用的方案 + // TODO 这个每个项目都需要重复配置，得捉摸有没通用的方案 // Swagger 接口文档 registry.requestMatchers("/v3/api-docs/**").permitAll() .requestMatchers("/webjars/**").permitAll() diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/justauth/core/AuthRequestFactory.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/justauth/core/AuthRequestFactory.java index 9bc142a5e..6b8356be7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/justauth/core/AuthRequestFactory.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/justauth/core/AuthRequestFactory.java @@ -95,7 +95,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -// TODO @芋艿：等官方发布 1.4.1！！！ +// TODO 等官方发布 1.4.1！！！ /** *

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/security/config/SecurityConfiguration.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/security/config/SecurityConfiguration.java index 8652bb153..ab7036371 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/security/config/SecurityConfiguration.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/security/config/SecurityConfiguration.java @@ -20,7 +20,7 @@ public class SecurityConfiguration { @Override public void customize(AuthorizeHttpRequestsConfigurer.AuthorizationManagerRequestMatcherRegistry registry) { - // TODO 芋艿：这个每个项目都需要重复配置，得捉摸有没通用的方案 + // TODO 这个每个项目都需要重复配置，得捉摸有没通用的方案 // Swagger 接口文档 registry.requestMatchers("/v3/api-docs/**").permitAll() .requestMatchers("/webjars/**").permitAll()