diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index ab2a0e805..6729b5f36 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -124,6 +124,8 @@ spring: admin: # Spring Boot Admin Client 客户端的相关配置 client: + # 增加客户端开关 + enabled: true # 设置 Spring Boot Admin Server 地址 url: http://localhost:9090/admin instance: diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index bfc11f74e..9fdff6cec 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -124,6 +124,8 @@ spring: admin: # Spring Boot Admin Client 客户端的相关配置 client: + # 增加客户端开关 + enabled: true # 设置 Spring Boot Admin Server 地址 url: http://172.30.0.90:9090/admin instance: diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index 5f8964e45..627e1d9d6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -129,18 +129,9 @@ public class Constants */ public static final String SYS_DICT_KEY = "sys_dict:"; - /** - * 资源映射路径 前缀 - */ - public static final String RESOURCE_PREFIX = "/profile"; - /** * RMI 远程方法调用 */ public static final String LOOKUP_RMI = "rmi://"; - /** - * 资源映射路径 前缀 - */ - public static final String REDIS_LOCK_KEY = "redis_lock:"; } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java index 183c36405..072eef96a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java @@ -1,12 +1,8 @@ package com.ruoyi.framework.config; -import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; -import java.util.TimeZone; - /** * 程序注解配置 * @@ -16,11 +12,5 @@ import java.util.TimeZone; // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) public class ApplicationConfig { - /** - * 时区配置 - */ - @Bean - public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization() { - return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault()); - } + } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 373c9e96a..bd6ee8f36 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -104,8 +104,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter "/*.html", "/**/*.html", "/**/*.css", - "/**/*.js", - "/profile/**" + "/**/*.js" ).permitAll() .antMatchers("/doc.html").anonymous() .antMatchers("/swagger-resources/**").anonymous()