From 5945537ade04647d5c718dda2d3b5e6e3aab25d3 Mon Sep 17 00:00:00 2001 From: wuzh Date: Mon, 13 Jun 2022 21:34:59 +0800 Subject: [PATCH 01/11] =?UTF-8?q?WebSecurityConfigurerAdapter=20=E8=BF=87?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/config/WebSecurityConfigurer.java | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java index 0ba53647..71339d2a 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java +++ b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java @@ -1,9 +1,10 @@ package com.ruoyi.modules.monitor.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; -import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Bean; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; /** @@ -11,8 +12,8 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti * * @author ruoyi */ -@Configuration -public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter +@EnableWebSecurity +public class WebSecurityConfigurer { private final String adminContextPath; @@ -21,29 +22,30 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter this.adminContextPath = adminServerProperties.getContextPath(); } - @Override - protected void configure(HttpSecurity http) throws Exception + @Bean + public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler(); successHandler.setTargetUrlParameter("redirectTo"); successHandler.setDefaultTargetUrl(adminContextPath + "/"); - http - .headers().frameOptions().disable() - .and().authorizeRequests() - .antMatchers(adminContextPath + "/assets/**" - , adminContextPath + "/login" - , adminContextPath + "/actuator/**" - , adminContextPath + "/instances/**" - ).permitAll() - .anyRequest().authenticated() - .and() - .formLogin().loginPage(adminContextPath + "/login") - .successHandler(successHandler).and() - .logout().logoutUrl(adminContextPath + "/logout") - .and() - .httpBasic().and() - .csrf() - .disable(); + return httpSecurity + .headers().frameOptions().disable() + .and().authorizeRequests() + .antMatchers(adminContextPath + "/assets/**" + , adminContextPath + "/login" + , adminContextPath + "/actuator/**" + , adminContextPath + "/instances/**" + ).permitAll() + .anyRequest().authenticated() + .and() + .formLogin().loginPage(adminContextPath + "/login") + .successHandler(successHandler).and() + .logout().logoutUrl(adminContextPath + "/logout") + .and() + .httpBasic().and() + .csrf() + .disable() + .build(); } } From 1297d094cb5ee7305d151cd8b4a8a5659275ae97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=A1=E7=84=B6=E9=80=9D=E5=8E=BB?= Date: Thu, 16 Jun 2022 04:56:12 +0000 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20@Lazy=EF=BC=8C@AutoC?= =?UTF-8?q?onfigureBefore=E6=B3=A8=E8=A7=A3=E8=A7=A3=E5=86=B3=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E5=BC=95=E7=94=A8=E5=8F=8ABean=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=88=A0=E9=99=A4allow-bean-definit?= =?UTF-8?q?ion-overriding:=20true=EF=BC=8C=20allow-circular-references:=20?= =?UTF-8?q?true=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/redis/configure/RedisConfig.java | 1 + .../main/java/com/ruoyi/gateway/config/SwaggerProvider.java | 1 + ruoyi-gateway/src/main/resources/bootstrap.yml | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java index e0b96bee..793f6df9 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java @@ -15,6 +15,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; */ @Configuration @EnableCaching +@AutoConfigureBefore(RedisAutoConfiguration.class) public class RedisConfig extends CachingConfigurerSupport { @Bean diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java index 67f18b7d..81b8c314 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java @@ -27,6 +27,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu /** * 网关路由 */ + @Lazy @Autowired private RouteLocator routeLocator; diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 51502b55..5a955b4c 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -10,9 +10,6 @@ spring: profiles: # 环境配置 active: dev - main: - allow-circular-references: true - allow-bean-definition-overriding: true cloud: nacos: discovery: From 78c356a9f305405dc18f908ec863aba7c610a9fc Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 17 Jun 2022 20:52:41 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=882.0.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../main/java/com/ruoyi/common/redis/configure/RedisConfig.java | 2 ++ .../src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a99434e..8d41a947 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 2.11.0 1.4 2.3 - 2.0.4 + 2.0.7 0.9.1 8.2.2 4.1.2 diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java index 793f6df9..7363c8a4 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java @@ -1,5 +1,7 @@ package com.ruoyi.common.redis.configure; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java index 81b8c314..72667305 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java +++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java @@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.config.GatewayProperties; import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.support.NameUtils; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import org.springframework.web.reactive.config.ResourceHandlerRegistry; import org.springframework.web.reactive.config.WebFluxConfigurer; @@ -24,6 +25,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu * Swagger2默认的url后缀 */ public static final String SWAGGER2URL = "/v2/api-docs"; + /** * 网关路由 */ From 721701274b6b3010ec1096dcef68fec23b373453 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 17 Jun 2022 21:41:23 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=8D=87=E7=BA=A7seata=E5=88=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=881.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 8d41a947..5dccef0e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ 2021.0.1 2021.0.1.0 2.0.4 + 1.5.1 2.6.7 2.2.2 3.0.0 @@ -70,6 +71,13 @@ ${alibaba.nacos.version} + + + io.seata + seata-spring-boot-starter + ${alibaba.seata.version} + + org.springframework.boot From 5964dc81ab5fbe2c57570b03bbd87bf71ece10ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 24 Jun 2022 04:54:54 +0000 Subject: [PATCH 05/11] =?UTF-8?q?remove=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=20admin-client=20=E4=BE=9D=E8=B5=96=E5=A3=B0=E6=98=8E?= =?UTF-8?q?=20=E9=81=BF=E5=85=8D=E9=80=A0=E6=88=90=E8=AF=AF=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index 5dccef0e..a80b5840 100644 --- a/pom.xml +++ b/pom.xml @@ -87,13 +87,6 @@ import - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - com.github.tobato From a573c4b10df2417bcd0cbca0eac2f3f1d8eb5b32 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 26 Jun 2022 13:13:20 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E7=9A=84mapper=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java index 4b93bc88..3a172a52 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java @@ -1,7 +1,6 @@ package com.ruoyi.system.mapper; import java.util.List; -import org.apache.ibatis.annotations.Mapper; import com.ruoyi.system.api.domain.SysDictType; /** @@ -9,7 +8,6 @@ import com.ruoyi.system.api.domain.SysDictType; * * @author ruoyi */ -@Mapper public interface SysDictTypeMapper { /** From 95aa34380569b91fa71bc716fbfebc7f02b5c2ae Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 26 Jun 2022 13:15:17 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE=E6=A0=B7=E5=BC=8F=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E6=98=BE=E7=A4=BA=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/system/dict/data.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue index 1d0be70a..a68a6012 100644 --- a/ruoyi-ui/src/views/system/dict/data.vue +++ b/ruoyi-ui/src/views/system/dict/data.vue @@ -163,7 +163,7 @@ From 20476e9dd17bbfbcd0ea0cdff61f6b341a7d338f Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 26 Jun 2022 13:15:28 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8D=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E5=8E=8B=E7=BC=A9=E6=96=87=E4=BB=B6=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E9=98=B2=E6=AD=A2node=5Fmodules=E8=BF=87=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/vue.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 1a9e913d..2506c93a 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -61,6 +61,7 @@ module.exports = { plugins: [ // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 new CompressionPlugin({ + cache: false, // 不启用文件缓存 test: /\.(js|css|html)?$/i, // 压缩文件格式 filename: '[path].gz[query]', // 压缩后的文件名 algorithm: 'gzip', // 使用gzip压缩 From 57e63a184d4539d112884b8fe2b76090141019e0 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 26 Jun 2022 13:15:38 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=882.0.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a80b5840..42d81103 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 2.11.0 1.4 2.3 - 2.0.7 + 2.0.8 0.9.1 8.2.2 4.1.2 From 1e16852a3cca98348228c1e396762c698a7e6673 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 26 Jun 2022 13:47:58 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-boot=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC2.6.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 42d81103..5ee00077 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ UTF-8 UTF-8 1.8 - 2.6.7 + 2.6.8 2021.0.1 2021.0.1.0 2.0.4 From 0d58ecb09c94f47b6d81c6f882f65c99dfad877c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Sun, 3 Jul 2022 04:22:19 +0000 Subject: [PATCH 11/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/core/utils/poi/ExcelUtil.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java index 25fd5b22..cb1f7dce 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java @@ -386,12 +386,6 @@ public class ExcelUtil exportExcel(response); } - /** - * 对list数据源将其里面的数据导入到excel表单 - * - * @param sheetName 工作表的名称 - * @return 结果 - */ /** * 对list数据源将其里面的数据导入到excel表单 *