From 63830266e27dd280f3be8a2491948178db4bb456 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Fri, 8 Mar 2019 16:25:56 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=20=E4=BC=98=E5=8C=96=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/docker/deploy.sh            | 12 +++++++++---
 script/docker/nginx/web/nginx.conf |  5 +++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/script/docker/deploy.sh b/script/docker/deploy.sh
index 1163c875..5dc5e074 100644
--- a/script/docker/deploy.sh
+++ b/script/docker/deploy.sh
@@ -8,6 +8,7 @@ usage() {
 #开启所需端口
 port(){
 	firewall-cmd --add-port=88/tcp --permanent
+	firewall-cmd --add-port=8000/tcp --permanent
 	firewall-cmd --add-port=8848/tcp --permanent
 	firewall-cmd --add-port=3306/tcp --permanent
 	firewall-cmd --add-port=3379/tcp --permanent
@@ -17,9 +18,14 @@ port(){
 
 #启动基础模块
 base(){
-	if test ! -f "/docker/nginx/nginx.conf" ;then
-		mkdir /docker/nginx
-		cp nginx.conf /docker/nginx/nginx.conf
+	if test ! -f "/docker/nginx/gateway/nginx.conf" ;then
+		mkdir /docker/nginx/gateway
+		cp /nginx/gateway/nginx.conf /docker/nginx/gateway/nginx.conf
+	fi
+	if test ! -f "/docker/nginx/web/nginx.conf" ;then
+		mkdir /docker/nginx/web
+		cp /nginx/web/nginx.conf /docker/nginx/web/nginx.conf
+		cp /nginx/web/html /docker/nginx/web/html
 	fi
 	docker-compose up -d blade-nginx blade-redis blade-gateway1 blade-gateway2 blade-gateway3 blade-admin
 }
diff --git a/script/docker/nginx/web/nginx.conf b/script/docker/nginx/web/nginx.conf
index 6b1e6c69..0cdbd84a 100644
--- a/script/docker/nginx/web/nginx.conf
+++ b/script/docker/nginx/web/nginx.conf
@@ -41,6 +41,11 @@ http {
       listen       8000;
       server_name  web;
       root         /usr/share/nginx/html;
+
+      location / {
+
+      }
+
       location /api {
            proxy_set_header Host $host;
            proxy_set_header X-Real-IP $remote_addr;