Merge branch 'master' of http://210.22.126.130:1111/r/dry/herb

bsw215583320

2024-04-16 c2fccb01b972176dc3da5a497b5e904025e9e98d

 Dockerfile

@@ -3,24 +3,24 @@
VOLUME /tmp
ENV LANG en_US.UTF-8
RUN echo "server {  \
    listen       80; \
    location   /herb/ { \
    proxy_pass              http://jeecg-boot-gateway:9999/; \
    proxy_redirect          off; \
    proxy_set_header        Host jeecg-boot-gateway; \
    proxy_set_header        X-Real-IP \$remote_addr; \
    proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
    } \
    #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \
    location / { \
    root   /var/www/html/; \
    index  index.html index.htm; \
    if (!-e \$request_filename) { \
    rewrite ^(.*)\$ /index.html?s=\$1 last; \
    break; \
    } \
    } \
    access_log  /var/log/nginx/access.log ; \
      listen       80; \
      location   /herb/ { \
        proxy_pass              http://jeecg-boot-gateway:9999/; \
        proxy_redirect          off; \
        proxy_set_header        Host jeecg-boot-gateway; \
        proxy_set_header        X-Real-IP \$remote_addr; \
        proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
      } \
      #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \
      location / { \
        root   /var/www/html/; \
        index  index.html index.htm; \
        if (!-e \$request_filename) { \
          rewrite ^(.*)\$ /index.html?s=\$1 last; \
          break; \
        } \
      } \
      access_log  /var/log/nginx/access.log ; \
    } " > /etc/nginx/conf.d/default.conf \
    &&  mkdir  -p  /var/www \
    &&  mkdir -p /var/www/html