From ab7df9ca23552db4e1516b935a3df12d11f83d9e Mon Sep 17 00:00:00 2001 From: qianmoQ Date: Tue, 2 Jul 2024 20:23:49 +0800 Subject: [PATCH 1/2] [Core] [SPI] Adapter xml convert --- core/datacap-spi/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/datacap-spi/pom.xml b/core/datacap-spi/pom.xml index 3f7b54fb..88817512 100644 --- a/core/datacap-spi/pom.xml +++ b/core/datacap-spi/pom.xml @@ -102,6 +102,11 @@ datacap-convert-csv ${project.version} + + io.edurt.datacap + datacap-convert-xml + ${project.version} + From d27639ea2f0721b35fce2e2c3c70ef4595a75d4c Mon Sep 17 00:00:00 2001 From: qianmoQ Date: Tue, 2 Jul 2024 21:02:24 +0800 Subject: [PATCH 2/2] [Core] [Env] Add version --- configure/etc/conf/application.properties | 3 +++ configure/publish/publish-newVersion.sh | 3 +++ core/datacap-server/src/main/resources/banner.txt | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/configure/etc/conf/application.properties b/configure/etc/conf/application.properties index 4f7e017d..dbdcf6dd 100644 --- a/configure/etc/conf/application.properties +++ b/configure/etc/conf/application.properties @@ -1,3 +1,6 @@ +################################### Banner configure ################################# +app.version=2024.03.7-SNAPSHOT + ################################### Basic configure ################################# server.port=9096 # Note: If you need to use IP+ port to facilitate access by external machines, do not set it to localhost, 0.0.0.0 is recommended diff --git a/configure/publish/publish-newVersion.sh b/configure/publish/publish-newVersion.sh index fa474073..fdf2b583 100644 --- a/configure/publish/publish-newVersion.sh +++ b/configure/publish/publish-newVersion.sh @@ -33,6 +33,9 @@ job_runner_apply() { printf "\nApply new version for server successful\n\n" fi + echo "Apply new version for application ..." + perl -pi -e 's/app\.version=.*/app.version='"$VERSION"'/g' configure/etc/conf/application.properties + printf "Apply new version for web ...\n" # shellcheck disable=SC2164 cd "$HOME"/core/datacap-ui diff --git a/core/datacap-server/src/main/resources/banner.txt b/core/datacap-server/src/main/resources/banner.txt index 2de51513..c0db19d2 100644 --- a/core/datacap-server/src/main/resources/banner.txt +++ b/core/datacap-server/src/main/resources/banner.txt @@ -3,3 +3,8 @@ 8I Yb dPYb 88 dPYb dP `" dPYb 88__dP 8I dY dP__Yb 88 dP__Yb Yb dP__Yb 88""" 8888Y" dP""""Yb 88 dP""""Yb YboodP dP""""Yb 88 + +::Spring Boot Version:: ${AnsiColor.RED}(${spring-boot.version})${AnsiColor.DEFAULT} + +::Application Version:: ${AnsiColor.RED}(${app.version})${AnsiColor.DEFAULT} +::Application Address:: ${AnsiColor.RED}http://${server.address}:${server.port}${AnsiColor.DEFAULT}