解决jq命令不存在问题、json字符串格式问题.

L1/dockerfiles/csst-msc-l1-ooc/Dockerfile

 FROM csu-harbor.csst.nao:10443/csst/csst-msc-l1-ooc
 
 USER root
+# 安装jq
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends jq \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
 COPY run.sh /app/bin/
 RUN chmod +x /app/bin/run.sh
 COPY --from=hub.cstcloud.cn/scalebox/agent /usr/local /usr/local

L1/dockerfiles/csst-msc-l1-ooc/run.sh

@@ -18,7 +18,10 @@ if [ "$has_data_list" = "true" ]; then
     fixed_data_list=$(echo "$data_list" | sed 's/\([a-f0-9]\{24\}\)/"\1"/g')
     # 将 data_list 重新插入回 message
     message=$(echo "$message" | jq --argjson dl "$fixed_data_list" '. + {data_list: $dl}')
+    message=$(echo "$message" | jq -c '.')
 fi
+
+echo "run.py message : $message"
 cd /pipeline/output/
 python /pipeline/app/run.py $message
 

L1/dockerfiles/csst-msc-l1-qc0/Dockerfile

 FROM csu-harbor.csst.nao:10443/csst/csst-msc-l1-qc0
 
 USER root
+# 安装jq
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends jq \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 COPY run.sh /app/bin/
 RUN chmod +x /app/bin/run.sh
 COPY --from=hub.cstcloud.cn/scalebox/agent /usr/local /usr/local

L1/dockerfiles/csst-msc-l1-qc0/run.sh

@@ -15,6 +15,7 @@ if [ "$has_data_list" = "true" ]; then
     fixed_data_list=$(echo "$data_list" | sed 's/\([a-f0-9]\{24\}\)/"\1"/g')
     # 将 data_list 重新插入回 message
     message=$(echo "$message" | jq --argjson dl "$fixed_data_list" '. + {data_list: $dl}')
+    message=$(echo "$message" | jq -c '.')
 fi
 cd /pipeline/output/
 python /pipeline/app/run.py $message

L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile

 FROM csu-harbor.csst.nao:10443/csst/csst-msc-l1-sls
 
 USER root
+# 安装jq
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends jq \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 COPY run.sh /app/bin/
 RUN chmod +x /app/bin/run.sh
 COPY --from=hub.cstcloud.cn/scalebox/agent /usr/local /usr/local

L1/dockerfiles/csst-msc-l1-sls2d/run.sh

@@ -18,6 +18,7 @@ if [ "$has_data_list" = "true" ]; then
     fixed_data_list=$(echo "$data_list" | sed 's/\([a-f0-9]\{24\}\)/"\1"/g')
     # 将 data_list 重新插入回 message
     message=$(echo "$message" | jq --argjson dl "$fixed_data_list" '. + {data_list: $dl}')
+    message=$(echo "$message" | jq -c '.')
 fi
 
 cd /pipeline/output/

L1/dockerfiles/redis-cli/Dockerfile

 FROM hub.cstcloud.cn/scalebox/agent
 
+# 设置时区
+ENV TZ=Asia/Shanghai
+
 # 安装redis-cli
 RUN apt-get update \
     && apt-get install -y redis \
-    && apt-get install jq
+    && apt-get install -y --no-install-recommends jq \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 ENTRYPOINT []
 
 #ENV REDIS_SERVER=10.0.0.9

L1/dockerfiles/redis-cli/run.sh

@@ -27,6 +27,7 @@ while true
 do 
     msg=$(redis-cli -h ${REDIS_SERVER} -p ${REDIS_PORT} -a ${REDIS_PWD} -n ${REDIS_DB} rpop csst_data_list)
     #msg=$(redis-cli -h 192.168.25.205 -p 26379 -a 123456 rpop csst_data_list)
+    allmsg=$msg
     echo "msg : "$msg
 
     if [ -z "$msg" ]; then
@@ -61,7 +62,7 @@ do
         
         # 日志轮转
         rotate_logs
-        echo "$(date)    massage :"$message >> "$LOG_FILE"
+        echo "$(date)    massage :"$allmsg >> "$LOG_FILE"
         #send-message $obsid
         job_name="message-router-csst"