From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
index cbe40be..32a2cc4 100644
--- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
@@ -20,8 +20,8 @@
retry-pull-page-size: 1000
# 鎷夊彇閲嶈瘯鏁版嵁鐨勬瘡鎵规鐨勫ぇ灏�
job-pull-page-size: 1000
- # 鏈嶅姟绔痭etty绔彛
- netty-port: 17888
+ # 鏈嶅姟鍣ㄧ鍙�
+ server-port: 17888
# 涓�涓鎴风姣忕鏈�澶氭帴鏀剁殑閲嶈瘯鏁伴噺鎸囦护
limiter: 1000
# 鍙锋妯″紡涓嬫闀块厤缃�
@@ -34,7 +34,10 @@
max-count: 288
#闂撮殧鏃堕棿
trigger-interval: 900
+ # 閲嶈瘯姣忔鎷夊彇鐨勬鏁�
retry-max-pull-count: 10
+ # RPC閫氳绫诲瀷: netty,grpc
+ rpc-type: grpc
--- # 鐩戞帶涓績閰嶇疆
spring.boot.admin.client:
@@ -46,5 +49,5 @@
metadata:
username: ${spring.boot.admin.client.username}
userpassword: ${spring.boot.admin.client.password}
- username: ruoyi
- password: 123456
+ username: @monitor.username@
+ password: @monitor.password@
--
Gitblit v1.9.3