完善start脚本,避免重复动态注册
This commit is contained in:
@@ -1,2 +1,4 @@
|
|||||||
.tmp
|
.tmp
|
||||||
*.tar
|
*.tar
|
||||||
|
docker-compose.yml
|
||||||
|
yz_project.csv
|
||||||
|
|||||||
@@ -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" ]
|
|
||||||
+4
-4
@@ -34,10 +34,10 @@ services:"""
|
|||||||
current_sn = f"{prefix}{current_num:04d}"
|
current_sn = f"{prefix}{current_num:04d}"
|
||||||
|
|
||||||
# --- 生成 CSV 行 ---
|
# --- 生成 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 = (
|
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)
|
csv_content.append(csv_line)
|
||||||
|
|
||||||
@@ -64,8 +64,8 @@ services:"""
|
|||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
# --- 配置区域 ---
|
# --- 配置区域 ---
|
||||||
START_SN = "YZXHRAX86NN2511250001" # 起始序列号
|
START_SN = "YZXHRAX86NN2604030001" # 起始序列号
|
||||||
COUNT = 166 # 需要生成的个数
|
COUNT = 2 # 需要生成的个数
|
||||||
# ----------------
|
# ----------------
|
||||||
|
|
||||||
generate_files(START_SN, COUNT)
|
generate_files(START_SN, COUNT)
|
||||||
|
|||||||
@@ -2,12 +2,20 @@
|
|||||||
echo "start ssh"
|
echo "start ssh"
|
||||||
service ssh start
|
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
|
FILE_PATH="/yuzhen_iot/prod_manage/cfg/Prod_connect.json"
|
||||||
echo "Parameter $1 found in Prod_connect.json user field. Skipping plumber execution."
|
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
|
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
|
/yuzhen_iot/prod_manage/app/plumber -project /home/yz_project.csv -S $1
|
||||||
|
echo "不包含: 字段 'user' 中未找到 '$SEARCH_TERM'"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "start scheduler"
|
echo "start scheduler"
|
||||||
|
|||||||
@@ -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
|
|
||||||
|
Reference in New Issue
Block a user