Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev

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:

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:

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:";
 }

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());
-    }
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -104,8 +104,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                         "/*.html",
                         "/**/*.html",
                         "/**/*.css",
-                        "/**/*.js",
+                        "/**/*.js"
-                        "/profile/**"
                 ).permitAll()
                 .antMatchers("/doc.html").anonymous()
                 .antMatchers("/swagger-resources/**").anonymous()