From 12c384aff1d7ddda902197cc79a8a6739bc35693 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 11 Mar 2025 16:35:20 +0800
Subject: [PATCH] script

---
 scripts_244_bonus_houqin_test/deploy.sh  |  4 ++--
 scripts_244_bonus_houqin_test/kill-ps.sh | 17 +----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/scripts_244_bonus_houqin_test/deploy.sh b/scripts_244_bonus_houqin_test/deploy.sh
index 9f41ef99..60c105da 100644
--- a/scripts_244_bonus_houqin_test/deploy.sh
+++ b/scripts_244_bonus_houqin_test/deploy.sh
@@ -34,7 +34,7 @@ for source_jar in "${app_source_jars[@]}"; do
   echo "copied ${app_workspace}/${source_jar} to '$deploy_path/$new_filename'"
 done
 
-cp -f ${biz_workspace}/"bonus-modules/bonus-houqin/target/bonus-smart-canteen.jar" $deploy_path
+cp -f ${biz_workspace}/"bonus-modules/bonus-houqin/target/bonus-smart-canteen-v2.jar" $deploy_path
 echo "copied ${app_workspace}/${source_jar} to $deploy_path"
 
 # Define an array of JAR files to run
@@ -44,7 +44,7 @@ jars=("bonus-auth-${jar_version}-bonus-houqin.jar --spring.config.location=file:
 "bonus-job-${jar_version}-bonus-houqin.jar --spring.config.location=file:job_bootstrap.yml"
 "bonus-file-${jar_version}-bonus-houqin.jar --spring.config.location=file:file_bootstrap.yml"
 "bonus-visual-monitor-${jar_version}-bonus-houqin.jar --spring.config.location=file:visual_bootstrap.yml"
-"bonus-smart-canteen.jar --spring.config.location=file:smart_canteen_bootstrap.yml")
+"bonus-smart-canteen-v2.jar --spring.config.location=file:smart_canteen_bootstrap.yml")
 
 # 遍历数组并检查每个JAR文件的进程
 for jar_with_args in "${jars[@]}"; do
diff --git a/scripts_244_bonus_houqin_test/kill-ps.sh b/scripts_244_bonus_houqin_test/kill-ps.sh
index b34cc855..3e0fddbd 100644
--- a/scripts_244_bonus_houqin_test/kill-ps.sh
+++ b/scripts_244_bonus_houqin_test/kill-ps.sh
@@ -4,8 +4,7 @@ SYS_RESOURCE_NAME=bonus-system-24.10.0-SNAPSHOT-bonus-houqin.jar
 JOB_RESOURCE_NAME=bonus-job-24.10.0-SNAPSHOT-bonus-houqin.jar
 FILE_RESOURCE_NAME=bonus-file-24.10.0-SNAPSHOT-bonus-houqin.jar
 MONITOR_RESOURCE_NAME=bonus-visual-monitor-24.10.0-SNAPSHOT-bonus-houqin.jar
-SMART_CANTEEN_RESOURCE_NAME=bonus-bonus-houqin.jar
-BONUS_CUST_AUTH_RESOURCE_NAME=bonus-cust-auth.jar
+SMART_CANTEEN_RESOURCE_NAME=bonus-smart-canteen-v2.jar
 
 
 tpid=`ps -ef|grep $AUTH_RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'`
@@ -112,18 +111,4 @@ else
 echo 'Stop Success!'
 fi
 
-tpid=`ps -ef|grep $BONUS_CUST_AUTH_RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'`
-if [ ${tpid} ]; then
-echo 'Stop Process...'
-kill -15 $tpid
-fi
-sleep 5
-tpid=`ps -ef|grep $BONUS_CUST_AUTH_RESOURCE_NAME|grep -v grep|grep -v kill|awk '{print $2}'`
-if [ ${tpid} ]; then
-echo 'Kill Process!'
-kill -9 $tpid
-else
-echo 'Stop Success!'
-fi
-