From 266ebd912209d8315baf4fd30766b02208ad6578 Mon Sep 17 00:00:00 2001 From: EightMonth Date: Tue, 19 Mar 2024 09:41:29 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20#5901?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jeecg/modules/message/enums/RangeDateEnum.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/enums/RangeDateEnum.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/enums/RangeDateEnum.java index 4e6ed84e..c5df7a2b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/enums/RangeDateEnum.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/enums/RangeDateEnum.java @@ -79,6 +79,7 @@ public enum RangeDateEnum { //本周 calendar1.set(Calendar.DAY_OF_WEEK, 2); + calendar2.set(Calendar.DAY_OF_WEEK,2); calendar2.add(Calendar.WEEK_OF_MONTH,1); calendar2.add(Calendar.DAY_OF_WEEK,-1); } else if(SZ.key.equals(key)){ From 0ca4badb77ace535e526c923981f131d29889bca Mon Sep 17 00:00:00 2001 From: EightMonth Date: Fri, 22 Mar 2024 16:37:00 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20#6021?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 509614c9..37966725 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -16,18 +16,18 @@ import org.jeecg.common.util.oConvertUtils; import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.shiro.filters.CustomShiroFilterFactoryBean; import org.jeecg.config.shiro.filters.JwtFilter; -import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; import org.springframework.core.env.Environment; +import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; -import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @@ -39,7 +39,6 @@ import javax.annotation.Resource; import javax.servlet.DispatcherType; import javax.servlet.Filter; import java.lang.reflect.Method; -import java.time.Duration; import java.util.*; /** @@ -60,9 +59,6 @@ public class ShiroConfig { private JeecgBaseConfig jeecgBaseConfig; @Autowired(required = false) private RedisProperties redisProperties; - - @Autowired - private ApplicationContext ctx; /** * Filter Chain定义说明 * @@ -178,7 +174,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/WW_verify*", "anon"); // 通过注解免登录url - List ignoreAuthUrlList = collectIgnoreAuthUrl(ctx); + List ignoreAuthUrlList = collectIgnoreAuthUrl(); if (!CollectionUtils.isEmpty(ignoreAuthUrlList)) { for (String url : ignoreAuthUrlList) { filterChainDefinitionMap.put(url, "anon"); @@ -339,20 +335,22 @@ public class ShiroConfig { @SneakyThrows - public List collectIgnoreAuthUrl(ApplicationContext context) { + public List collectIgnoreAuthUrl() { List ignoreAuthUrls = new ArrayList<>(); - Map controllers = context.getBeansWithAnnotation(RestController.class); - for (Object bean : controllers.values()) { - if (!(bean instanceof Advised)) { - continue; - } - Class beanClass = ((Advised) bean).getTargetSource().getTarget().getClass(); - RequestMapping base = beanClass.getAnnotation(RequestMapping.class); + ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false); + provider.addIncludeFilter(new AnnotationTypeFilter(RestController.class)); + + String basePackage = "org.jeecg"; // 替换为你的包路径 + Set components = provider.findCandidateComponents(basePackage); + for (BeanDefinition component : components) { + String beanClassName = component.getBeanClassName(); + Class clazz = Class.forName(beanClassName); + RequestMapping base = clazz.getAnnotation(RequestMapping.class); String[] baseUrl = {}; if (Objects.nonNull(base)) { baseUrl = base.value(); } - Method[] methods = beanClass.getDeclaredMethods(); + Method[] methods = clazz.getDeclaredMethods(); for (Method method : methods) { if (method.isAnnotationPresent(IgnoreAuth.class) && method.isAnnotationPresent(RequestMapping.class)) { From c8676b3040adb27d5fddf75191fe31d1855f8312 Mon Sep 17 00:00:00 2001 From: EightMonth Date: Fri, 22 Mar 2024 17:11:18 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E7=94=9F=E6=95=88=E8=8C=83=E5=9B=B4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 37966725..76cd0cdd 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -21,10 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.DependsOn; +import org.springframework.context.annotation.*; +import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.env.Environment; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; @@ -49,6 +47,8 @@ import java.util.*; @Slf4j @Configuration +// 免认证注解 @IgnoreAuth 注解生效范围配置 +@ComponentScan(basePackages = {"org.jeecg"}) public class ShiroConfig { @Resource @@ -340,8 +340,13 @@ public class ShiroConfig { ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(false); provider.addIncludeFilter(new AnnotationTypeFilter(RestController.class)); - String basePackage = "org.jeecg"; // 替换为你的包路径 - Set components = provider.findCandidateComponents(basePackage); + // 获取当前类的扫描注解的配置 + Set components = new HashSet<>(); + for (String basePackage : AnnotationUtils.getAnnotation(ShiroConfig.class, ComponentScan.class).basePackages()) { + components.addAll(provider.findCandidateComponents(basePackage)); + } + + // 逐个匹配获取免认证路径 for (BeanDefinition component : components) { String beanClassName = component.getBeanClassName(); Class clazz = Class.forName(beanClassName); From e3e1cd6b0d2e1d8046ebf12a00213d8d5db84f09 Mon Sep 17 00:00:00 2001 From: EightMonth Date: Mon, 25 Mar 2024 16:27:53 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20#5936?= 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 90d46a27..35910f82 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 3.5.3.1 4.1.3 - 1.2.19 + 1.2.22 1.9.6 From 6edef14f07aac58430451652f576ecdc41d77ed1 Mon Sep 17 00:00:00 2001 From: EightMonth Date: Wed, 3 Apr 2024 11:18:47 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20#6070?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/test/mapper/xml/JeecgDemoMapper.xml | 5 +- .../system/mapper/xml/SysDepartMapper.xml | 8 +-- .../system/mapper/xml/SysDictMapper.xml | 60 +++++++++---------- .../system/mapper/xml/SysPermissionMapper.xml | 19 +++--- .../system/mapper/xml/SysRoleMapper.xml | 19 +++--- 5 files changed, 57 insertions(+), 54 deletions(-) diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml index 95d5da9a..572db925 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml @@ -9,7 +9,10 @@ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml index 597d677a..b0b83ae3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml @@ -161,11 +161,6 @@ \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml index ae0c60ae..95165367 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml @@ -127,41 +127,41 @@ ${pidField} as parentId from ${table} - where - - - - - ${pidField} = #{pid} - - - (${pidField} = '' OR ${pidField} IS NULL) - - - - - - 1 = 1 - + + + - - and tenant_id = #{value} + + ${pidField} = #{pid} - and ${key} LIKE #{value} + (${pidField} = '' OR ${pidField} IS NULL) - - - - - and ${pidField} = #{pid} - - - and (${pidField} = '' OR ${pidField} IS NULL) - - - + + + + + + + and tenant_id = #{value} + + + and ${key} LIKE #{value} + + + + + + + and ${pidField} = #{pid} + + + and (${pidField} = '' OR ${pidField} IS NULL) + + + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml index 104d79a9..29a52b71 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml @@ -28,15 +28,16 @@ ,icon ,is_leaf FROM sys_permission - WHERE 1=1 - - - AND parent_id = #{parentId,jdbcType=VARCHAR} - - - AND parent_id is null - - + + + + AND parent_id = #{parentId,jdbcType=VARCHAR} + + + AND parent_id is null + + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml index fe909824..ec02bfc8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml @@ -4,15 +4,16 @@ From eed3bc346d1967d73fdd506d2399d152396c46d8 Mon Sep 17 00:00:00 2001 From: EightMonth Date: Wed, 3 Apr 2024 16:01:39 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8D=87=E7=BA=A7druid?= =?UTF-8?q?=201.2.22=E7=89=88=E6=9C=AC=E5=85=BC=E5=AE=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg-system-start/src/main/resources/application-dev.yml | 2 +- .../jeecg-system-start/src/main/resources/application-prod.yml | 2 +- .../jeecg-system-start/src/main/resources/application-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 3acf0b05..f6952ebd 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -151,7 +151,7 @@ spring: poolPreparedStatements: true maxPoolPreparedStatementPerConnectionSize: 20 # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 - filters: stat,wall,slf4j + filters: stat,slf4j # 打开mergeSql功能；慢SQL记录 stat: merge-sql: true diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 0003ed03..8faf8dd9 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -151,7 +151,7 @@ spring: poolPreparedStatements: true maxPoolPreparedStatementPerConnectionSize: 20 # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 - filters: stat,wall,slf4j + filters: stat,slf4j # 打开mergeSql功能；慢SQL记录 stat: merge-sql: true diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml index 29970031..8185c520 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml @@ -151,7 +151,7 @@ spring: poolPreparedStatements: true maxPoolPreparedStatementPerConnectionSize: 20 # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 - filters: stat,wall,slf4j + filters: stat,slf4j # 打开mergeSql功能；慢SQL记录 stat: merge-sql: true From c9b92decaf41f572b1e6b8c6b7558ab88af00fb0 Mon Sep 17 00:00:00 2001 From: EightMonth Date: Wed, 3 Apr 2024 16:04:23 +0800 Subject: [PATCH 07/11] =?UTF-8?q?Revert=20"=E5=A4=84=E7=90=86=E5=8D=87?= =?UTF-8?q?=E7=BA=A7druid=201.2.22=E7=89=88=E6=9C=AC=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E5=A4=84=E7=90=86"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit eed3bc346d1967d73fdd506d2399d152396c46d8. --- .../jeecg-system-start/src/main/resources/application-dev.yml | 2 +- .../jeecg-system-start/src/main/resources/application-prod.yml | 2 +- .../jeecg-system-start/src/main/resources/application-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index f6952ebd..3acf0b05 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -151,7 +151,7 @@ spring: poolPreparedStatements: true maxPoolPreparedStatementPerConnectionSize: 20 # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 - filters: stat,slf4j + filters: stat,wall,slf4j # 打开mergeSql功能；慢SQL记录 stat: merge-sql: true diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml index 8faf8dd9..0003ed03 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml @@ -151,7 +151,7 @@ spring: poolPreparedStatements: true maxPoolPreparedStatementPerConnectionSize: 20 # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 - filters: stat,slf4j + filters: stat,wall,slf4j # 打开mergeSql功能；慢SQL记录 stat: merge-sql: true diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml index 8185c520..29970031 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml @@ -151,7 +151,7 @@ spring: poolPreparedStatements: true maxPoolPreparedStatementPerConnectionSize: 20 # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 - filters: stat,slf4j + filters: stat,wall,slf4j # 打开mergeSql功能；慢SQL记录 stat: merge-sql: true From ee4ff35c90cb8cfe256a58679407efa3a94fbaab Mon Sep 17 00:00:00 2001 From: EightMonth Date: Wed, 3 Apr 2024 16:04:29 +0800 Subject: [PATCH 08/11] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D=20#6070"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6edef14f07aac58430451652f576ecdc41d77ed1. --- .../demo/test/mapper/xml/JeecgDemoMapper.xml | 5 +- .../system/mapper/xml/SysDepartMapper.xml | 8 ++- .../system/mapper/xml/SysDictMapper.xml | 60 +++++++++---------- .../system/mapper/xml/SysPermissionMapper.xml | 19 +++--- .../system/mapper/xml/SysRoleMapper.xml | 19 +++--- 5 files changed, 54 insertions(+), 57 deletions(-) diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml index 572db925..95d5da9a 100644 --- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml +++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml @@ -9,10 +9,7 @@ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml index b0b83ae3..597d677a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml @@ -161,6 +161,11 @@ \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml index 95165367..ae0c60ae 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml @@ -127,41 +127,41 @@ ${pidField} as parentId from ${table} - - - + where + + + + + ${pidField} = #{pid} + + + (${pidField} = '' OR ${pidField} IS NULL) + + + + + + 1 = 1 + - - ${pidField} = #{pid} + + and tenant_id = #{value} - (${pidField} = '' OR ${pidField} IS NULL) + and ${key} LIKE #{value} - - - - - - - and tenant_id = #{value} - - - and ${key} LIKE #{value} - - - - - - - and ${pidField} = #{pid} - - - and (${pidField} = '' OR ${pidField} IS NULL) - - - - + + + + + and ${pidField} = #{pid} + + + and (${pidField} = '' OR ${pidField} IS NULL) + + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml index 29a52b71..104d79a9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml @@ -28,16 +28,15 @@ ,icon ,is_leaf FROM sys_permission - - - - AND parent_id = #{parentId,jdbcType=VARCHAR} - - - AND parent_id is null - - - + WHERE 1=1 + + + AND parent_id = #{parentId,jdbcType=VARCHAR} + + + AND parent_id is null + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml index ec02bfc8..fe909824 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml @@ -4,16 +4,15 @@ From 4fed40ff7d2701370268df24d04ee9845908103f Mon Sep 17 00:00:00 2001 From: EightMonth <1099139462@qq.com> Date: Wed, 3 Apr 2024 16:06:04 +0800 Subject: [PATCH 09/11] Update pom.xml --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0dad6ad2..26aca9b8 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,6 @@ 1.2.22 1.9.10 - 1.7.4 2.11.0 @@ -566,4 +565,4 @@ - \ No newline at end of file + From 7e71fa26d700c9799012b9a475e99add6bb90343 Mon Sep 17 00:00:00 2001 From: EightMonth Date: Mon, 8 Apr 2024 13:11:55 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=8D=87=E7=BA=A7druid=20v1.2.22?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=85=BC=E5=AE=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/WallConfigRegister.java | 47 +++++++++++++++++++ .../main/resources/META-INF/spring.factories | 2 + 2 files changed, 49 insertions(+) create mode 100644 jeecg-boot-base-core/src/main/java/org/jeecg/config/WallConfigRegister.java create mode 100644 jeecg-boot-base-core/src/main/resources/META-INF/spring.factories diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/WallConfigRegister.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/WallConfigRegister.java new file mode 100644 index 00000000..e165b59b --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/WallConfigRegister.java @@ -0,0 +1,47 @@ +package org.jeecg.config; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.SpringApplicationRunListener; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.MutablePropertySources; +import org.springframework.core.env.PropertySource; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author eightmonth@qq.com + * @date 2024/4/8 11:37 + */ +public class WallConfigRegister implements SpringApplicationRunListener { + + public SpringApplication application; + + private String[] args; + + + /** + * 必备，否则启动报错 + * @param application + * @param args + */ + public WallConfigRegister(SpringApplication application, String[] args) { + this.application = application; + this.args = args; + } + + @Override + public void contextLoaded(ConfigurableApplicationContext context) { + ConfigurableEnvironment env = context.getEnvironment(); + Map props = new HashMap<>(); + props.put("spring.datasource.dynamic.druid.wall.selectWhereAlwayTrueCheck", false); + + MutablePropertySources propertySources = env.getPropertySources(); + + PropertySource> propertySource = new MapPropertySource("jeecg-datasource-config", props); + + propertySources.addLast(propertySource); + } +} \ No newline at end of file diff --git a/jeecg-boot-base-core/src/main/resources/META-INF/spring.factories b/jeecg-boot-base-core/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..5f73e208 --- /dev/null +++ b/jeecg-boot-base-core/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.SpringApplicationRunListener=\ +org.jeecg.config.WallConfigRegister \ No newline at end of file From b69a716b04ed0533f24ed36fccb0f44bfac69bc7 Mon Sep 17 00:00:00 2001 From: EightMonth Date: Mon, 8 Apr 2024 13:45:27 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9druid=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=B1=BB=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{WallConfigRegister.java => DruidWallConfigRegister.java} | 4 ++-- .../src/main/resources/META-INF/spring.factories | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename jeecg-boot-base-core/src/main/java/org/jeecg/config/{WallConfigRegister.java => DruidWallConfigRegister.java} (89%) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/WallConfigRegister.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java similarity index 89% rename from jeecg-boot-base-core/src/main/java/org/jeecg/config/WallConfigRegister.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java index e165b59b..049d4210 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/WallConfigRegister.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidWallConfigRegister.java @@ -15,7 +15,7 @@ import java.util.Map; * @author eightmonth@qq.com * @date 2024/4/8 11:37 */ -public class WallConfigRegister implements SpringApplicationRunListener { +public class DruidWallConfigRegister implements SpringApplicationRunListener { public SpringApplication application; @@ -27,7 +27,7 @@ public class WallConfigRegister implements SpringApplicationRunListener { * @param application * @param args */ - public WallConfigRegister(SpringApplication application, String[] args) { + public DruidWallConfigRegister(SpringApplication application, String[] args) { this.application = application; this.args = args; } diff --git a/jeecg-boot-base-core/src/main/resources/META-INF/spring.factories b/jeecg-boot-base-core/src/main/resources/META-INF/spring.factories index 5f73e208..8ba71de9 100644 --- a/jeecg-boot-base-core/src/main/resources/META-INF/spring.factories +++ b/jeecg-boot-base-core/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.SpringApplicationRunListener=\ -org.jeecg.config.WallConfigRegister \ No newline at end of file +org.jeecg.config.DruidWallConfigRegister \ No newline at end of file