郭超 vor 4 Jahren
Ursprung
Commit
d4b3bab407
2 geänderte Dateien mit 47 neuen und 66 gelöschten Zeilen
  1. 1 2
      .idea/workspace.xml
  2. 46 64
      business/nginx/sites-enabled/default

+ 1 - 2
.idea/workspace.xml

@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="41dc853c-f418-44c7-ba5d-2164f3f0373a" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/business/docker-compose-multi.yml" beforeDir="false" afterPath="$PROJECT_DIR$/business/docker-compose-multi.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/business/nginx/sites-enabled/default" beforeDir="false" afterPath="$PROJECT_DIR$/business/nginx/sites-enabled/default" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -186,7 +185,7 @@
       <workItem from="1610264520879" duration="862000" />
       <workItem from="1610343907658" duration="548000" />
       <workItem from="1618465186243" duration="1756000" />
-      <workItem from="1622184011904" duration="13098000" />
+      <workItem from="1622184011904" duration="13658000" />
     </task>
     <servers />
   </component>

+ 46 - 64
business/nginx/sites-enabled/default

@@ -1,66 +1,48 @@
 server {
 
-    	listen		80;
-    	server_name	192.168.31.157; #改成对应的HOST
-
-    	location /Bug {
-			proxy_pass http://crowd-service-backend-api;
-    	}
-
-       	location  ^~ /dashboard/ {
-       			proxy_pass http://192.168.31.157:6666;
-			#return 404;
-       	}
-
-       	location ^~ /static/ {
-       	    proxy_pass http://192.168.31.157:6666;
-       	}
-
-       	location /QC {
-       	    proxy_pass http://127.0.0.1:8080;
-        }
-
-        location /var {
-            root /;
-            index  index.html index.htm;
-        }
-
-        # location  ^~ /document/ {
-        #     alias /back_end/document/;  # 文件存放目录,注意要以 '/' 结尾;
-        #     index index.html;           # 如果文件存放目录有 index.html,会跳转到 index.html;
-        #     autoindex on;               # 自动列出目录下的文件;
-        #     autoindex_exact_size off;   # 文件大小按 G、M 的格式显示,而不是 Bytes;
-        # }
-
-        # location  ^~ /resourceXinchuang/ {
-        #     alias /Users/hannatao/Downloads/;  # 文件存放目录,注意要以 '/' 结尾;
-        #     index index.html;           # 如果文件存放目录有 index.html,会跳转到 index.html;
-        #     autoindex on;               # 自动列出目录下的文件;
-        #     autoindex_exact_size off;   # 文件大小按 G、M 的格式显示,而不是 Bytes;
-        # }
-
-
-        location / {
-              proxy_pass http://192.168.31.157:5555;
-              #return 404;
-        }
-	}
-
-    server {
-        listen       5555;
-        server_name  192.168.31.157;
-        location / {
-            root   /usr/share/nginx/html/;
-            index  index.html;
-            try_files $uri $uri/ /index.html;
-        }
-   }
-    server {
-        listen       6666;
-        server_name  192.168.31.157;
-        location / {
-             root   /databoard/dist/;
-             index  index.html;
-             try_files $uri $uri/ /index.html;
-        }
-   }
+    listen		80;
+    server_name	192.168.31.157; #改成对应的HOST
+
+    location / {
+        root   /usr/share/nginx/html/;
+        index  index.html;
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /Bug {
+        proxy_pass http://crowd-service-backend-api;
+    }
+
+    location  ^~ /dashboard/ {
+        root   /databoard/dist/;
+        index  index.html;
+    }
+
+    location ^~ /static/ {
+        root   /databoard/dist/;
+        index  index.html;
+    }
+
+    location /QC {
+        proxy_pass http://127.0.0.1:8080;
+    }
+
+    location /var {
+        root /;
+        index  index.html index.htm;
+    }
+
+    # location  ^~ /document/ {
+    #     alias /back_end/document/;  # 文件存放目录,注意要以 '/' 结尾;
+    #     index index.html;           # 如果文件存放目录有 index.html,会跳转到 index.html;
+    #     autoindex on;               # 自动列出目录下的文件;
+    #     autoindex_exact_size off;   # 文件大小按 G、M 的格式显示,而不是 Bytes;
+    # }
+
+    # location  ^~ /resourceXinchuang/ {
+    #     alias /Users/hannatao/Downloads/;  # 文件存放目录,注意要以 '/' 结尾;
+    #     index index.html;           # 如果文件存放目录有 index.html,会跳转到 index.html;
+    #     autoindex on;               # 自动列出目录下的文件;
+    #     autoindex_exact_size off;   # 文件大小按 G、M 的格式显示,而不是 Bytes;
+    # }
+}