From a11aaa18e1b5f5f246c02e17f4db591b6be0ddfe Mon Sep 17 00:00:00 2001 From: "liu.chunxun" Date: Fri, 3 Apr 2026 18:01:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84start=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E9=87=8D=E5=A4=8D=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ docker-compose.yml | 23 ----------------------- generate_files.py | 8 ++++---- start.sh | 16 ++++++++++++---- yz_project.csv | 5 ----- 5 files changed, 18 insertions(+), 36 deletions(-) delete mode 100644 docker-compose.yml delete mode 100644 yz_project.csv diff --git a/.gitignore b/.gitignore index 76a553b..4f5a7c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .tmp *.tar +docker-compose.yml +yz_project.csv diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 97faf14..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: '3' -x-service-common: &service-common - image: swr.cn-north-4.myhuaweicloud.com/cloud-yuzhen/yuzhen_base:v1.0.11 - restart: always - volumes: - - ./yz_project.csv:/home/yz_project.csv - -services: - YZXHRAX86NN2511250011: - <<: *service-common - command: [ "/home/start.sh", "YZXHRAX86NN2511250011" ] - YZXHRAX86NN2511250012: - <<: *service-common - command: [ "/home/start.sh", "YZXHRAX86NN2511250012" ] - YZXHRAX86NN2511250013: - <<: *service-common - command: [ "/home/start.sh", "YZXHRAX86NN2511250013" ] - YZXHRAX86NN2511250014: - <<: *service-common - command: [ "/home/start.sh", "YZXHRAX86NN2511250014" ] - YZXHRAX86NN2511250015: - <<: *service-common - command: [ "/home/start.sh", "YZXHRAX86NN2511250015" ] \ No newline at end of file diff --git a/generate_files.py b/generate_files.py index c30030c..74a22a3 100644 --- a/generate_files.py +++ b/generate_files.py @@ -34,10 +34,10 @@ services:""" current_sn = f"{prefix}{current_num:04d}" # --- 生成 CSV 行 --- - # 格式: ${device_SN},Horseman-A21,H21.0.0.1,192.168.1.244,1883,mxpoty5rco1jhwde|${device_SN}|2,pykqg5qpzspfce3w,0,192.168.1.244,http://192.168.1.244/dlp/v1/device/backupAndRestore?sn=${device_SN},, + # 格式: ${device_SN},Horseman-A21,H21.0.0.1,121.36.13.175,1883,mxpoty5rco1jhwde|${device_SN}|2,pykqg5qpzspfce3w,0,121.36.13.175,http://121.36.13.175/dlp/v1/device/backupAndRestore?sn=${device_SN},, csv_line = ( - f"{current_sn},Horseman-A21,H21.0.0.1,192.168.1.244,1883,mxpoty5rco1jhwde|{current_sn}|2,pykqg5qpzspfce3w,0,192.168.1.244,http://192.168.1.244/dlp/v1/device/backupAndRestore?sn={current_sn}" + f"{current_sn},Horseman-A21,H21.0.0.1,121.36.13.175,1885,mxpoty5rco1jhwde|{current_sn}|2,pykqg5qpzspfce3w,0,121.36.13.175" ) csv_content.append(csv_line) @@ -64,8 +64,8 @@ services:""" if __name__ == "__main__": # --- 配置区域 --- - START_SN = "YZXHRAX86NN2511250001" # 起始序列号 - COUNT = 166 # 需要生成的个数 + START_SN = "YZXHRAX86NN2604030001" # 起始序列号 + COUNT = 2 # 需要生成的个数 # ---------------- generate_files(START_SN, COUNT) diff --git a/start.sh b/start.sh index 6cfdf55..8b77def 100755 --- a/start.sh +++ b/start.sh @@ -2,12 +2,20 @@ echo "start ssh" service ssh start -# 检查 Prod_connect.json 文件中 user 字段是否包含 $1 参数 -if jq --arg param "$1" '(.product.user | split("|") | contains([$param]))' /yuzhen_iot/prod_manage/cfg/Prod_connect.json; then - echo "Parameter $1 found in Prod_connect.json user field. Skipping plumber execution." + +FILE_PATH="/yuzhen_iot/prod_manage/cfg/Prod_connect.json" +SEARCH_TERM=$1 + +if [ -z "$SEARCH_TERM" ]; then + echo "使用错误: 请输入要检查的参数。" + exit 1 +fi + +if jq -e ".product.user | contains(\"$SEARCH_TERM\")" "$FILE_PATH" > /dev/null; then + echo "包含: 字段 'user' 中找到了 '$SEARCH_TERM'" else - echo "Parameter $1 not found in Prod_connect.json user field. Starting plumber..." /yuzhen_iot/prod_manage/app/plumber -project /home/yz_project.csv -S $1 + echo "不包含: 字段 'user' 中未找到 '$SEARCH_TERM'" fi echo "start scheduler" diff --git a/yz_project.csv b/yz_project.csv deleted file mode 100644 index 79f4750..0000000 --- a/yz_project.csv +++ /dev/null @@ -1,5 +0,0 @@ -YZXHRAX86NN2511250011,Horseman-A21,H21.0.0.1,106.75.75.68,1883,mxpoty5rco1jhwde|YZXHRAX86NN2511250011|2,pykqg5qpzspfce3w,0,106.75.75.68,http://106.75.75.68/dlp/v1/device/backupAndRestore -YZXHRAX86NN2511250012,Horseman-A21,H21.0.0.1,106.75.75.68,1883,mxpoty5rco1jhwde|YZXHRAX86NN2511250012|2,pykqg5qpzspfce3w,0,106.75.75.68,http://106.75.75.68/dlp/v1/device/backupAndRestore -YZXHRAX86NN2511250013,Horseman-A21,H21.0.0.1,106.75.75.68,1883,mxpoty5rco1jhwde|YZXHRAX86NN2511250013|2,pykqg5qpzspfce3w,0,106.75.75.68,http://106.75.75.68/dlp/v1/device/backupAndRestore -YZXHRAX86NN2511250014,Horseman-A21,H21.0.0.1,106.75.75.68,1883,mxpoty5rco1jhwde|YZXHRAX86NN2511250014|2,pykqg5qpzspfce3w,0,106.75.75.68,http://106.75.75.68/dlp/v1/device/backupAndRestore -YZXHRAX86NN2511250015,Horseman-A21,H21.0.0.1,106.75.75.68,1883,mxpoty5rco1jhwde|YZXHRAX86NN2511250015|2,pykqg5qpzspfce3w,0,106.75.75.68,http://106.75.75.68/dlp/v1/device/backupAndRestore \ No newline at end of file