From 1ff306ff40cf05dce7f5f29998cb7cf2546e90eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Mon, 1 Nov 2021 13:49:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20xxl-job-admin=20?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-extend/ruoyi-xxl-job-admin/pom.xml               |  1 +
 .../src/main/resources/application-prod.yml            |  2 +-
 script/docker/deploy.sh                                | 10 +++++++---
 script/docker/nginx/nginx.conf                         |  4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
index 1c1ba6f37..a2b198fc9 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml
@@ -80,6 +80,7 @@
 	</dependencies>
 
 	<build>
+        <finalName>${project.artifactId}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
index 774d7f81c..2994909ac 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
@@ -3,7 +3,7 @@ spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.30.0.92:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: root
     hikari:
diff --git a/script/docker/deploy.sh b/script/docker/deploy.sh
index 28822ecfd..1564002d1 100644
--- a/script/docker/deploy.sh
+++ b/script/docker/deploy.sh
@@ -16,6 +16,10 @@ port(){
 	firewall-cmd --add-port=9000/tcp --permanent
 	# minio 控制台端口
 	firewall-cmd --add-port=9001/tcp --permanent
+	# 监控中心端口
+	firewall-cmd --add-port=9090/tcp --permanent
+	# 任务调度中心端口
+	firewall-cmd --add-port=9100/tcp --permanent
 	# 重启防火墙
 	service firewalld restart
 }
@@ -39,19 +43,19 @@ base(){
 	docker-compose up -d mysql nginx-web redis minio
 }
 
-#启动基础模块
+#启动监控模块
 monitor(){
 	docker-compose up -d ruoyi-monitor-admin
 }
 
 #启动程序模块
 start(){
-	docker-compose up -d ruoyi-server1 ruoyi-server2
+	docker-compose up -d ruoyi-xxl-job-admin ruoyi-server1 ruoyi-server2
 }
 
 #停止程序模块
 stop(){
-	docker-compose stop ruoyi-server1 ruoyi-server2
+	docker-compose stop ruoyi-xxl-job-admin ruoyi-server1 ruoyi-server2
 }
 
 #关闭所有模块
diff --git a/script/docker/nginx/nginx.conf b/script/docker/nginx/nginx.conf
index 93a633e14..b4ba03175 100644
--- a/script/docker/nginx/nginx.conf
+++ b/script/docker/nginx/nginx.conf
@@ -31,7 +31,7 @@ http {
         server 172.30.0.90:9090;
     }
 
-    upstream xxl-job-admin {
+    upstream xxljob-admin {
         server 172.30.0.92:9100;
     }
 
@@ -79,7 +79,7 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header REMOTE-HOST $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_pass http://xxl-job-admin/xxl-job-admin/;
+            proxy_pass http://xxljob-admin/xxl-job-admin/;
         }
 
         error_page   500 502 503 504  /50x.html;