diff --git a/hutool-ai/pom.xml b/hutool-ai/pom.xml index e5a098704..4388dcb94 100644 --- a/hutool-ai/pom.xml +++ b/hutool-ai/pom.xml @@ -23,6 +23,22 @@ 2.0.53 2.13.0 + 12.0.19 + 3.0.2 + 5.4.3 + 4.5.14 + 5.0.0-alpha.14 + 2.3.18.Final + 11.0.6 + 1.4.3 + + 2.0.9 + 1.2.17 + 2.20.0 + 1.3.6 + 2.7.0 + 1.3.4 + @@ -91,6 +107,111 @@ compile true + + + org.eclipse.jetty + jetty-server + ${jetty.version} + provided + + + jakarta.xml.soap + jakarta.xml.soap-api + ${jakarta.xml.soap-api.version} + provided + + + org.smartboot.http + smart-http-server + ${smartboot.version} + provided + + + org.smartboot.socket + aio-core + 1.6.6 + + + org.smartboot.socket + aio-pro + 1.6.6 + + + + org.apache.httpcomponents.client5 + httpclient5 + ${httpclient5.version} + provided + + + org.apache.httpcomponents + httpclient + ${httpclient4.version} + provided + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + provided + + + + + io.undertow + undertow-core + ${undertow.version} + provided + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.version} + provided + + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + test + + + org.slf4j + slf4j-simple + ${slf4j.version} + test + + + log4j + log4j + ${log4j.version} + true + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + true + + + org.tinylog + tinylog + ${tinylog.version} + true + + + org.tinylog + tinylog-api + ${tinylog2.version} + true + + + commons-logging + commons-logging + ${commons-logging.version} + true + diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index e8e893d15..42ebda247 100755 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -348,10 +348,9 @@ true - com.janeluo - ikanalyzer - 2012_u6 - true + com.jianggujin + IKAnalyzer-lucene + 8.0.0 org.apache.lucene diff --git a/hutool-extra/src/main/java/module-info.java b/hutool-extra/src/main/java/module-info.java index 8684c5129..3f34ef00a 100644 --- a/hutool-extra/src/main/java/module-info.java +++ b/hutool-extra/src/main/java/module-info.java @@ -44,11 +44,31 @@ module hutool.extra { requires spring.beans; requires ganymed.ssh2; requires com.jcraft.jsch; - requires static org.apache.sshd.core; - requires static org.apache.sshd.common; + requires org.apache.sshd.core; + requires org.apache.sshd.common; requires mmseg4j.core; requires lucene.core; requires lucene.analyzers.smartcn; + requires IKAnalyzer.lucene; + requires jieba.analysis; + requires jcseg.core; + requires word; + requires hanlp.portable; + requires ansj.seg; + requires mynlp; + requires io.pebbletemplates; + requires enjoy; + requires wit.core; + requires freemarker; + requires thymeleaf; + requires velocity.engine.core; + requires gg.jte.runtime; + requires gg.jte; + requires jetbrick.template; + requires jetbrick.commons; + requires rythm.engine; + requires beetl.core; + requires jakarta.xml.bind; } diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index 1875473d8..9519b200b 100755 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -44,6 +44,13 @@ 6.1.0 3.0.2 3.0.4 + + 2.0.9 + 1.2.17 + 2.20.0 + 1.3.6 + 2.7.0 + 1.3.4 @@ -135,6 +142,12 @@ smart-http-server ${smartboot.version} provided + + + org.smartboot.socket + aio-core + + @@ -155,5 +168,48 @@ 1.7.36 test + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + test + + + org.slf4j + slf4j-simple + ${slf4j.version} + test + + + log4j + log4j + ${log4j.version} + true + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + true + + + org.tinylog + tinylog + ${tinylog.version} + true + + + org.tinylog + tinylog-api + ${tinylog2.version} + true + + + commons-logging + commons-logging + ${commons-logging.version} + true + diff --git a/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpServerEngine.java b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpServerEngine.java index 85ad6cc46..46afdc0dc 100644 --- a/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpServerEngine.java +++ b/hutool-http/src/main/java/cn/hutool/v7/http/server/engine/smart/SmartHttpServerEngine.java @@ -21,10 +21,10 @@ import cn.hutool.v7.http.HttpException; import cn.hutool.v7.http.server.ServerConfig; import cn.hutool.v7.http.server.engine.AbstractServerEngine; import org.smartboot.http.server.*; -import org.smartboot.http.server.impl.Request; -import org.smartboot.socket.extension.plugins.SslPlugin; import javax.net.ssl.SSLContext; +import java.lang.reflect.Method; +import java.util.function.Supplier; /** * smart-http-server引擎 @@ -79,13 +79,16 @@ public class SmartHttpServerEngine extends AbstractServerEngine { // SSL final SSLContext sslContext = config.getSslContext(); if(null != sslContext){ - final SslPlugin sslPlugin; try { - sslPlugin = new SslPlugin<>(() -> sslContext); + // 使用反射创建SslPlugin + Class sslPluginClass = Class.forName("org.smartboot.socket.extension.plugins.SslPlugin"); + Object sslPlugin = sslPluginClass.getConstructor(Supplier.class).newInstance((Supplier) () -> sslContext); + // 使用反射调用addPlugin方法 + Method addPlugin = configuration.getClass().getMethod("addPlugin", Object.class); + addPlugin.invoke(configuration, sslPlugin); } catch (final Exception e) { throw new HttpException(e); } - configuration.addPlugin(sslPlugin); } // 选项 diff --git a/hutool-http/src/main/java/module-info.java b/hutool-http/src/main/java/module-info.java index e9baeb2b8..5ef31ff3f 100644 --- a/hutool-http/src/main/java/module-info.java +++ b/hutool-http/src/main/java/module-info.java @@ -19,6 +19,10 @@ * @author choweli */ module hutool.http { + exports cn.hutool.v7.http.meta; + exports cn.hutool.v7.http.client; + exports cn.hutool.v7.http; + requires jdk.httpserver; requires hutool.log; requires org.apache.httpcomponents.httpclient; @@ -36,6 +40,11 @@ module hutool.http { requires org.apache.tomcat.embed.core; requires aio.pro; -// requires aio.core; + + opens cn.hutool.v7.http.client.engine; + opens cn.hutool.v7.http.client.engine.httpclient5; + opens cn.hutool.v7.http.client.engine.httpclient4; + opens cn.hutool.v7.http.client.engine.okhttp; + opens cn.hutool.v7.http.client.engine.jdk; }