Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-10-27 695cb6d76b838b1e4cb161bae335faa948dca12a

 script/docker/nginx/nginx.conf

文件名从 docker/nginx/nginx.conf 修改
@@ -31,6 +31,10 @@
        server 172.30.0.90:9090;
    }

    upstream xxl-job-admin {
        server 172.30.0.92:9100;
    }

    server {
        listen       80;
        server_name  localhost;
@@ -70,6 +74,14 @@
         proxy_pass http://monitor-admin/admin/;
      }

        location /xxl-job-admin/ {
            proxy_set_header Host $http_host;
            proxy_set_header X-Real-IP $remote_addr;
            proxy_set_header REMOTE-HOST $remote_addr;
            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
            proxy_pass http://xxl-job-admin/xxl-job-admin/;
        }

        error_page   500 502 503 504  /50x.html;
        location = /50x.html {
            root   html;