From bf79dbb4df19ba6841bfbf9fd119ed7a16e48fbf Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 16 Oct 2024 15:13:48 +0800
Subject: [PATCH] 24.10.0-SNAPSHOT
---
bonus-common-biz/pom.xml | 2 +-
bonus-modules/bonus-material-screen/pom.xml | 2 +-
bonus-modules/bonus-material/pom.xml | 4 +--
bonus-modules/pom.xml | 2 +-
pom.xml | 4 +--
scripts_244/deploy.sh | 2 +-
scripts_244/kill-ps.sh | 12 ++++-----
scripts_56/deploy.sh | 30 ++++++++++-----------
8 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/bonus-common-biz/pom.xml b/bonus-common-biz/pom.xml
index 638ca2ce..9b98d0fe 100644
--- a/bonus-common-biz/pom.xml
+++ b/bonus-common-biz/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus
- 24.9.0
+ 24.10.0-SNAPSHOT
4.0.0
diff --git a/bonus-modules/bonus-material-screen/pom.xml b/bonus-modules/bonus-material-screen/pom.xml
index f033c62e..8d29e979 100644
--- a/bonus-modules/bonus-material-screen/pom.xml
+++ b/bonus-modules/bonus-material-screen/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-modules
- 24.9.0
+ 24.10.0-SNAPSHOT
4.0.0
diff --git a/bonus-modules/bonus-material/pom.xml b/bonus-modules/bonus-material/pom.xml
index 19a42727..908da249 100644
--- a/bonus-modules/bonus-material/pom.xml
+++ b/bonus-modules/bonus-material/pom.xml
@@ -5,7 +5,7 @@
com.bonus
bonus-modules
- 24.9.0
+ 24.10.0-SNAPSHOT
4.0.0
@@ -97,7 +97,7 @@
com.bonus
bonus-common-biz
- 24.9.0
+ 24.10.0-SNAPSHOT
compile
diff --git a/bonus-modules/pom.xml b/bonus-modules/pom.xml
index 58c9ecf3..0a6b6521 100644
--- a/bonus-modules/pom.xml
+++ b/bonus-modules/pom.xml
@@ -4,7 +4,7 @@
com.bonus
bonus
- 24.9.0
+ 24.10.0-SNAPSHOT
4.0.0
diff --git a/pom.xml b/pom.xml
index abf9e066..8bb60932 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
com.bonus
bonus
- 24.9.0
+ 24.10.0-SNAPSHOT
bonus
http://www.ahbonus.cn
博诺思微服务系统
- 24.9.0
+ 24.10.0-SNAPSHOT
UTF-8
UTF-8
1.8
diff --git a/scripts_244/deploy.sh b/scripts_244/deploy.sh
index 44ff3e90..9f3d40b5 100644
--- a/scripts_244/deploy.sh
+++ b/scripts_244/deploy.sh
@@ -1,6 +1,6 @@
#!/bin/bash
suffix="-material"
-jar_version="24.9.0"
+jar_version="24.10.0-SNAPSHOT"
export deploy_path=/opt/webapps/bonus-material
export app_workspace=/opt/builds/releases/Bonus-Cloud/${jar_version}
diff --git a/scripts_244/kill-ps.sh b/scripts_244/kill-ps.sh
index f21edab6..8d46cfa7 100644
--- a/scripts_244/kill-ps.sh
+++ b/scripts_244/kill-ps.sh
@@ -1,9 +1,9 @@
-AUTH_RESOURCE_NAME=bonus-auth-24.9.0-material.jar
-GATEWAY_RESOURCE_NAME=bonus-gateway-24.9.0-material.jar
-SYS_RESOURCE_NAME=bonus-system-24.9.0-material.jar
-JOB_RESOURCE_NAME=bonus-job-24.9.0-material.jar
-FILE_RESOURCE_NAME=bonus-file-24.9.0-material.jar
-MONITOR_RESOURCE_NAME=bonus-visual-monitor-24.9.0-material.jar
+AUTH_RESOURCE_NAME=bonus-auth-24.10.0-SNAPSHOT-material.jar
+GATEWAY_RESOURCE_NAME=bonus-gateway-24.10.0-SNAPSHOT-material.jar
+SYS_RESOURCE_NAME=bonus-system-24.10.0-SNAPSHOT-material.jar
+JOB_RESOURCE_NAME=bonus-job-24.10.0-SNAPSHOT-material.jar
+FILE_RESOURCE_NAME=bonus-file-24.10.0-SNAPSHOT-material.jar
+MONITOR_RESOURCE_NAME=bonus-visual-monitor-24.10.0-SNAPSHOT-material.jar
MATERIAL_RESOURCE_NAME=bonus-material.jar
diff --git a/scripts_56/deploy.sh b/scripts_56/deploy.sh
index 122ae2bd..ba2988fa 100644
--- a/scripts_56/deploy.sh
+++ b/scripts_56/deploy.sh
@@ -2,20 +2,20 @@
export deploy_path=/opt/webapps/bonus-material
-export app_workspace=/opt/builds/releases/Bonus-Cloud/24.9.0
+export app_workspace=/opt/builds/releases/Bonus-Cloud/24.10.0-SNAPSHOT
export biz_workspace=/home/jenkins/workspace/Bonus-Cloud-Material
suffix="-material"
app_source_jars=(
- "bonus-auth-24.9.0.jar"
- "bonus-gateway-24.9.0.jar"
- #"bonus-file-24.9.0.jar"
- #"bonus-gen-24.9.0.jar"
- #"bonus-job-24.9.0.jar"
- "bonus-system-24.9.0.jar"
- "bonus-visual-monitor-24.9.0.jar"
+ "bonus-auth-24.10.0-SNAPSHOT.jar"
+ "bonus-gateway-24.10.0-SNAPSHOT.jar"
+ #"bonus-file-24.10.0-SNAPSHOT.jar"
+ #"bonus-gen-24.10.0-SNAPSHOT.jar"
+ #"bonus-job-24.10.0-SNAPSHOT.jar"
+ "bonus-system-24.10.0-SNAPSHOT.jar"
+ "bonus-visual-monitor-24.10.0-SNAPSHOT.jar"
)
#for source_jar in "${app_source_jars[@]}"; do
@@ -41,13 +41,13 @@ cp -f ${biz_workspace}/"bonus-modules/bonus-material/target/bonus-material.jar"
echo "copied ${app_workspace}/${source_jar} to $deploy_path"
# Define an array of JAR files to run
-jars=("bonus-auth-24.9.0-material.jar --spring.config.location=file:auth_bootstrap.yml"
-"bonus-gateway-24.9.0-material.jar --spring.config.location=file:gateway_bootstrap.yml"
-"bonus-system-24.9.0-material.jar --spring.config.location=file:system_bootstrap.yml"
-#"bonus-gen-24.9.0-material.jar --spring.config.location=file:gen_bootstrap.yml"
-#"bonus-job-24.9.0-material.jar --spring.config.location=file:job_bootstrap.yml"
-#"bonus-file-24.9.0-material.jar --spring.config.location=file:file_bootstrap.yml"
-#"bonus-visual-24.9.0-monitor-material.jar --spring.config.location=file:visual_bootstrap.yml"
+jars=("bonus-auth-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:auth_bootstrap.yml"
+"bonus-gateway-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:gateway_bootstrap.yml"
+"bonus-system-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:system_bootstrap.yml"
+#"bonus-gen-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:gen_bootstrap.yml"
+#"bonus-job-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:job_bootstrap.yml"
+#"bonus-file-24.10.0-SNAPSHOT-material.jar --spring.config.location=file:file_bootstrap.yml"
+#"bonus-visual-24.10.0-SNAPSHOT-monitor-material.jar --spring.config.location=file:visual_bootstrap.yml"
"bonus-material.jar --spring.config.location=file:material_bootstrap.yml")
# 遍历数组并检查每个JAR文件的进程