feat: 参数修改

deploy.sh

@@ -2,7 +2,7 @@
 
 # 设置远程服务器信息
 REMOTE_USER="root"  # 远程服务器用户名，根据你的实际情况修改
-REMOTE_HOST="111.230.193.88" # 远程服务器地址
+REMOTE_HOST="129.204.227.215" # 远程服务器地址
 REMOTE_BASE_DIR="/home/software/fhzx"  # 远程服务器上的部署目录，根据你的目录结构修改
 
 # 本地 JAR 包路径  -- 根据你提供的目录结构修改
@@ -25,7 +25,21 @@ check_local_file "$LOCAL_FS_USER_APP_JAR"
 # 停止远程服务器上可能正在运行的旧版本（假设进程名与 JAR 包名相同）
 stop_remote_app() {
   local app_name=$1
-  ssh "$REMOTE_USER@$REMOTE_HOST" "pkill -f $app_name || true"
+  local remote_dir=$2
+  local full_path="$REMOTE_BASE_DIR/$remote_dir/$app_name.jar"
+
+  echo "Stopping $app_name in $remote_dir..."
+
+  # 获取运行该JAR包的进程ID
+  local pid=$(ssh "$REMOTE_USER@$REMOTE_HOST" "ps -ef | grep '$full_path' | grep -v grep | awk '{print \$2}'")
+
+  if [ -n "$pid" ]; then
+    echo "Found process ID: $pid for $app_name, stopping it..."
+    ssh "$REMOTE_USER@$REMOTE_HOST" "kill -15 $pid && sleep 3 && kill -9 $pid 2>/dev/null || true"
+    echo "Process stopped."
+  else
+    echo "No running process found for $app_name."
+  fi
 }
 
 # 部署单个 JAR 包

fs-service-system/src/main/resources/application-config.yml

@@ -14,7 +14,7 @@ fsConfig:
   erpSessionKey: 9caae15474cb443ea22235e7bb86016b
   erpSecret: 96f774dbd60847b59a16f92fd963a0c8
   erpUrl: http://v2.api.guanyierp.com/rest/erp_open
-  erpShopCode: "0080"
+  erpShopCode: "0085"
 
   #第三方支付配置
   payOpen: 1
@@ -54,7 +54,7 @@ jst:
   app_key: bd7a7d06a6d54377842f883f9a4c502a
   app_secret: 1d112cb9d21d41e187ff824b5852f4cf
   authorization_code: zzzzzz
-  shop_code: "18461733"
+  shop_code: "18845364"
 logging:
   level:
     org.springframework.web: INFO
@@ -72,8 +72,8 @@ wx:
     configs:
 #      - appid: wx36b87a0820734de8
 #        secret: 52700f5c811ed902a53ee3a358b29135
-      - appid: wx19c8813ffc33d1cb
-        secret: 38caf1e4f67c1d65061176d6157522a9
+      - appid: wx6240d298e0aba8e7
+        secret: 1e5f1c01ae48452c31ed5cd946e66d85
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON