From 17046eadc2276b37d2df1ca9f244ebfcdbab2886 Mon Sep 17 00:00:00 2001 From: huwany1 Date: Wed, 22 Oct 2025 11:15:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0banner=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=B9=B6=E6=9B=B4=E6=96=B0pom.xml=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 90 ++++++++++++++++++- workload-server/pom.xml | 30 ------- workload-server/src/main/resources/banner.txt | 24 +++++ 3 files changed, 110 insertions(+), 34 deletions(-) create mode 100644 workload-server/src/main/resources/banner.txt diff --git a/pom.xml b/pom.xml index 169571c..ff89cd2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,10 +33,18 @@ 3.5.6 3.5.16 - 3.0.3 + 3.0.3 3.0.1 - 8.0.33 - 5.7.18 + 8.2.0 + 5.8.40 + 6.2.10 + 11.0.10 + 5.4.0 + 4.1.118.Final + 1.70 + 2.8.9 + 4.28.2 + 2.5.2 1.18.38 3.17.4 0.11.5 @@ -47,6 +55,14 @@ + + org.springframework + spring-framework-bom + ${spring.framework.version} + pom + import + + com.baomidou @@ -54,6 +70,18 @@ ${mybatis-plus.version} + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.version} + + + + org.apache.tomcat.embed + tomcat-embed-websocket + ${tomcat.version} + + org.mybatis @@ -65,7 +93,7 @@ org.mybatis mybatis-spring - ${mybatis.spring.veraion} + ${mybatis.spring.version} @@ -89,6 +117,12 @@ ${hutool.version} + + net.minidev + json-smart + ${json-smart.version} + + org.springdoc springdoc-openapi-starter-webmvc-ui @@ -132,6 +166,54 @@ ${easyexcel.version} + + org.apache.poi + poi-ooxml + ${poi.version} + + + + io.netty + netty-handler + ${netty.version} + + + + org.bouncycastle + bcprov-jdk15on + ${bcprov.version} + + + + com.google.code.gson + gson + ${gson.version} + + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + + org.springframework.security + spring-security-web + 6.3.5 + + + + org.springframework.security + spring-security-crypto + 6.4.4 + + + + org.apache.commons + commons-compress + 1.26.0 + + diff --git a/workload-server/pom.xml b/workload-server/pom.xml index fd24a0a..bde6d7f 100644 --- a/workload-server/pom.xml +++ b/workload-server/pom.xml @@ -12,11 +12,6 @@ jar - - org.springframework.boot - spring-boot-starter - - org.springframework.boot spring-boot-starter-web @@ -45,31 +40,7 @@ mybatis-plus-boot-starter - - - org.mybatis - mybatis - - - - - org.mybatis - mybatis-spring - - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - - - - org.projectlombok - lombok - true - - org.springdoc springdoc-openapi-starter-webmvc-ui @@ -175,7 +146,6 @@ com.google.code.gson gson - 2.8.5 diff --git a/workload-server/src/main/resources/banner.txt b/workload-server/src/main/resources/banner.txt new file mode 100644 index 0000000..ab18c8f --- /dev/null +++ b/workload-server/src/main/resources/banner.txt @@ -0,0 +1,24 @@ + ___ ___ ___ ___ ___ + / /\ / /\ / /\ ___ /__/\ / /\ + / /:/_ / /::\ / /::\ / /\ \ \:\ / /:/_ + / /:/ /\ / /:/\:\ / /:/\:\ / /:/ \ \:\ / /:/ /\ + / /:/ /::\ / /:/~/:/ / /:/~/:/ /__/::\ _____\__\:\ / /:/_/::\ + /__/:/ /:/\:\ /__/:/ /:/ /__/:/ /:/___ \__\/\:\__ /__/::::::::\ /__/:/__\/\:\ + \ \:\/:/~/:/ \ \:\/:/ \ \:\/:::::/ \ \:\/\ \ \:\~~\~~\/ \ \:\ /~~/:/ + \ \::/ /:/ \ \::/ \ \::/~~~~ \__\::/ \ \:\ ~~~ \ \:\ /:/ + \__\/ /:/ \ \:\ \ \:\ /__/:/ \ \:\ \ \:\/:/ + /__/:/ \ \:\ \ \:\ \__\/ \ \:\ \ \::/ + \__\/ \__\/ \__\/ \__\/ \__\/ + _ _ ____ _ ___ __ _ _ __ ____ ___ ____ _ + (_|_) / __/__ ____(_)__ ___ _ / _ )___ ___ / /_ (_|_) _/_/ __|_ / |_ | / __/| | + _ _ _\ \/ _ \/ __/ / _ \/ _ `/ / _ / _ \/ _ \/ __/ _ _ / /| |/ //_ <_ / __/_ /__ \ / / + (_|_) /___/ .__/_/ /_/_//_/\_, / /____/\___/\___/\__/ (_|_) / / |___/____(_)____(_)____//_/ + /_/ /___/ |_| /_/ + + ░▒▓██████▓▒░ ░▒▓████████▓▒░ ░▒▓██████▓▒░ ░▒▓███████▓▒░ + ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ + ░▒▓█▓▒░ ░▒▓██▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░ + ░▒▓█▓▒▒▓███▓▒░ ░▒▓██▓▒░ ░▒▓█▓▒▒▓███▓▒░ ░▒▓██████▓▒░ + ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓██▓▒░ ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ + ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ + ░▒▓██████▓▒░ ░▒▓████████▓▒░ ░▒▓██████▓▒░ ░▒▓███████▓▒░ \ No newline at end of file -- Gitee From eec3905f47a7d0cccfd7165c3c76f3284fb2be95 Mon Sep 17 00:00:00 2001 From: huwany1 Date: Wed, 22 Oct 2025 14:03:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0banner=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=B9=B6=E4=BF=AE=E5=A4=8Dpom.xml=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 19 ++------ workload-common/pom.xml | 2 +- workload-pojo/pom.xml | 2 +- workload-server/pom.xml | 2 +- workload-server/src/main/resources/banner.txt | 46 +++++++++---------- 5 files changed, 29 insertions(+), 42 deletions(-) diff --git a/pom.xml b/pom.xml index ff89cd2..8ccf087 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.9 cn.edu.gzgs - workload-management-master + workload-management 1.0.0-SNAPSHOT pom workload-management @@ -38,7 +38,7 @@ 8.2.0 5.8.40 6.2.10 - 11.0.10 + 10.1.35 5.4.0 4.1.118.Final 1.70 @@ -63,25 +63,12 @@ import - com.baomidou mybatis-plus-boot-starter ${mybatis-plus.version} - - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat.version} - - - - org.apache.tomcat.embed - tomcat-embed-websocket - ${tomcat.version} - - org.mybatis diff --git a/workload-common/pom.xml b/workload-common/pom.xml index fa2386a..3610b59 100644 --- a/workload-common/pom.xml +++ b/workload-common/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cn.edu.gzgs - workload-management-master + workload-management 1.0.0-SNAPSHOT 4.0.0 diff --git a/workload-pojo/pom.xml b/workload-pojo/pom.xml index c4b098b..252fb19 100644 --- a/workload-pojo/pom.xml +++ b/workload-pojo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cn.edu.gzgs - workload-management-master + workload-management 1.0.0-SNAPSHOT 4.0.0 diff --git a/workload-server/pom.xml b/workload-server/pom.xml index bde6d7f..2ac14c9 100644 --- a/workload-server/pom.xml +++ b/workload-server/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cn.edu.gzgs - workload-management-master + workload-management 1.0.0-SNAPSHOT 4.0.0 diff --git a/workload-server/src/main/resources/banner.txt b/workload-server/src/main/resources/banner.txt index ab18c8f..134c976 100644 --- a/workload-server/src/main/resources/banner.txt +++ b/workload-server/src/main/resources/banner.txt @@ -1,24 +1,24 @@ - ___ ___ ___ ___ ___ - / /\ / /\ / /\ ___ /__/\ / /\ - / /:/_ / /::\ / /::\ / /\ \ \:\ / /:/_ - / /:/ /\ / /:/\:\ / /:/\:\ / /:/ \ \:\ / /:/ /\ - / /:/ /::\ / /:/~/:/ / /:/~/:/ /__/::\ _____\__\:\ / /:/_/::\ - /__/:/ /:/\:\ /__/:/ /:/ /__/:/ /:/___ \__\/\:\__ /__/::::::::\ /__/:/__\/\:\ - \ \:\/:/~/:/ \ \:\/:/ \ \:\/:::::/ \ \:\/\ \ \:\~~\~~\/ \ \:\ /~~/:/ - \ \::/ /:/ \ \::/ \ \::/~~~~ \__\::/ \ \:\ ~~~ \ \:\ /:/ - \__\/ /:/ \ \:\ \ \:\ /__/:/ \ \:\ \ \:\/:/ - /__/:/ \ \:\ \ \:\ \__\/ \ \:\ \ \::/ - \__\/ \__\/ \__\/ \__\/ \__\/ - _ _ ____ _ ___ __ _ _ __ ____ ___ ____ _ - (_|_) / __/__ ____(_)__ ___ _ / _ )___ ___ / /_ (_|_) _/_/ __|_ / |_ | / __/| | - _ _ _\ \/ _ \/ __/ / _ \/ _ `/ / _ / _ \/ _ \/ __/ _ _ / /| |/ //_ <_ / __/_ /__ \ / / - (_|_) /___/ .__/_/ /_/_//_/\_, / /____/\___/\___/\__/ (_|_) / / |___/____(_)____(_)____//_/ - /_/ /___/ |_| /_/ + ___ ___ ___ ___ ___ + / /\ / /\ / /\ ___ /__/\ / /\ + / /:/_ / /::\ / /::\ / /\ \ \:\ / /:/_ + / /:/ /\ / /:/\:\ / /:/\:\ / /:/ \ \:\ / /:/ /\ + / /:/ /::\ / /:/~/:/ / /:/~/:/ /__/::\ _____\__\:\ / /:/_/::\ + /__/:/ /:/\:\ /__/:/ /:/ /__/:/ /:/___ \__\/\:\__ /__/::::::::\ /__/:/__\/\:\ + \ \:\/:/~/:/ \ \:\/:/ \ \:\/:::::/ \ \:\/\ \ \:\~~\~~\/ \ \:\ /~~/:/ + \ \::/ /:/ \ \::/ \ \::/~~~~ \__\::/ \ \:\ ~~~ \ \:\ /:/ + \__\/ /:/ \ \:\ \ \:\ /__/:/ \ \:\ \ \:\/:/ + /__/:/ \ \:\ \ \:\ \__\/ \ \:\ \ \::/ + \__\/ \__\/ \__\/ \__\/ \__\/ + _ _ ____ _ ___ __ _ _ __ ____ ____ ___ _ + (_|_) / __/__ ____(_)__ ___ _ / _ )___ ___ / /_ (_|_) _/_/ __|_ / |_ / / _ \| | + _ _ _\ \/ _ \/ __/ / _ \/ _ `/ / _ / _ \/ _ \/ __/ _ _ / /| |/ //_ <_ _/_ <_ \_, // / + (_|_) /___/ .__/_/ /_/_//_/\_, / /____/\___/\___/\__/ (_|_) / / |___/____(_)____(_)___//_/ + /_/ /___/ |_| /_/ - ░▒▓██████▓▒░ ░▒▓████████▓▒░ ░▒▓██████▓▒░ ░▒▓███████▓▒░ - ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ - ░▒▓█▓▒░ ░▒▓██▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░ - ░▒▓█▓▒▒▓███▓▒░ ░▒▓██▓▒░ ░▒▓█▓▒▒▓███▓▒░ ░▒▓██████▓▒░ - ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓██▓▒░ ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ - ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ - ░▒▓██████▓▒░ ░▒▓████████▓▒░ ░▒▓██████▓▒░ ░▒▓███████▓▒░ \ No newline at end of file + ░▒▓██████▓▒░ ░▒▓████████▓▒░ ░▒▓██████▓▒░ ░▒▓███████▓▒░ + ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ + ░▒▓█▓▒░ ░▒▓██▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░ + ░▒▓█▓▒▒▓███▓▒░ ░▒▓██▓▒░ ░▒▓█▓▒▒▓███▓▒░ ░▒▓██████▓▒░ + ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓██▓▒░ ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ + ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ ░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░ + ░▒▓██████▓▒░ ░▒▓████████▓▒░ ░▒▓██████▓▒░ ░▒▓███████▓▒░ \ No newline at end of file -- Gitee From c0d5b4839bccb9a5b51ac673955b383df952275f Mon Sep 17 00:00:00 2001 From: huwany1 Date: Wed, 22 Oct 2025 14:56:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E9=A1=B9=E5=B9=B6=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84Tomcat=E7=89=88=E6=9C=AC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 35 ++++++++++++++++++++++++++++++++++- workload-pojo/pom.xml | 5 +++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ccf087..f33a689 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,6 @@ 8.2.0 5.8.40 6.2.10 - 10.1.35 5.4.0 4.1.118.Final 1.70 @@ -50,6 +49,10 @@ 0.11.5 2.5.0 3.3.4 + 2.10.0 + 2.14.0 + 1.5.19 + 3.18.0 @@ -122,6 +125,12 @@ ${lombok.version} + + org.xmlunit + xmlunit-core + ${xmlunit.version} + + io.jsonwebtoken jjwt-api @@ -183,6 +192,18 @@ ${protobuf.version} + + ch.qos.logback + logback-core + ${logback.version} + + + + ch.qos.logback + logback-classic + ${logback.version} + + org.springframework.security spring-security-web @@ -201,6 +222,18 @@ 1.26.0 + + org.apache.commons + commons-lang3 + ${commons.lang3.version} + + + + commons-io + commons-io + ${commons.io.version} + + diff --git a/workload-pojo/pom.xml b/workload-pojo/pom.xml index 252fb19..d94d0be 100644 --- a/workload-pojo/pom.xml +++ b/workload-pojo/pom.xml @@ -26,6 +26,11 @@ ${mybatis-plus.version} + + org.mybatis + mybatis + + com.alibaba -- Gitee