From 9552b1aaa4fe8c7b063d005dd7e94e116e9a515c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 22 May 2025 10:52:52 +0800 Subject: [PATCH] xxx --- environment.sh | 8 ++++-- nginx/vhosts/dsp.conf | 40 ++++++++++++++++++++++++++ nginx/vhosts/hhz.conf | 54 +++++++++++++++++++++++++++++++++++ start/dspapi.sh | 44 ++++++++++++++++++++++++++++ start/gateway/application.yml | 8 +++--- start/hhzapi.sh | 42 +++++++++++++++++++++++++++ start/说明.md | 14 ++++++++- 7 files changed, 202 insertions(+), 8 deletions(-) create mode 100644 nginx/vhosts/dsp.conf create mode 100644 nginx/vhosts/hhz.conf create mode 100755 start/dspapi.sh create mode 100755 start/hhzapi.sh diff --git a/environment.sh b/environment.sh index 672a469..f7139d7 100644 --- a/environment.sh +++ b/environment.sh @@ -18,6 +18,8 @@ export MINIO_DOMAIN=minio-${DOMAIN}.${DOMAIN_END} export MINIO_CONSOLE_DOMAIN=minioconsole-${DOMAIN}.${DOMAIN_END} export AIRPORT_DOMAIN=airport-${DOMAIN}.${DOMAIN_END} export SRS_DOMAIN=srs-${DOMAIN}.${DOMAIN_END} +export HHZ_DOMAIN=hhz-${DOMAIN}.${DOMAIN_END} +export DSP_DOMAIN=dsp-${DOMAIN}.${DOMAIN_END} export REGISTRY_HOST=${REGISTRY}/tuoheng/ #export REGISTRY_HOST="" @@ -160,13 +162,13 @@ export HHZ_API_NAME=HHZ-API${DOMAIN} export HHZ_API_IMAGE=${REGISTRY_HOST}hhzapi:${DOMAIN} export HHZ_API_JAR=tuoheng_hhz_api.jar export HHZ_API_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/hhz-api/${HHZ_API_JAR} -export HHZ_API_MEMORY=512m +export HHZ_API_MEMORY=1g #河湖长 export HHZ_ADMIN_NAME=HHZ-ADMIN${DOMAIN} 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=512m +export HHZ_ADMIN_MEMORY=1g #机场平台 export AIRPORT_NAME=AIRPORT${DOMAIN} export AIRPORT_IMAGE=${REGISTRY_HOST}airport:${DOMAIN} @@ -189,7 +191,7 @@ export DSP_API_NAME=DSP-API${DOMAIN} export DSP_API_IMAGE=${REGISTRY_HOST}dspapi:${DOMAIN} export DSP_API_JAR=tuoheng_dsp_api.jar export DSP_API_REMOTE_JAR=/home/th/workspace/test/swarm/dockerfile/dsp-api/${DSP_API_JAR} -export DSP_API_MEMORY=512m +export DSP_API_MEMORY=1g export DSP_ADMIN_NAME=DSP-ADMIN${DOMAIN} export DSP_ADMIN_IMAGE=${REGISTRY_HOST}dspadmin:${DOMAIN} diff --git a/nginx/vhosts/dsp.conf b/nginx/vhosts/dsp.conf new file mode 100644 index 0000000..4211e68 --- /dev/null +++ b/nginx/vhosts/dsp.conf @@ -0,0 +1,40 @@ + server + { + listen 80; + listen 443 ssl; + server_name ${DSP_DOMAIN}; + root /data/dsp_admin_web/dist; + + # SSL证书配置 + ssl_certificate /etc/nginx/t-aaron.com.pem; + ssl_certificate_key /etc/nginx/t-aaron.com.key; + ssl_session_timeout 5m; + ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; + ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; + ssl_prefer_server_ciphers on; + + # 开启gzip功能 + gzip on; + gzip_min_length 10k; + gzip_comp_level 9; + gzip_types text/plain text/css application/javascript application/x-javascript text/javascript application/xml; + gzip_vary on; + gzip_disable "MSIE [1-6]\."; + + location /{ + try_files $uri $uri/ @router; + index index.html; + } + + location @router{ + rewrite ^.*$ /index.html last; + } + + + location /api { + proxy_pass http://gatewayService; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + } \ No newline at end of file diff --git a/nginx/vhosts/hhz.conf b/nginx/vhosts/hhz.conf new file mode 100644 index 0000000..59e3810 --- /dev/null +++ b/nginx/vhosts/hhz.conf @@ -0,0 +1,54 @@ + server + { + listen 80; + listen 443 ssl; + server_name ${HHZ_DOMAIN}; + root /data/tuoheng_hhz_web/dist; + + # SSL证书配置 + ssl_certificate /etc/nginx/t-aaron.com.pem; + ssl_certificate_key /etc/nginx/t-aaron.com.key; + ssl_session_timeout 5m; + ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; + ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; + ssl_prefer_server_ciphers on; + + # 开启gzip功能 + gzip on; + gzip_min_length 10k; + gzip_comp_level 9; + gzip_types text/plain text/css application/javascript application/x-javascript text/javascript application/xml; + gzip_vary on; + gzip_disable "MSIE [1-6]\."; + + location /{ + try_files $uri $uri/ @router; + index index.html; + } + + location @router{ + rewrite ^.*$ /index.html last; + } + + + location /permission { + proxy_pass http://${HHZ_ADMIN_NAME}:9055; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + location /wxapp { + proxy_pass http://${HHZ_API_NAME}:9056/api; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + location /hhz { + proxy_pass http://gatewayService/hhz; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + } \ No newline at end of file diff --git a/start/dspapi.sh b/start/dspapi.sh new file mode 100755 index 0000000..0ecb68f --- /dev/null +++ b/start/dspapi.sh @@ -0,0 +1,44 @@ +source ../environment.sh + + +if docker ps -a | grep -q ${DSP_API_NAME}; then + echo "停止并删除已存在的 DSP_API_NAME 容器..." + docker stop ${DSP_API_NAME} >/dev/null 2>&1 + docker rm ${DSP_API_NAME} >/dev/null 2>&1 +fi + + +docker run --pull always -d \ +--name ${DSP_API_NAME} \ +--network ${NETWORK} \ +--env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ +--env SPRING_CLOUD_CONSUL_PORT=${CONSUL_PORT} \ +--env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${DSP_API_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_DRUID_URL="jdbc:mysql://${MYSQL_NAME}:3306/tuoheng_dsp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false" \ +--env SPRING_DATASOURCE_DRUID_USERNAME=root \ +--env SPRING_DATASOURCE_DRUID_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_PUSH_URL=rtmp://${SRS_DOMAIN}:${SRS_RTMP_PORT}/live/ \ +--env TUOHENG_PULL_URL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/live/ \ +--env TZ=Asia/Shanghai \ +--mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ +--memory ${DSP_API_MEMORY} \ +--restart unless-stopped \ +${DSP_API_IMAGE} \ No newline at end of file diff --git a/start/gateway/application.yml b/start/gateway/application.yml index bf0066e..1308260 100644 --- a/start/gateway/application.yml +++ b/start/gateway/application.yml @@ -105,7 +105,7 @@ spring: - StripPrefix=2 # DSP api服务 - id: tuoheng-dsp-api - uri: http://dsp-api:9015 + uri: http://${DSP_API_NAME}:9015 predicates: - Path=/api/web/** filters: @@ -119,14 +119,14 @@ spring: - StripPrefix=2 # hhz admin服务 - id: tuoheng-hhz-admin - uri: http://hhz-admin:9055 + uri: http://${HHZ_ADMIN_NAME}:9055 predicates: - Path=/hhz/admin/** filters: - StripPrefix=2 # hhz 小程序服务 - id: tuoheng-hhz-api - uri: http://hhz-api:9056 + uri: http://${HHZ_API_NAME}:9056 predicates: - Path=/hhz/api/** filters: @@ -159,7 +159,7 @@ security: # 获取 apiUrl 可访问的 roleIdList tuoheng: - hhz-admin-perUrl: http://hhz-admin:9055/permission/getRoleIdList + hhz-admin-perUrl: http://${HHZ_ADMIN_NAME}:9055/permission/getRoleIdList airport-admin-perUrl: http://${AIRPORT_NAME}:9060/permission/getRoleIdList freeway-admin-perUrl: http://freeway-admin:9117/permission/getRoleIdList waterway-admin-perUrl: https://waterway.t-aaron.com/permission/getRoleIdList diff --git a/start/hhzapi.sh b/start/hhzapi.sh new file mode 100755 index 0000000..e28702f --- /dev/null +++ b/start/hhzapi.sh @@ -0,0 +1,42 @@ +source ../environment.sh + + +if docker ps -a | grep -q ${HHZ_API_NAME}; then + echo "停止并删除已存在的 HHZ_API_NAME 容器..." + docker stop ${HHZ_API_NAME} >/dev/null 2>&1 + docker rm ${HHZ_API_NAME} >/dev/null 2>&1 +fi + + +docker run --pull always -d \ +--name ${HHZ_API_NAME} \ +--network ${NETWORK} \ +--env SPRING_CLOUD_CONSUL_HOST=${CONSUL_NAME} \ +--env SPRING_CLOUD_CONSUL_PORT=${CONSUL_PORT} \ +--env SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME=${HHZ_API_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 TZ=Asia/Shanghai \ +--mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ +--memory ${HHZ_API_MEMORY} \ +--restart unless-stopped \ +${HHZ_API_IMAGE} \ No newline at end of file diff --git a/start/说明.md b/start/说明.md index 396c935..bc20055 100644 --- a/start/说明.md +++ b/start/说明.md @@ -16,6 +16,17 @@ nginx的vhosts里面的cert文件需要更新为域名的配置文件 docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic business-update-dataPermissions-task docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic dsp-alg-online-tasks docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic dsp-alg-offline-tasks + + docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic dsp-alg-image-tasks + docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic dsp-alg-task-results + docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic dsp-local + docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic dsp-recording-task + docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic dsp-recording-result + docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic dsp-recording-local + docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic dsp-push-stream-task + docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic dsp-push-stream-result + docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server 127.0.0.1:9092 --topic dsp-push-stream-local + docker exec KAFKA_bazhong /opt/bitnami/kafka/bin/kafka-topics.sh --bootstrap-server 127.0.0.1:9092 --list 3: 建minio的权限 @@ -27,7 +38,8 @@ nginx的vhosts里面的cert文件需要更新为域名的配置文件 部署在巴中： - dsp只需要dsp-api + dsp-api + hhz-admin hhz-api 部署在大数据服务器： 低空（预备）