diff --git a/jeecg-boot-base-core/pom.xml b/jeecg-boot-base-core/pom.xml index a95b7636..b8bb6cbd 100644 --- a/jeecg-boot-base-core/pom.xml +++ b/jeecg-boot-base-core/pom.xml @@ -53,6 +53,16 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow @@ -189,9 +199,14 @@ checkstyle com.puppycrawl.tools + + + jedis + redis.clients + - + redis.clients jedis @@ -252,7 +267,7 @@ - org.jeecgframework + org.jeecgframework.boot3 autopoi-web ${autopoi-web.version} diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java index 6366ee2d..ba2e071d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java @@ -413,7 +413,7 @@ public class oConvertUtils { return false; } - String[] childs = childArray.toArray(new String[]{}); + String[] childs = (String[]) childArray.toArray(); for (String v : childs) { if (!isIn(v, all)) { return false; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java index 1ab523f4..64a9d7b8 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java @@ -1,5 +1,6 @@ package org.jeecg.config; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Paths; @@ -15,10 +16,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -/** - * @author kezhijie@wuhandsj.com - * @date 2023/11/2 14:19 - */ @Configuration public class Swagger3Config implements WebMvcConfigurer { /** @@ -39,6 +36,10 @@ public class Swagger3Config implements WebMvcConfigurer { return GroupedOpenApi.builder() .group("default") .packagesToScan("org.jeecg") + // 剔除以下几个包路径的接口生成文档 + .packagesToExclude("org.jeecg.modules.drag", "org.jeecg.modules.online", "org.jeecg.modules.jmreport") + // 加了Operation注解的方法，才生成接口文档 + .addOpenApiMethodFilter(method -> method.isAnnotationPresent(Operation.class)) .build(); } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java new file mode 100644 index 00000000..afc484b9 --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/UndertowCustomizer.java @@ -0,0 +1,19 @@ +package org.jeecg.config; + +import io.undertow.server.DefaultByteBufferPool; +import io.undertow.websockets.jsr.WebSocketDeploymentInfo; +import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; +import org.springframework.boot.web.server.WebServerFactoryCustomizer; +import org.springframework.stereotype.Component; + +@Component +public class UndertowCustomizer implements WebServerFactoryCustomizer { + @Override + public void customize(UndertowServletWebServerFactory factory) { + factory.addDeploymentInfoCustomizers(deploymentInfo -> { + WebSocketDeploymentInfo webSocketDeploymentInfo = new WebSocketDeploymentInfo(); + webSocketDeploymentInfo.setBuffers(new DefaultByteBufferPool(false, 1024)); + deploymentInfo.addServletContextAttribute("io.undertow.websockets.jsr.WebSocketDeploymentInfo", webSocketDeploymentInfo); + }); + } +} diff --git a/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-module-system/jeecg-system-biz/pom.xml index eefa107d..cc184e74 100644 --- a/jeecg-module-system/jeecg-system-biz/pom.xml +++ b/jeecg-module-system/jeecg-system-biz/pom.xml @@ -32,18 +32,18 @@ org.jeecgframework.jimureport - jimureport-spring-boot3-starter + jimureport-spring-boot3-starter-fastjson2 org.jeecgframework.boot3 drag-free 1.0.2 - + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/TomcatFactoryConfig.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/TomcatFactoryConfig.java index ac4d2a5b..4406122d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/TomcatFactoryConfig.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/init/TomcatFactoryConfig.java @@ -1,33 +1,33 @@ -package org.jeecg.config.init; - -import org.apache.catalina.Context; -import org.apache.tomcat.util.scan.StandardJarScanner; -import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @Description: TomcatFactoryConfig - * @author: scott - * @date: 2021年01月25日 11:40 - */ -@Configuration -public class TomcatFactoryConfig { - /** - * tomcat-embed-jasper引用后提示jar找不到的问题 - */ - @Bean - public TomcatServletWebServerFactory tomcatFactory() { - TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory() { - @Override - protected void postProcessContext(Context context) { - ((StandardJarScanner) context.getJarScanner()).setScanManifest(false); - } - }; - factory.addConnectorCustomizers(connector -> { - connector.setProperty("relaxedPathChars", "[]{}"); - connector.setProperty("relaxedQueryChars", "[]{}"); - }); - return factory; - } -} +//package org.jeecg.config.init; +// +//import org.apache.catalina.Context; +//import org.apache.tomcat.util.scan.StandardJarScanner; +//import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +// +///** +// * @Description: TomcatFactoryConfig +// * @author: scott +// * @date: 2021年01月25日 11:40 +// */ +//@Configuration +//public class TomcatFactoryConfig { +// /** +// * tomcat-embed-jasper引用后提示jar找不到的问题 +// */ +// @Bean +// public TomcatServletWebServerFactory tomcatFactory() { +// TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory() { +// @Override +// protected void postProcessContext(Context context) { +// ((StandardJarScanner) context.getJarScanner()).setScanManifest(false); +// } +// }; +// factory.addConnectorCustomizers(connector -> { +// connector.setProperty("relaxedPathChars", "[]{}"); +// connector.setProperty("relaxedQueryChars", "[]{}"); +// }); +// return factory; +// } +//} 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 f2c2746c..52902e45 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 @@ -1,7 +1,12 @@ server: port: 8080 - tomcat: - max-swallow-size: -1 + undertow: + # 平替 tomcat server.tomcat.max-swallow-siz， undertow该值默认为-1 + # max-http-post-size: 10MB + worker-threads: 16 # 4核CPU标准配置 + buffers: + websocket: 8192 # WebSocket缓冲 以字节为单位，这里设置为8 KB + io: 16384 # IO操作缓冲 以字节为单位，这里设置为16 KB error: include-exception: true include-stacktrace: ALWAYS 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 092e517a..ea078924 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 @@ -1,7 +1,12 @@ server: port: 8080 - tomcat: - max-swallow-size: -1 + undertow: + # 平替 tomcat server.tomcat.max-swallow-siz， undertow该值默认为-1 + # max-http-post-size: 10MB + worker-threads: 16 # 4核CPU标准配置 + buffers: + websocket: 8192 # WebSocket缓冲 以字节为单位，这里设置为8 KB + io: 16384 # IO操作缓冲 以字节为单位，这里设置为16 KB error: include-exception: true include-stacktrace: ALWAYS 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 2264061a..5233441b 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 @@ -1,7 +1,12 @@ server: port: 8080 - tomcat: - max-swallow-size: -1 + undertow: + # 平替 tomcat server.tomcat.max-swallow-siz， undertow该值默认为-1 + # max-http-post-size: 10MB + worker-threads: 16 # 4核CPU标准配置 + buffers: + websocket: 8192 # WebSocket缓冲 以字节为单位，这里设置为8 KB + io: 16384 # IO操作缓冲 以字节为单位，这里设置为16 KB error: include-exception: true include-stacktrace: ALWAYS diff --git a/pom.xml b/pom.xml index 819078cf..4eeb7145 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 2.0.4 2.2.0 - 1.2.83 + 2.0.43 1.6.0 4.3.0 2.0.9 @@ -56,17 +56,17 @@ 1.9.5 - 1.6.6-beta2 + 1.6.6 2.6 2.1.0 - 3.11.2 + 3.17.3 1.12.0 3.11.0 3.2.2 1.4.4 1.4.7 - 8.0.3 + 8.5.7 1.3.4 1.6.1 7.4.0 @@ -140,6 +140,12 @@ org.pegdown pegdown ${pegdown.version} + + + asm + org.ow2.asm + + @@ -369,7 +375,7 @@ org.jeecgframework.jimureport - jimureport-spring-boot3-starter + jimureport-spring-boot3-starter-fastjson2 ${jimureport-spring-boot-starter.version}