diff --git a/environment.sh b/environment.sh index aa32106..885ef73 100644 --- a/environment.sh +++ b/environment.sh @@ -69,6 +69,7 @@ export SRS_DOMAIN_FULL=${SRS_DOMAIN}:${NGINX_HTTPS_PORT} export HHZ_DOMAIN=hhz-${DOMAIN}.${DOMAIN_END} export HHZ_DOMAIN_FULL=${HHZ_DOMAIN}:${NGINX_HTTPS_PORT} export DSP_DOMAIN=dsp-${DOMAIN}.${DOMAIN_END} +export DSP_DOMAIN_FULL=${DSP_DOMAIN}:${NGINX_HTTPS_PORT} export REGISTRY_HOST=${REGISTRY}/tuoheng/ export KAFKA_DOMAIN=kafka-${DOMAIN}.${DOMAIN_END} diff --git a/start/business.sh b/start/business.sh index d2b2ac8..371ebad 100755 --- a/start/business.sh +++ b/start/business.sh @@ -31,7 +31,7 @@ docker run --pull always -d \ --env SPRING_NEWMQTT_NEWURL=tcp://${MQTT_NAME}:1883 \ --env VIDEOSERVER_REQUESTURL=http://${STREAM_NAME}:8080 \ --env VIDEOSERVER_VIDEOPLAYURL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/recording/ \ ---env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:9092 \ +--env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:${KAFKA_PORT} \ --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} \ diff --git a/start/dspadmin.sh b/start/dspadmin.sh index 6998cb8..7ef839b 100755 --- a/start/dspadmin.sh +++ b/start/dspadmin.sh @@ -30,7 +30,7 @@ docker run --pull always -d \ --env SPRING_NEWMQTT_NEWURL=tcp://${MQTT_NAME}:1883 \ --env VIDEOSERVER_REQUESTURL=http://${STREAM_NAME}:8080 \ --env VIDEOSERVER_VIDEOPLAYURL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/recording/ \ ---env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:9092 \ +--env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:${KAFKA_PORT} \ --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} \ diff --git a/start/dspinspection.sh b/start/dspinspection.sh index 5f9c3fe..da31b2e 100755 --- a/start/dspinspection.sh +++ b/start/dspinspection.sh @@ -30,7 +30,7 @@ docker run --pull always -d \ --env SPRING_NEWMQTT_NEWURL=tcp://${MQTT_NAME}:1883 \ --env VIDEOSERVER_REQUESTURL=http://${STREAM_NAME}:8080 \ --env VIDEOSERVER_VIDEOPLAYURL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/recording/ \ ---env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:9092 \ +--env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:${KAFKA_PORT} \ --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} \ diff --git a/start/dspmini.sh b/start/dspmini.sh index 93ac52c..aef1fe3 100755 --- a/start/dspmini.sh +++ b/start/dspmini.sh @@ -30,7 +30,7 @@ docker run --pull always -d \ --env SPRING_NEWMQTT_NEWURL=tcp://${MQTT_NAME}:1883 \ --env VIDEOSERVER_REQUESTURL=http://${STREAM_NAME}:8080 \ --env VIDEOSERVER_VIDEOPLAYURL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/recording/ \ ---env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:9092 \ +--env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:${KAFKA_PORT} \ --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} \ diff --git a/start/dspportal.sh b/start/dspportal.sh index 832ecec..2aa3c2d 100755 --- a/start/dspportal.sh +++ b/start/dspportal.sh @@ -30,7 +30,7 @@ docker run --pull always -d \ --env SPRING_NEWMQTT_NEWURL=tcp://${MQTT_NAME}:1883 \ --env VIDEOSERVER_REQUESTURL=http://${STREAM_NAME}:8080 \ --env VIDEOSERVER_VIDEOPLAYURL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/recording/ \ ---env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:9092 \ +--env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:${KAFKA_PORT} \ --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} \ diff --git a/start/hhzadmin.sh b/start/hhzadmin.sh index b0405a5..ef69eec 100755 --- a/start/hhzadmin.sh +++ b/start/hhzadmin.sh @@ -36,13 +36,14 @@ docker run --pull always -d \ --env SPRING_NEWMQTT_NEWURL=tcp://${MQTT_NAME}:1883 \ --env VIDEOSERVER_REQUESTURL=http://${STREAM_NAME}:8080 \ --env VIDEOSERVER_VIDEOPLAYURL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/recording/ \ ---env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:9092 \ +--env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:${KAFKA_PORT} \ --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_CALLBACK_URL=https://${HHZ_DOMAIN_FULL}/hhz/admin/dsp/{requestId}/callback \ +--env TUOHENG_DSP_DOMAIN_URL=http://${DSP_DOMAIN_FULL} \ --env TUOHENG_OIDC-URL=https://${OIDC_ADMIN_DOMAIN_FULL} \ --env TZ=Asia/Shanghai \ --add-host ${OIDC_ADMIN_DOMAIN}:host-gateway \ diff --git a/start/hhzapi.sh b/start/hhzapi.sh index 40b069e..8919213 100755 --- a/start/hhzapi.sh +++ b/start/hhzapi.sh @@ -30,7 +30,7 @@ docker run --pull always -d \ --env SPRING_NEWMQTT_NEWURL=tcp://${MQTT_NAME}:1883 \ --env VIDEOSERVER_REQUESTURL=http://${STREAM_NAME}:8080 \ --env VIDEOSERVER_VIDEOPLAYURL=https://${SRS_DOMAIN}:${NGINX_HTTPS_PORT}/recording/ \ ---env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:9092 \ +--env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:${KAFKA_PORT} \ --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} \ diff --git a/start/oidcadmin.sh b/start/oidcadmin.sh index a639270..95182f9 100755 --- a/start/oidcadmin.sh +++ b/start/oidcadmin.sh @@ -23,7 +23,7 @@ docker run --pull always -d \ --env SPRING_DATASOURCE_USERNAME=root \ --env SPRING_DATASOURCE_PASSWORD=${MYSQL_ROOT_PASSWORD} \ --env TZ=Asia/Shanghai \ ---env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:9092 \ +--env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:${KAFKA_PORT} \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ --memory ${OIDC_ADMIN_MEMORY} \ --restart unless-stopped \ diff --git a/start/oidcservice.sh b/start/oidcservice.sh index 5d1fdaf..f02cdce 100755 --- a/start/oidcservice.sh +++ b/start/oidcservice.sh @@ -32,7 +32,7 @@ docker run --pull always -d \ --env OAUTH2_TOKEN_ISSUER=https://${OIDC_DOMAIN_FULL} \ --env SPRING_SECURITY_OAUTH2_RESOURCE-SERVER_JWT_ISSUER-URI=https://${OIDC_DOMAIN_FULL} \ --env TZ=Asia/Shanghai \ ---env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:9092 \ +--env SPRING_KAFKA_BOOTSTRAP_SERVERS=${KAFKA_NAME}:${KAFKA_PORT} \ --add-host ${OIDC_SERVER_DOMAIN}:host-gateway \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ --memory ${OIDC_SERVER_MEMORY} \