diff --git a/nginx/vhosts/sky.conf.back b/nginx/vhosts/sky.conf.back deleted file mode 100644 index d285800..0000000 --- a/nginx/vhosts/sky.conf.back +++ /dev/null @@ -1,21 +0,0 @@ - server { - listen 80; - listen 443 ssl; - server_name ${SKYWALKING_UI_DOMAIN}; - - # 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; - - location / { - proxy_pass http://${SKYWALKING_UI_NAME}:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - } diff --git a/start/gateway/application.yml b/start/gateway/application.yml index af188eb..bf0066e 100644 --- a/start/gateway/application.yml +++ b/start/gateway/application.yml @@ -160,7 +160,7 @@ security: # 获取 apiUrl 可访问的 roleIdList tuoheng: hhz-admin-perUrl: http://hhz-admin:9055/permission/getRoleIdList - airport-admin-perUrl: http://airport:9060/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 airmonitor-admin-perUrl: http://airmonitor-admin:9130/permission/getRoleIdList diff --git a/start/gateway/startGateway.sh b/start/gateway/startGateway.sh index 7e5e587..cf4e90d 100755 --- a/start/gateway/startGateway.sh +++ b/start/gateway/startGateway.sh @@ -37,6 +37,7 @@ echo "正在启动 ${GATEWAY_NAME} 容器..." docker run --pull always -d \ --name ${GATEWAY_NAME} \ --network ${NETWORK} \ + --add-host ${OIDC_SERVER_DOMAIN}:host-gateway \ --env TZ=Asia/Shanghai \ --env SPRING_CONFIG_LOCATION=file:/data/java/tuoheng/application.yml \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ diff --git a/start/gateway/temp/application.yml b/start/gateway/temp/application.yml index bb4f60c..b3bca62 100644 --- a/start/gateway/temp/application.yml +++ b/start/gateway/temp/application.yml @@ -160,7 +160,7 @@ security: # 获取 apiUrl 可访问的 roleIdList tuoheng: hhz-admin-perUrl: http://hhz-admin:9055/permission/getRoleIdList - airport-admin-perUrl: http://airport:9060/permission/getRoleIdList + airport-admin-perUrl: http://AIRPORTbazhong:9060/permission/getRoleIdList freeway-admin-perUrl: http://freeway-admin:9117/permission/getRoleIdList waterway-admin-perUrl: https://waterway.t-aaron.com/permission/getRoleIdList airmonitor-admin-perUrl: http://airmonitor-admin:9130/permission/getRoleIdList