From 79ddf3f86c5f84f80eea220aad732d0edec73cad Mon Sep 17 00:00:00 2001
From: fanxb <fleyx20@outlook.com>
Date: Tue, 1 Mar 2022 23:31:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                      |  1 +
 config/nginx.conf                               | 17 ++++++++++++-----
 docker-compose.yml                              |  4 ++--
 qiezi_front/public/index.html                   |  2 +-
 qiezi_front/public/indexResource/READEME.md     |  1 +
 qiezi_front/public/indexResource/index.html     |  4 ++--
 .../1.0/qiezi_statistic.min.js}                 |  0
 7 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 qiezi_front/public/indexResource/READEME.md
 rename qiezi_front/public/{indexResource/qieziStatistic_v1.min.js => qiezijs/1.0/qiezi_statistic.min.js} (100%)

diff --git a/.gitignore b/.gitignore
index aa94ce4..d08b00a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 data/maven/mavenRep
 qiezi_front/yarn.lock
+.idea
\ No newline at end of file
diff --git a/config/nginx.conf b/config/nginx.conf
index bf14ccb..e7a8b2c 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -32,21 +32,28 @@ http {
         server_name _;
 
         location /qiezi/api/ {
-            proxy_pass http://backend:8088;
+            proxy_pass http://qiezi_backend:8088;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             client_max_body_size 100m;
         }
 
 		location /{
- 	           root /opt/dist/indexResource;
- 	   }
+ 	       alias /opt/dist/indexResource/;
+ 	       index index.html;
+ 	       try_files $uri $uri/ /index.html;
+ 	    }
 
  	   location /manage {
- 	       root /opt/dist;
+ 	       alias /opt/dist/;
  	       index index.html;
  	       try_files $uri $uri/ /index.html;
  	   }
-        
+
+ 	   location /qiezijs {
+           root /opt/dist/;
+           index index.html;
+           try_files $uri $uri/ /index.html;
+       }
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 855c32a..25f37be 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 version: "2"
 services:
-  front:
+  qiezi_front:
     image: nginx
     networks:
       - qiezi_statistic
@@ -12,7 +12,7 @@ services:
     ports:
       - ${NGINX_PORT}:8080
 
-  backend:
+  qiezi_backend:
     image: openjdk:11.0
     networks:
       - qiezi_statistic
diff --git a/qiezi_front/public/index.html b/qiezi_front/public/index.html
index cc65fa3..af462db 100644
--- a/qiezi_front/public/index.html
+++ b/qiezi_front/public/index.html
@@ -17,6 +17,6 @@
 
     <div id="app"></div>
     <!-- built files will be auto injected -->
-    <script src="./indexResource/qieziStatistic_v1.js" type="text/javascript"></script>
+    <script src="qiezijs/1.0/qiezi_statistic.js" type="text/javascript"></script>
   </body>
 </html>
diff --git a/qiezi_front/public/indexResource/READEME.md b/qiezi_front/public/indexResource/READEME.md
new file mode 100644
index 0000000..40f9223
--- /dev/null
+++ b/qiezi_front/public/indexResource/READEME.md
@@ -0,0 +1 @@
+本文件夹用于存放主页静态页面
\ No newline at end of file
diff --git a/qiezi_front/public/indexResource/index.html b/qiezi_front/public/indexResource/index.html
index 31fde30..ee16a3a 100644
--- a/qiezi_front/public/indexResource/index.html
+++ b/qiezi_front/public/indexResource/index.html
@@ -16,11 +16,11 @@
       <div id="qieziStatisticHtmlHostUv" style="display: none;">&nbsp;总访客数:<span id="qieziStatisticHtmlHostUvValue"></span>人</div>
     </div>
 	<script>
-		//设置统计的host，key
+		//设置实际部署的host和key
 		window.qieziStatisticHost="http://localhost:8080";
 		window.qieziStatisticKey="d862c12a68ad4d579c6066ac2f064a07";
 	</script>
-    <script src="./qieziStatistic_v1.js" type="text/javascript"></script>
+    <script src="/qiezijs/1.0/qiezi_statistic.js" type="text/javascript"></script>
 	<style>
 		.app{
 			width:80%;
diff --git a/qiezi_front/public/indexResource/qieziStatistic_v1.min.js b/qiezi_front/public/qiezijs/1.0/qiezi_statistic.min.js
similarity index 100%
rename from qiezi_front/public/indexResource/qieziStatistic_v1.min.js
rename to qiezi_front/public/qiezijs/1.0/qiezi_statistic.min.js