From e7a6e47730fb4f5f152a2e1862dc82c00ad52e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Thu, 22 May 2025 15:35:05 +0800
Subject: [PATCH] xxx

---
 environment.sh    | 28 ++++++++++++++--------------
 start/hhzadmin.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100755 start/hhzadmin.sh

diff --git a/environment.sh b/environment.sh
index 9aaa0cc..564aca1 100644
--- a/environment.sh
+++ b/environment.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 # 定基本环境变量并导出
 # 不同的环境采用不同的DOMAIN
-export ENV=LOCAL
-export DOMAIN=bazhong
+if [ -z "${DOMAIN}" ]; then
+    export DOMAIN=bazhong
+    echo "环境变量 DOMAIN 未设置，设置为默认值 ${DOMAIN}"
+fi
 export NETWORK="swarm_network_$DOMAIN"
 # 镜像仓库地址
 export REGISTRY=registry.t-aaron.com
@@ -168,25 +170,23 @@ export HHZ_ADMIN_IMAGE=${REGISTRY_HOST}hhzadmin:${DOMAIN}
 export HHZ_ADMIN_JAR=tuoheng_hhz_admin.jar
 export HHZ_ADMIN_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/hhz-admin/${HHZ_ADMIN_JAR}
 export HHZ_ADMIN_MEMORY=1g
-if [ "$ENV" == "LOCAL" ]; then
+if [ -z "${HHZ_ADMIN_WEB_DIST}" ]; then
     export HHZ_ADMIN_WEB_DIST=/Users/sunpeng/workspace/empty
-else
-    export HHZ_ADMIN_WEB_DIST=/data/tuoheng_hhz_web/dist
+    echo "环境变量 HHZ_ADMIN_WEB_DIST 未设置，设置为默认值 ${HHZ_ADMIN_WEB_DIST}"
 fi
 
+
 #机场平台
 export AIRPORT_NAME=AIRPORT${DOMAIN}
 export AIRPORT_IMAGE=${REGISTRY_HOST}airport:${DOMAIN}
 export AIRPORT_JAR=tuoheng_airport_admin.jar
-if [ "$ENV" == "LOCAL" ]; then
+if [ -z "${AIRPORT_REMOTE_JAR}" ]; then
     export AIRPORT_REMOTE_JAR=/Users/sunpeng/workspace/remote/tuoheng_airport/tuoheng-admin/target/${AIRPORT_JAR}
-else
-    export AIRPORT_REMOTE_JAR=/home/th/workspace/jndsj/jar/airport/${AIRPORT_JAR}
+    echo "环境变量 AIRPORT_REMOTE_JAR 未设置，设置为默认值 ${AIRPORT_REMOTE_JAR}"
 fi
-if [ "$ENV" == "LOCAL" ]; then
+if [ -z "${AIRPORT_WEB_DIST}" ]; then
     export AIRPORT_WEB_DIST=/Users/sunpeng/workspace/remote/docker/tuoheng_airport_web/dist
-else
-    export AIRPORT_WEB_DIST=/home/th/workspace/jndsj/web/tuoheng_airport_web/dist
+    echo "环境变量 AIRPORT_WEB_DIST 未设置，设置为默认值 ${AIRPORT_WEB_DIST}"
 fi
 export AIRPORT_MEMORY=1g
 
@@ -209,12 +209,12 @@ export DSP_ADMIN_IMAGE=${REGISTRY_HOST}dspadmin:${DOMAIN}
 export DSP_ADMIN_JAR=tuoheng_dsp_admin.jar
 export DSP_ADMIN_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-admin/${DSP_ADMIN_JAR}
 export DSP_ADMIN_MEMORY=512m
-if [ "$ENV" == "LOCAL" ]; then
+if [ -z "${DSP_ADMIN_WEB_DIST}" ]; then
     export DSP_ADMIN_WEB_DIST=/Users/sunpeng/workspace/empty
