Просмотр исходного кода

fix 修复 xxl-job-admin 部署问题

疯狂的狮子li 3 лет назад
Родитель
Сommit
1ff306ff40

+ 1 - 0
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>

+ 1 - 1
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:

+ 7 - 3
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
 }
 
 #关闭所有模块

+ 2 - 2
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;