diff --git a/bus-all/pom.xml b/bus-all/pom.xml index cf0ee5635c..7f50fd3460 100755 --- a/bus-all/pom.xml +++ b/bus-all/pom.xml @@ -96,7 +96,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-base/pom.xml b/bus-base/pom.xml index d6963bf82b..f4a425a910 100755 --- a/bus-base/pom.xml +++ b/bus-base/pom.xml @@ -126,7 +126,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -153,7 +153,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-bom/pom.xml b/bus-bom/pom.xml index 0ca8c626ba..387e88ea00 100644 --- a/bus-bom/pom.xml +++ b/bus-bom/pom.xml @@ -144,6 +144,11 @@ bus-mapper ${project.version} + + ${project.groupId} + bus-notify + ${project.version} + ${project.groupId} bus-oauth @@ -159,6 +164,11 @@ bus-pager ${project.version} + + ${project.groupId} + bus-pay + ${project.version} + ${project.groupId} bus-proxy @@ -174,11 +184,21 @@ bus-setting ${project.version} + + ${project.groupId} + bus-shade + ${project.version} + ${project.groupId} bus-socket ${project.version} + + ${project.groupId} + bus-spring + ${project.version} + ${project.groupId} bus-starter @@ -215,7 +235,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -242,7 +262,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-cache/pom.xml b/bus-cache/pom.xml index bcbb3f5022..e2aa89f83f 100755 --- a/bus-cache/pom.xml +++ b/bus-cache/pom.xml @@ -232,7 +232,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -259,7 +259,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-core/pom.xml b/bus-core/pom.xml index e520c65159..1f53b071a0 100755 --- a/bus-core/pom.xml +++ b/bus-core/pom.xml @@ -104,7 +104,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-cron/pom.xml b/bus-cron/pom.xml index f16815d26b..286e1add1b 100755 --- a/bus-cron/pom.xml +++ b/bus-cron/pom.xml @@ -95,7 +95,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-crypto/pom.xml b/bus-crypto/pom.xml index 901c1a4fbb..c202c94d7a 100755 --- a/bus-crypto/pom.xml +++ b/bus-crypto/pom.xml @@ -109,7 +109,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-extra/pom.xml b/bus-extra/pom.xml index 065a61415a..6186f0e8da 100644 --- a/bus-extra/pom.xml +++ b/bus-extra/pom.xml @@ -394,7 +394,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -421,7 +421,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-gitlab/pom.xml b/bus-gitlab/pom.xml index 0d3db5aa2c..d392603405 100755 --- a/bus-gitlab/pom.xml +++ b/bus-gitlab/pom.xml @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-goalie/pom.xml b/bus-goalie/pom.xml index 31f1675542..80b6d959cd 100644 --- a/bus-goalie/pom.xml +++ b/bus-goalie/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -159,7 +159,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-health/pom.xml b/bus-health/pom.xml index 34ea15ec09..6bf430394b 100755 --- a/bus-health/pom.xml +++ b/bus-health/pom.xml @@ -102,7 +102,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-http/pom.xml b/bus-http/pom.xml index 000cb2c6fa..61a24ff2d0 100755 --- a/bus-http/pom.xml +++ b/bus-http/pom.xml @@ -109,7 +109,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-image/pom.xml b/bus-image/pom.xml index e98a28a94a..1663a7f95f 100755 --- a/bus-image/pom.xml +++ b/bus-image/pom.xml @@ -109,7 +109,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-limiter/pom.xml b/bus-limiter/pom.xml index a135e108ff..73795150d0 100755 --- a/bus-limiter/pom.xml +++ b/bus-limiter/pom.xml @@ -121,7 +121,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -148,7 +148,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-logger/pom.xml b/bus-logger/pom.xml index 56a48fd8f9..dfbf8c8a7d 100644 --- a/bus-logger/pom.xml +++ b/bus-logger/pom.xml @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -169,7 +169,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-mapper/pom.xml b/bus-mapper/pom.xml index 6c4eceb914..d2ef804860 100755 --- a/bus-mapper/pom.xml +++ b/bus-mapper/pom.xml @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-notify/pom.xml b/bus-notify/pom.xml index fa3439d497..27fda0d29c 100755 --- a/bus-notify/pom.xml +++ b/bus-notify/pom.xml @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -151,7 +151,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-oauth/pom.xml b/bus-oauth/pom.xml index 21d23d1333..ba07916ab5 100755 --- a/bus-oauth/pom.xml +++ b/bus-oauth/pom.xml @@ -159,7 +159,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-office/pom.xml b/bus-office/pom.xml index e863fa005f..3d83c73a7b 100755 --- a/bus-office/pom.xml +++ b/bus-office/pom.xml @@ -153,7 +153,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -180,7 +180,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-opencv/pom.xml b/bus-opencv/pom.xml index f03043e349..f74d5f3120 100755 --- a/bus-opencv/pom.xml +++ b/bus-opencv/pom.xml @@ -87,7 +87,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -114,7 +114,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-pager/pom.xml b/bus-pager/pom.xml index 3f5ff49d3a..9461e93986 100755 --- a/bus-pager/pom.xml +++ b/bus-pager/pom.xml @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -168,7 +168,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-parent/pom.xml b/bus-parent/pom.xml index f169f45ec5..5090dbe80c 100755 --- a/bus-parent/pom.xml +++ b/bus-parent/pom.xml @@ -1327,7 +1327,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -1354,7 +1354,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-pay/pom.xml b/bus-pay/pom.xml index 0cdb1adf55..1c73cc8c44 100644 --- a/bus-pay/pom.xml +++ b/bus-pay/pom.xml @@ -159,7 +159,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-proxy/pom.xml b/bus-proxy/pom.xml index 7ca60b0a97..271e0429f5 100755 --- a/bus-proxy/pom.xml +++ b/bus-proxy/pom.xml @@ -109,7 +109,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-sensitive/pom.xml b/bus-sensitive/pom.xml index f14c392e4a..fb74d19c18 100755 --- a/bus-sensitive/pom.xml +++ b/bus-sensitive/pom.xml @@ -114,7 +114,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-setting/pom.xml b/bus-setting/pom.xml index efda2b8dce..c72874dda5 100755 --- a/bus-setting/pom.xml +++ b/bus-setting/pom.xml @@ -102,7 +102,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-shade/pom.xml b/bus-shade/pom.xml index 44d221d798..2fc329bf23 100755 --- a/bus-shade/pom.xml +++ b/bus-shade/pom.xml @@ -155,7 +155,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -182,7 +182,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-shade/src/main/java/org/miaixz/bus/shade/beans/Builder.java b/bus-shade/src/main/java/org/miaixz/bus/shade/beans/Builder.java index 9d1c447699..8b77b0d8f7 100644 --- a/bus-shade/src/main/java/org/miaixz/bus/shade/beans/Builder.java +++ b/bus-shade/src/main/java/org/miaixz/bus/shade/beans/Builder.java @@ -121,7 +121,7 @@ private static Object createFile(TableEntity tableEntity, String templateName, S // 通过FreeMarker的Confuguration读取相应的模板文件 Configuration configuration = new Configuration(Configuration.VERSION_2_3_28); // 设置模板路径 - configuration.setClassForTemplateLoading(org.miaixz.bus.shade.screw.Builder.class, Symbol.C_SLASH + Normal.META_INF + "/template"); + configuration.setClassForTemplateLoading(org.miaixz.bus.shade.beans.Builder.class, Symbol.C_SLASH + Normal.META_INF + "/template"); // 设置默认字体 configuration.setDefaultEncoding(Charset.DEFAULT_UTF_8); // 获取模板 diff --git a/bus-shade/src/main/java/org/miaixz/bus/shade/screw/Builder.java b/bus-shade/src/main/java/org/miaixz/bus/shade/screw/Builder.java index ccdfc566a3..75b950700f 100644 --- a/bus-shade/src/main/java/org/miaixz/bus/shade/screw/Builder.java +++ b/bus-shade/src/main/java/org/miaixz/bus/shade/screw/Builder.java @@ -88,7 +88,11 @@ public class Builder { */ public static final String Y = "Y"; - // ⑦创建数据结构文档 + /** + * 创建数据结构文档 + * + * @param config 配置 + */ public static void createFile(Config config) { new ProduceExecute(config).execute(); } diff --git a/bus-shade/src/main/resources/META-INF/template/Controller.ftl b/bus-shade/src/main/resources/META-INF/shade/beans/Controller.ftl similarity index 100% rename from bus-shade/src/main/resources/META-INF/template/Controller.ftl rename to bus-shade/src/main/resources/META-INF/shade/beans/Controller.ftl diff --git a/bus-shade/src/main/resources/META-INF/template/Entity.ftl b/bus-shade/src/main/resources/META-INF/shade/beans/Entity.ftl similarity index 100% rename from bus-shade/src/main/resources/META-INF/template/Entity.ftl rename to bus-shade/src/main/resources/META-INF/shade/beans/Entity.ftl diff --git a/bus-shade/src/main/resources/META-INF/template/Mapper.ftl b/bus-shade/src/main/resources/META-INF/shade/beans/Mapper.ftl similarity index 100% rename from bus-shade/src/main/resources/META-INF/template/Mapper.ftl rename to bus-shade/src/main/resources/META-INF/shade/beans/Mapper.ftl diff --git a/bus-shade/src/main/resources/META-INF/template/MapperXml.ftl b/bus-shade/src/main/resources/META-INF/shade/beans/MapperXml.ftl similarity index 100% rename from bus-shade/src/main/resources/META-INF/template/MapperXml.ftl rename to bus-shade/src/main/resources/META-INF/shade/beans/MapperXml.ftl diff --git a/bus-shade/src/main/resources/META-INF/template/Service.ftl b/bus-shade/src/main/resources/META-INF/shade/beans/Service.ftl similarity index 100% rename from bus-shade/src/main/resources/META-INF/template/Service.ftl rename to bus-shade/src/main/resources/META-INF/shade/beans/Service.ftl diff --git a/bus-shade/src/main/resources/META-INF/template/ServiceImpl.ftl b/bus-shade/src/main/resources/META-INF/shade/beans/ServiceImpl.ftl similarity index 100% rename from bus-shade/src/main/resources/META-INF/template/ServiceImpl.ftl rename to bus-shade/src/main/resources/META-INF/shade/beans/ServiceImpl.ftl diff --git a/bus-shade/src/main/resources/META-INF/template/html.ftl b/bus-shade/src/main/resources/META-INF/shade/beans/html.ftl similarity index 100% rename from bus-shade/src/main/resources/META-INF/template/html.ftl rename to bus-shade/src/main/resources/META-INF/shade/beans/html.ftl diff --git a/bus-shade/src/main/resources/META-INF/template/md.ftl b/bus-shade/src/main/resources/META-INF/shade/beans/md.ftl similarity index 100% rename from bus-shade/src/main/resources/META-INF/template/md.ftl rename to bus-shade/src/main/resources/META-INF/shade/beans/md.ftl diff --git a/bus-shade/src/main/resources/META-INF/template/word.ftl b/bus-shade/src/main/resources/META-INF/shade/beans/word.ftl similarity index 100% rename from bus-shade/src/main/resources/META-INF/template/word.ftl rename to bus-shade/src/main/resources/META-INF/shade/beans/word.ftl diff --git a/bus-socket/pom.xml b/bus-socket/pom.xml index 36b3e64568..7e6457cf61 100755 --- a/bus-socket/pom.xml +++ b/bus-socket/pom.xml @@ -95,7 +95,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-spring/pom.xml b/bus-spring/pom.xml index 9970dfdadb..811e25c61f 100755 --- a/bus-spring/pom.xml +++ b/bus-spring/pom.xml @@ -110,7 +110,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -137,7 +137,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-starter/pom.xml b/bus-starter/pom.xml index 5e4a0a992f..764d80dfc7 100755 --- a/bus-starter/pom.xml +++ b/bus-starter/pom.xml @@ -381,7 +381,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -408,7 +408,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-storage/pom.xml b/bus-storage/pom.xml index a7646a77a9..815ccfc07b 100755 --- a/bus-storage/pom.xml +++ b/bus-storage/pom.xml @@ -476,7 +476,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -503,7 +503,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-tracer/pom.xml b/bus-tracer/pom.xml index b07e1de6ea..4a25aadcd7 100755 --- a/bus-tracer/pom.xml +++ b/bus-tracer/pom.xml @@ -102,7 +102,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging diff --git a/bus-validate/pom.xml b/bus-validate/pom.xml index 7acbbdb451..5f6e1853d4 100755 --- a/bus-validate/pom.xml +++ b/bus-validate/pom.xml @@ -102,7 +102,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sonatype-nexus-staging