-else
-    export DSP_ADMIN_WEB_DIST=/data/dsp_admin_web/dist
+    echo "环境变量 HHZ_ADMIN_WEB_DIST 未设置，设置为默认值 ${DSP_ADMIN_WEB_DIST}"
 fi
 
+
 export DSP_INSPECTION_NAME=DSP-INSPECTION${DOMAIN}
 export DSP_INSPECTION_IMAGE=${REGISTRY_HOST}dspinspection:${DOMAIN}
 export DSP_INSPECTION_JAR=tuoheng_dsp_inspection.jar
diff --git a/start/hhzadmin.sh b/start/hhzadmin.sh
new file mode 100755
index 0000000..2f39f80
--- /dev/null
+++ b/start/hhzadmin.sh
@@ -0,0 +1,44 @@
+source ../environment.sh
+ 
+
+if docker ps -a | grep -q ${HHZ_ADMIN_NAME}; then
+    echo "停止并删除已存在的 HHZ_ADMIN_NAME 容器..."
+    docker stop ${HHZ_ADMIN_NAME} >/dev/null 2>&1
+    docker rm ${HHZ_ADMIN_NAME} >/dev/null 2>&1
+fi
+
+
+docker run --pull always -d \
+--name ${HHZ_ADMIN_NAME} \
+--network ${NETWORK} \
+--env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \
+--env SPRING_CLOUD_CONSUL_PORT=${CONSUL_PORT} \
+--env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${HHZ_ADMIN_NAME} \
+--env XXL_JOB_ADMIN_ADDRESSES=${XXLJOB_NAME}:${XXLJOB_PORT} \
+--env XXL_ENABLE=false \
+--env SPRING_REDIS_HOST=${REDIS_NAME} \
+--env SPRING_REDIS_PORT=6379 \
+--env SPRING_DATASOURCE_URL="jdbc:mysql://${MYSQL_NAME}:3306/tuoheng_hhz?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \
+--env SPRING_DATASOURCE_USERNAME=root \
+--env SPRING_DATASOURCE_PASSWORD=${MYSQL_ROOT_PASSWORD} \
+--env SPRING_MQTT_ONLINEURL=tcp://${MQTT_NAME}:1883 \
+--env SPRING_MQTT_URL=tcp://${MQTT_NAME}:1883 \
+--env SPRING_MQTT_NEWURL=tcp://${MQTT_NAME}:1883 \
+--env SPRING_NEWMQTT_ONLINEURL=tcp://${MQTT_NAME}:1883 \
+--env SPRING_NEWMQTT_URL=tcp://${MQTT_NAME}:1883 \
+--env SPRING_NEWMQTT_NEWURL=tcp://${MQTT_NAME}:1883 \
+--env VIDEO_SERVER_REQUEST_URL=http://${STREAM_NAME}:8080 \
+--env VIDEO_SERVER_VIDEO_PLAY_URL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/recording/ \
+--env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:9092 \
+--env MINIO_OSS_ENDPOINT=http://${MINIO_NAME}:9000 \
+--env MINIO_OSS_OUTENDPOINT=https://${MINIO_DOMAIN}:${NGINX_HTTPS_PORT} \
+--env MINIO_DAJIOSS_ENDPOINT=https://${MINIO_DOMAIN}:${NGINX_HTTPS_PORT} \
+--env MINIO_OSS_ACCESSKEYID=${MINIO_ACCESS_KEY} \
+--env MINIO_OSS_ACCESSKEYSECRET=${MINIO_SECRET_KEY} \
+--env TUOHENG_DSP_DOMAIN_URL=http://${DSP_API_NAME}:9015/ \
+--env TUOHENG_DSP_CALLBACK_URL=http://${HHZ_API_NAME}:9055/api/dsp/{requestId}/callback \
+--env TZ=Asia/Shanghai \
+--mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \
+--memory ${HHZ_ADMIN_MEMORY} \
+--restart unless-stopped \
+${HHZ_ADMIN_IMAGE}
\ No newline at end of file