fix(nginx-web-edit错误): 🐛 修复web-edit无法访问的问题

添加常用命令

.gitignore

@@ -1,4 +1,4 @@
 service/*.jar
 service/data/
-web/html/
+**/html/
 images

area-security-web/Dockerfile

@@ -0,0 +1,21 @@
+# Docker image for web file run
+# VERSION 2.0
+# Author: bb
+
+# 指明当前镜像继承的基础镜像，编译当前镜像时候会自动下载基础镜像(仅第一次打包会下载)
+# 基础镜像
+FROM nginx
+
+LABEL Author="bb, aagmix"
+LABEL VERSION="1.0"
+
+# config
+COPY nginx.conf /etc/nginx
+COPY conf.d /etc/nginx/conf.d
+# 将html里的文件直接复制到nginx的html目录
+COPY html /usr/share/nginx/html
+
+# 暴露端口
+EXPOSE 3000
+
+CMD "nginx" "-g" "daemon off;"

area-security-web/conf.d/default.conf

@@ -0,0 +1,62 @@
+server {
+    listen       3000;
+    listen  [::]:3000;
+    server_name  localhost;
+    root  /usr/share/nginx/html;
+    index  index.html index.htm;
+    #charset koi8-r;
+    #access_log  logs/host.access.log  main;
+
+    #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题
+    location / {
+        try_files $uri $uri @rewrites;
+        # 开启缓存
+        location ~* ^.+\.(ico|gif|jpg|jpeg|png)$ { 
+            access_log   off; 
+            expires      2d;
+        }
+        location ~* ^.+\.(css|js|txt|xml|swf|wav)$ {
+            access_log   off;
+            expires      24h;
+        }
+        location ~* ^.+\.(html|htm)$ {
+            expires      1h;
+        }
+        location ~* ^.+\.(eot|ttf|otf|woff|svg)$ {
+            access_log   off;
+            expires max;
+        }
+    }
+
+    location /edit {
+        try_files $uri $uri @rewrites;
+        # 开启缓存
+        location ~* ^.+\.(ico|gif|jpg|jpeg|png)$ { 
+            access_log   off; 
+            expires      2d;
+        }
+        location ~* ^.+\.(css|js|txt|xml|swf|wav)$ {
+            access_log   off;
+            expires      24h;
+        }
+        location ~* ^.+\.(html|htm)$ {
+            expires      1h;
+        }
+        location ~* ^.+\.(eot|ttf|otf|woff|svg)$ {
+            access_log   off;
+            expires max;
+        }
+    }
+
+    location @rewrites {
+        rewrite ^(.+)$ /index.html?s=$1 last;
+    }
+
+    # 后台服务配置，配置了这个location便可以通过访问		
+	location ^~ /military {
+		proxy_pass              http://military-system:8049/military/;
+		proxy_set_header        Host $host:3000;
+		proxy_set_header        X-Real-IP $remote_addr;
+		proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+	}
+}

area-security-web/nginx.conf

@@ -0,0 +1,89 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
+
+events {
+	worker_connections 768;
+	# multi_accept on;
+}
+
+http {
+
+	##
+	# Basic Settings
+	##
+
+	sendfile on;
+	tcp_nopush on;
+	tcp_nodelay on;
+	keepalive_timeout 65;
+	types_hash_max_size 2048;
+	# server_tokens off;
+
+	# server_names_hash_bucket_size 64;
+	# server_name_in_redirect off;
+
+	include /etc/nginx/mime.types;
+	default_type application/octet-stream;
+
+	##
+	# SSL Settings
+	##
+
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE
+	ssl_prefer_server_ciphers on;
+
+	##
+	# Logging Settings
+	##
+
+	access_log /var/log/nginx/access.log;
+	error_log /var/log/nginx/error.log;
+
+	##
+	# Gzip Settings
+	##
+	  gzip on;
+	  gzip_min_length 1k;
+	  gzip_comp_level 9;
+	  gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+	  gzip_vary on;
+	  gzip_disable "MSIE [1-6]\.";
+
+	# gzip_vary on;
+	# gzip_proxied any;
+	# gzip_comp_level 6;
+	# gzip_buffers 16 8k;
+	# gzip_http_version 1.1;
+	# gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+
+	##
+	# Virtual Host Configs
+	##
+
+	include /etc/nginx/conf.d/*.conf;
+	include /etc/nginx/sites-enabled/*;
+}
+
+
+#mail {
+#	# See sample authentication script at:
+#	# http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
+# 
+#	# auth_http localhost/auth.php;
+#	# pop3_capabilities "TOP" "USER";
+#	# imap_capabilities "IMAP4rev1" "UIDPLUS";
+# 
+#	server {
+#		listen     localhost:110;
+#		protocol   pop3;
+#		proxy      on;
+#	}
+# 
+#	server {
+#		listen     localhost:143;
+#		protocol   imap;
+#		proxy      on;
+#	}
+#}

docker-compose.yml

@@ -2,15 +2,31 @@ version: '2'
 services:
   military-system:
     build: service
-    image: military_system
-    container_name: military_system
+    # image: military_zgx_system:2023.2.10
+    image: military_zgx_system
+    container_name: military_zgx_system
     restart: on-failure
+    # 要映射出来的路径
+    # /data 为以前的opt路径
+    # application-prod.yml 配置文件
+    # volumes:
+    #   - E:\opt:/data:rw
+    #   - D:\deploy\application-prod.yml:/military/config/application-prod.yml:ro
     ports:
       - 8049:8049
   military-web:
     build: web
-    image: military_system_web
-    container_name: military_system_web
+    # image: military_zgx_system_web:2023.2.10
+    image: military_zgx_system_web
+    container_name: military_zgx_system_web
     restart: on-failure
     ports:
-      - 3001:3001
+      - 3001:3001
+  area-web:
+    build: area-security-web
+    # image: military_zgx_area_web:2023.2.10
+    image: military_zgx_area_web
+    container_name: military_zgx_area_web
+    restart: on-failure
+    ports:
+      - 3000:3000

service/Dockerfile

@@ -18,7 +18,6 @@ ENV JAVA_OPTS=$JAVA_OPTS
 
 # 从当前工作目录复制文件到镜像目录中并重新命名
 COPY config /military/config
-COPY data /data
 COPY military.jar /military/military.jar
 
 # 执行Linux命令，运行jar包

web/conf.d/default.conf

@@ -12,6 +12,9 @@ server {
     listen  [::]:3001;
     server_name  localhost;
 
+    root   /usr/share/nginx/html;
+    index  index.html index.htm;
+
     # 后台服务配置，配置了这个location便可以通过访问		
     location ^~ /military {
         proxy_pass              http://back_end/military/;
@@ -35,11 +38,14 @@ server {
 
     #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题
     location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-        if (!-e $request_filename) {
-            rewrite ^(.*)$ /index.html?s=$1 last;
-            break;
-        }
+        try_files $uri $uri @rewrites;
+    }
+
+    location /edit {
+        try_files $uri $uri @rewrites;
+    }
+
+    location @rewrites {
+        rewrite ^(.+)$ /index.html?s=$1 last;
     }
 }