From f027fa6c3f8c6c55714fb9dbd6aac2fcc98f68f2 Mon Sep 17 00:00:00 2001 From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com> Date: Fri, 24 Jan 2025 13:11:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E7=BD=B2=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=92=8C=E9=85=8D=E7=BD=AE=EF=BC=8C=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E5=88=B00.16=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus-ai/src/main/resources/bootstrap.yml | 12 ++++++++---- scripts/ai_bootstrap.yml | 8 ++++---- scripts/auth_bootstrap.yml | 8 ++++---- scripts/deploy.sh | 14 ++++++-------- scripts/file_bootstrap.yml | 8 ++++---- scripts/gateway_bootstrap.yml | 8 ++++---- scripts/gen_bootstrap.yml | 8 ++++---- scripts/job_bootstrap.yml | 8 ++++---- scripts/system_bootstrap.yml | 8 ++++---- 9 files changed, 42 insertions(+), 40 deletions(-) diff --git a/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml b/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml index ce6e884..122b606 100644 --- a/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-ai/src/main/resources/bootstrap.yml @@ -21,13 +21,17 @@ spring: password: nacos discovery: # 服务注册地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.16:18848 + namespace: bonus-ai + username: nacos + password: nacos config: # 配置中心地址 - server-addr: 192.168.0.14:8848 - namespace: f648524d-0a7b-449e-8f92-64e05236fd51 + server-addr: 192.168.0.16:18848 + namespace: bonus-ai + username: nacos + password: nacos # 配置文件格式 file-extension: yml diff --git a/scripts/ai_bootstrap.yml b/scripts/ai_bootstrap.yml index f320b60..0ab0a4e 100644 --- a/scripts/ai_bootstrap.yml +++ b/scripts/ai_bootstrap.yml @@ -21,12 +21,12 @@ spring: password: nacos discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: 9e2bf9d8-4515-4dfb-aeac-e10bc2b26294 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai config: # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: 9e2bf9d8-4515-4dfb-aeac-e10bc2b26294 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai # 配置文件格式 file-extension: yml # 共享配置 diff --git a/scripts/auth_bootstrap.yml b/scripts/auth_bootstrap.yml index d495590..55a8ed6 100755 --- a/scripts/auth_bootstrap.yml +++ b/scripts/auth_bootstrap.yml @@ -16,12 +16,12 @@ spring: password: nacos discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: 9e2bf9d8-4515-4dfb-aeac-e10bc2b26294 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai config: # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: 9e2bf9d8-4515-4dfb-aeac-e10bc2b26294 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai # 配置文件格式 file-extension: yml # 共享配置 diff --git a/scripts/deploy.sh b/scripts/deploy.sh index f455f4c..9789525 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash -export deploy_path=/opt/webapps/bonus-ai-v2 +export deploy_path=/data/ceshi/gqk/bonus-ai-v2 export app_workspace=/home/jenkins/workspace/Bonus-Cloud export ai_workspace=/home/jenkins/workspace/Bonus-Cloud-AI-V2 @@ -12,12 +12,9 @@ app_source_jars=( "bonus-auth/target/bonus-auth.jar" "bonus-gateway/target/bonus-gateway.jar" "bonus-modules/bonus-system/target/bonus-system.jar" + "bonus-modules/bonus-file/target/bonus-file.jar" ) -#for source_jar in "${app_source_jars[@]}"; do -# cp -f ${app_workspace}/${source_jar} $deploy_path -# echo "copied ${app_workspace}/${source_jar} to $deploy_path" -#done for source_jar in "${app_source_jars[@]}"; do # 获取文件名（不带目录路径） filename=$(basename "$source_jar") @@ -29,17 +26,18 @@ for source_jar in "${app_source_jars[@]}"; do new_filename="${base_name}${suffix}.jar" echo "filename:$new_filename" - cp -f ${app_workspace}/${source_jar} "$deploy_path/$new_filename" + scp -P 22 -r ${app_workspace}/${source_jar} "root@192.168.0.16:$deploy_path/$new_filename" echo "copied ${app_workspace}/${source_jar} to '$deploy_path/$new_filename'" done -cp -f ${ai_workspace}/"bonus-modules/bonus-ai/target/bonus-modules-ai-v2.jar" $deploy_path +scp -P 22 -r ${ai_workspace}/"bonus-modules/bonus-ai/target/bonus-modules-ai-v2.jar" root@192.168.0.16:$deploy_path echo "copied ${app_workspace}/${source_jar} to $deploy_path" # Define an array of JAR files to run jars=("bonus-auth-ai-v2.jar --spring.config.location=file:auth_bootstrap.yml" "bonus-gateway-ai-v2.jar --spring.config.location=file:gateway_bootstrap.yml" -"bonus-system-ai-v2.jar --spring.config.location=file:system_bootstrap.yml") +"bonus-system-ai-v2.jar --spring.config.location=file:system_bootstrap.yml" +"bonus-file-ai-V2.jar --spring.config.location=file:file_bootstrap.yml") # 遍历数组并检查每个JAR文件的进程 for jar_with_args in "${jars[@]}"; do diff --git a/scripts/file_bootstrap.yml b/scripts/file_bootstrap.yml index fc98c91..1ad73d5 100755 --- a/scripts/file_bootstrap.yml +++ b/scripts/file_bootstrap.yml @@ -16,12 +16,12 @@ spring: password: nacos discovery: # 服务注册地址 - server-addr: 192.168.0.56:8848 - namespace: 39c95294-eb64-4096-ada1-30a215bdd511 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai config: # 配置中心地址 - server-addr: 192.168.0.56:8848 - namespace: 39c95294-eb64-4096-ada1-30a215bdd511 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai # 配置文件格式 file-extension: yml # 共享配置 diff --git a/scripts/gateway_bootstrap.yml b/scripts/gateway_bootstrap.yml index 34276d7..88aa129 100755 --- a/scripts/gateway_bootstrap.yml +++ b/scripts/gateway_bootstrap.yml @@ -17,12 +17,12 @@ spring: password: nacos discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: 9e2bf9d8-4515-4dfb-aeac-e10bc2b26294 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai config: # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: 9e2bf9d8-4515-4dfb-aeac-e10bc2b26294 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai # 配置文件格式 file-extension: yml # 共享配置 diff --git a/scripts/gen_bootstrap.yml b/scripts/gen_bootstrap.yml index 1d4beb6..df70256 100755 --- a/scripts/gen_bootstrap.yml +++ b/scripts/gen_bootstrap.yml @@ -16,12 +16,12 @@ spring: password: nacos discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: 9e2bf9d8-4515-4dfb-aeac-e10bc2b26294 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai config: # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: 9e2bf9d8-4515-4dfb-aeac-e10bc2b26294 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai # 配置文件格式 file-extension: yml # 共享配置 diff --git a/scripts/job_bootstrap.yml b/scripts/job_bootstrap.yml index 291cf5f..3495ecd 100755 --- a/scripts/job_bootstrap.yml +++ b/scripts/job_bootstrap.yml @@ -16,12 +16,12 @@ spring: password: nacos discovery: # 服务注册地址 - server-addr: 192.168.0.56:8848 - namespace: 39c95294-eb64-4096-ada1-30a215bdd511 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai config: # 配置中心地址 - server-addr: 192.168.0.56:8848 - namespace: 39c95294-eb64-4096-ada1-30a215bdd511 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai # 配置文件格式 file-extension: yml # 共享配置 diff --git a/scripts/system_bootstrap.yml b/scripts/system_bootstrap.yml index baed1ee..3d98743 100755 --- a/scripts/system_bootstrap.yml +++ b/scripts/system_bootstrap.yml @@ -16,12 +16,12 @@ spring: password: nacos discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 - namespace: 9e2bf9d8-4515-4dfb-aeac-e10bc2b26294 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai config: # 配置中心地址 - server-addr: 127.0.0.1:8848 - namespace: 9e2bf9d8-4515-4dfb-aeac-e10bc2b26294 + server-addr: 127.0.0.1:18848 + namespace: bonus-ai # 配置文件格式 file-extension: yml # 共享配置