From e857db4356106c6d7fcd3f5365cd8644b7667145 Mon Sep 17 00:00:00 2001
From: fanxb <fleyx20@outlook.com>
Date: Tue, 1 Mar 2022 23:39:49 +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

---
 config/nginx.conf                             | 59 -------------------
 data/nginx/nginx.conf                         | 35 +++++------
 {config => data}/timezone                     |  0
 docker-compose.yml                            |  4 +-
 .../1.0/qiezi_statistic.js}                   |  2 +-
 5 files changed, 21 insertions(+), 79 deletions(-)
 delete mode 100644 config/nginx.conf
 rename {config => data}/timezone (100%)
 rename qiezi_front/public/{indexResource/qieziStatistic_v1.js => qiezijs/1.0/qiezi_statistic.js} (94%)

diff --git a/config/nginx.conf b/config/nginx.conf
deleted file mode 100644
index e7a8b2c..0000000
--- a/config/nginx.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-user root;
-worker_processes auto;
-pid /run/nginx.pid;
-events {
-    worker_connections 768;
-}
-http {
-# Basic Settings
-    sendfile on;
-# SSL Settings
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-# Logging Settings
-    access_log /dev/stdout;
-    error_log /dev/stderr;
-# Gzip Settings
-    gzip on;
-    tcp_nopush on;
-    tcp_nodelay on;
-    keepalive_timeout 65;
-    types_hash_max_size 2048;
-    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 application/vnd.ms-fontobject font/ttf font/opentype font/x-woff image/svg+xml;
-    gzip_min_length 1K;
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-    ssl_prefer_server_ciphers on;
-
-    server {
-        listen 8080;
-        listen [::]:8080;
-        index index.html;
-        root /opt/dist/;
-        server_name _;
-
-        location /qiezi/api/ {
-            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 /{
- 	       alias /opt/dist/indexResource/;
- 	       index index.html;
- 	       try_files $uri $uri/ /index.html;
- 	    }
-
- 	   location /manage {
- 	       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/data/nginx/nginx.conf b/data/nginx/nginx.conf
index 27451cc..80da99c 100644
--- a/data/nginx/nginx.conf
+++ b/data/nginx/nginx.conf
@@ -28,31 +28,32 @@ http {
         listen 8080;
         listen [::]:8080;
         index index.html;
+        root /opt/dist/;
         server_name _;
 
-		location /manage{
-            alias /opt/dist/;
-            index index.html;
-            try_files $uri $uri/ /index.html;
-        }
-
-		location / {
-            alias /opt/dist/indexResource/;
-            index index.html;
-            try_files $uri $uri/ /index.html;
-        }
-
-        location /qiezi/api {
-            proxy_pass http://backend:8088;
+        location /qiezi/api/ {
+            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 /{
+ 	       alias /opt/dist/indexResource/;
+ 	       index index.html;
+ 	       try_files $uri $uri/ /index.html;
+ 	    }
 
+ 	   location /manage {
+ 	       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/config/timezone b/data/timezone
similarity index 100%
rename from config/timezone
rename to data/timezone
diff --git a/docker-compose.yml b/docker-compose.yml
index 25f37be..6314a91 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       - qiezi_statistic
     volumes:
       - /etc/localtime:/etc/localtime
-      - ./config/timezone:/etc/timezone
+      - ./data/timezone:/etc/timezone
       - ./qiezi_front/dist:/opt/dist
       - ./data/nginx/nginx.conf:/etc/nginx/nginx.conf
     ports:
@@ -18,7 +18,7 @@ services:
       - qiezi_statistic
     volumes:
       - /etc/localtime:/etc/localtime
-      - ./config/timezone:/etc/timezone
+      - ./data/timezone:/etc/timezone
       - ./qieziBackend/target/backend-0.0.1-SNAPSHOT.jar:/opt/app/service.jar
     working_dir: /opt/app
     command:
diff --git a/qiezi_front/public/indexResource/qieziStatistic_v1.js b/qiezi_front/public/qiezijs/1.0/qiezi_statistic.js
similarity index 94%
rename from qiezi_front/public/indexResource/qieziStatistic_v1.js
rename to qiezi_front/public/qiezijs/1.0/qiezi_statistic.js
index 716952e..09a2334 100644
--- a/qiezi_front/public/indexResource/qieziStatistic_v1.js
+++ b/qiezi_front/public/qiezijs/1.0/qiezi_statistic.js
@@ -25,7 +25,7 @@
 	script.type = "text/javascript";
 	script.defer = true;
 	var requestHost = "https://qiezi.fleyx.com";
-	if (window.qieziStatisticHost != undefined && window.qieziStatisticHost.trim().length > 0) {
+	if (window.qieziStatisticHost !== undefined && window.qieziStatisticHost.trim().length > 0) {
 		requestHost = window.qieziStatisticHost;
 	} else if (window.CONFIG && window.CONFIG.web_analytics.qieziStatistics.app_host) {
 		var temp = window.CONFIG.web_analytics.qieziStatistics.app_host;