diff --git a/bonus-api/bonus-api-system/pom.xml b/bonus-api/bonus-api-system/pom.xml
index 81c0b39..5227615 100644
--- a/bonus-api/bonus-api-system/pom.xml
+++ b/bonus-api/bonus-api-system/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-api
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-api/pom.xml b/bonus-api/pom.xml
index 365407b..03daccb 100644
--- a/bonus-api/pom.xml
+++ b/bonus-api/pom.xml
@@ -4,7 +4,7 @@
com.bonus
bonus
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-auth/pom.xml b/bonus-auth/pom.xml
index 6763349..962bbf1 100644
--- a/bonus-auth/pom.xml
+++ b/bonus-auth/pom.xml
@@ -4,7 +4,7 @@
com.bonus
bonus
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
@@ -87,7 +87,7 @@
com.bonus
bonus-common-config
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
compile
diff --git a/bonus-common/bonus-common-config/pom.xml b/bonus-common/bonus-common-config/pom.xml
index 0470e37..1857295 100644
--- a/bonus-common/bonus-common-config/pom.xml
+++ b/bonus-common/bonus-common-config/pom.xml
@@ -4,7 +4,7 @@
com.bonus
bonus-common
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-common/bonus-common-core/pom.xml b/bonus-common/bonus-common-core/pom.xml
index 1b5b562..9e3b46f 100644
--- a/bonus-common/bonus-common-core/pom.xml
+++ b/bonus-common/bonus-common-core/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-common
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-common/bonus-common-datascope/pom.xml b/bonus-common/bonus-common-datascope/pom.xml
index 97d4a4d..c7c623a 100644
--- a/bonus-common/bonus-common-datascope/pom.xml
+++ b/bonus-common/bonus-common-datascope/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-common
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-common/bonus-common-datasource/pom.xml b/bonus-common/bonus-common-datasource/pom.xml
index a3cb2da..84dc2e5 100644
--- a/bonus-common/bonus-common-datasource/pom.xml
+++ b/bonus-common/bonus-common-datasource/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-common
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-common/bonus-common-log/pom.xml b/bonus-common/bonus-common-log/pom.xml
index b7c52d5..278f03b 100644
--- a/bonus-common/bonus-common-log/pom.xml
+++ b/bonus-common/bonus-common-log/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-common
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-common/bonus-common-redis/pom.xml b/bonus-common/bonus-common-redis/pom.xml
index a6164e6..897b8bb 100644
--- a/bonus-common/bonus-common-redis/pom.xml
+++ b/bonus-common/bonus-common-redis/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-common
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-common/bonus-common-seata/pom.xml b/bonus-common/bonus-common-seata/pom.xml
index 77e5dd4..db431fb 100644
--- a/bonus-common/bonus-common-seata/pom.xml
+++ b/bonus-common/bonus-common-seata/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-common
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-common/bonus-common-security/pom.xml b/bonus-common/bonus-common-security/pom.xml
index efea511..76e3879 100644
--- a/bonus-common/bonus-common-security/pom.xml
+++ b/bonus-common/bonus-common-security/pom.xml
@@ -4,7 +4,7 @@
com.bonus
bonus-common
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/config/WebMvcConfig.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/config/WebMvcConfig.java
index 2a4cc56..c82ea59 100644
--- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/config/WebMvcConfig.java
+++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/config/WebMvcConfig.java
@@ -1,6 +1,7 @@
package com.bonus.common.security.config;
//import com.bonus.common.security.interceptor.ParamSecureHandler;
+import com.bonus.common.security.interceptor.ParamSecureHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -23,11 +24,12 @@ public class WebMvcConfig implements WebMvcConfigurer
.addPathPatterns("/**")
.excludePathPatterns(EXCLUDEURLS)
.order(-10);
-// //自定义拦截器
-// registry.addInterceptor(getParamSecureInterceptor())
-// .addPathPatterns("/**")
-// .excludePathPatterns(EXCLUDEURLS)
-// .order(-10);
+ //自定义拦截器
+ registry.addInterceptor(getParamSecureInterceptor())
+ .addPathPatterns("/**")
+ .excludePathPatterns(EXCLUDEURLS)
+ .order(-10);
+
}
/**
@@ -42,9 +44,9 @@ public class WebMvcConfig implements WebMvcConfigurer
/**
* 自定义参数拦截器
*/
-// public ParamSecureHandler getParamSecureInterceptor()
-// {
-// return new ParamSecureHandler();
-// }
+ public ParamSecureHandler getParamSecureInterceptor()
+ {
+ return new ParamSecureHandler();
+ }
}
diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/ParamSecureHandler.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/ParamSecureHandler.java
index 660df27..09b4a3d 100644
--- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/ParamSecureHandler.java
+++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/ParamSecureHandler.java
@@ -19,14 +19,13 @@ import static org.springframework.http.MediaType.MULTIPART_FORM_DATA_VALUE;
/**
* @author bonus
* @data 2023/2/6 17:22
- * @description 安全参数验证,暂时弃用
+ * @description 安全参数验证
*/
@Slf4j
public class ParamSecureHandler implements AsyncHandlerInterceptor {
- private static String OPERLOG_URL = "/operlog/addLogs";
- private static final String REGISTER = "/user/register";
- private static final String RECOGNITION = "/ocr/recognition";
+ private static final String [] WHITE_URL = {
+ "/login", "/isAdmin", "/isLogin", "/register","/operlog/addLogs"};
private String rnd = null;
public static String ur = "/";
@@ -55,13 +54,7 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
XssRequestWrapper requestWrapper = new XssRequestWrapper(request);
String requestUrl = requestWrapper.getRequestURI();
- if (OPERLOG_URL.equals(requestUrl)) {
- return true;
- }
- if (REGISTER.equals(requestUrl)) {
- return true;
- }
- if (RECOGNITION.equals(requestUrl)) {
+ if (isWhiteUrl(requestUrl)){
return true;
}
/**
@@ -87,7 +80,7 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
*/
String readerParam = requestWrapper.getReaderParam();
// 判断是否是文件上传,是不对流参数进行验证
- String uplFile = "uploadFile", upImage = "uploadImage";
+ String uplFile = "/upload", upImage = "/uploadFiles";
if (!requestUrl.contains(uplFile) && !requestUrl.contains(upImage)) {
boolean checkReader = checkReader(readerParam, requestUrl);
if (!checkReader) {
@@ -233,4 +226,8 @@ public class ParamSecureHandler implements AsyncHandlerInterceptor {
throws Exception {
SecurityContextHolder.remove();
}
+
+ private boolean isWhiteUrl(String requestUrl) {
+ return Arrays.asList(WHITE_URL).contains(requestUrl);
+ }
}
diff --git a/bonus-common/bonus-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bonus-common/bonus-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index b5c4610..3a220a6 100644
--- a/bonus-common/bonus-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/bonus-common/bonus-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,4 +1,4 @@
-#com.bonus.common.security.config.MyFilter
+com.bonus.common.security.config.MyFilter
com.bonus.common.security.config.WebMvcConfig
com.bonus.common.security.config.VerificationCodeConfig
com.bonus.common.security.service.TokenService
diff --git a/bonus-common/bonus-common-sensitive/pom.xml b/bonus-common/bonus-common-sensitive/pom.xml
index ad1a2bc..a9cbe44 100644
--- a/bonus-common/bonus-common-sensitive/pom.xml
+++ b/bonus-common/bonus-common-sensitive/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-common
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-common/bonus-common-swagger/pom.xml b/bonus-common/bonus-common-swagger/pom.xml
index 28c076c..aee2193 100644
--- a/bonus-common/bonus-common-swagger/pom.xml
+++ b/bonus-common/bonus-common-swagger/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-common
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-common/pom.xml b/bonus-common/pom.xml
index 8647bf4..f6f0f93 100644
--- a/bonus-common/pom.xml
+++ b/bonus-common/pom.xml
@@ -4,7 +4,7 @@
com.bonus
bonus
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-gateway/pom.xml b/bonus-gateway/pom.xml
index 29bd819..b1d8e47 100644
--- a/bonus-gateway/pom.xml
+++ b/bonus-gateway/pom.xml
@@ -4,7 +4,7 @@
com.bonus
bonus
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/config/CaptchaConfig.java b/bonus-gateway/src/main/java/com/bonus/gateway/config/CaptchaConfig.java
index 77e3291..9655c49 100644
--- a/bonus-gateway/src/main/java/com/bonus/gateway/config/CaptchaConfig.java
+++ b/bonus-gateway/src/main/java/com/bonus/gateway/config/CaptchaConfig.java
@@ -29,15 +29,15 @@ public class CaptchaConfig
// 验证码图片高度 默认为50
properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60");
// 验证码文本字符大小 默认为40
- properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38");
+ properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "40");
// KAPTCHA_SESSION_KEY
properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode");
// 验证码文本字符长度 默认为5
- properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4");
+ properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "6");
// 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
// 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy
- properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
+// properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
Config config = new Config(properties);
defaultKaptcha.setConfig(config);
return defaultKaptcha;
diff --git a/bonus-modules/bonus-file/pom.xml b/bonus-modules/bonus-file/pom.xml
index 5f7f0e1..51e3bcc 100644
--- a/bonus-modules/bonus-file/pom.xml
+++ b/bonus-modules/bonus-file/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-modules
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-modules/bonus-gen/pom.xml b/bonus-modules/bonus-gen/pom.xml
index d0880a7..03aad6c 100644
--- a/bonus-modules/bonus-gen/pom.xml
+++ b/bonus-modules/bonus-gen/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-modules
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-modules/bonus-job/pom.xml b/bonus-modules/bonus-job/pom.xml
index 1f156ac..980fa1e 100644
--- a/bonus-modules/bonus-job/pom.xml
+++ b/bonus-modules/bonus-job/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-modules
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-modules/bonus-system/pom.xml b/bonus-modules/bonus-system/pom.xml
index d8ec278..d72598e 100644
--- a/bonus-modules/bonus-system/pom.xml
+++ b/bonus-modules/bonus-system/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-modules
- 24.10.0-SNAPSHOT
+ 24.11.0-SNAPSHOT
4.0.0
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
index 4b17086..d447006 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
@@ -3,6 +3,7 @@ package com.bonus.system.service.impl;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
import com.bonus.common.core.web.domain.BaseEntity;
@@ -86,9 +87,23 @@ public class SysDeptServiceImpl implements ISysDeptService
public List selectDeptUserTree(SysUser sysUser)
{
List depts = deptMapper.selectDeptUserList(sysUser.getRoleIds());
+ for (int i = 0; i < 5; i++) {
+ depts = getFilterDepts(depts);
+ }
return buildDeptTreeSelect(depts);
}
+ private static List getFilterDepts(List depts) {
+ List newDepts = new ArrayList<>();
+ Set pids = depts.stream().map(SysDept::getParentId).collect(Collectors.toSet());
+ for (SysDept sysDept : depts) {
+ if (sysDept.getLevel().equals(99) || pids.contains(sysDept.getDeptId())) {
+ newDepts.add(sysDept);
+ }
+ }
+ return newDepts;
+ }
+
/**
* 构建前端所需要树结构
*
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogMapper.xml
index c235186..d280526 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysLogMapper.xml
@@ -182,7 +182,7 @@
SELECT
round(((data_length + index_length) / 1024 / 1024), 2) AS 'Size in MB'
FROM information_schema.TABLES
- WHERE table_schema = 'jj_zhgd' AND table_name = 'sys_logs'
+ WHERE table_schema = 'bns-cloud' AND table_name = 'sys_logs'