From 7df12dc3e9940768a3936b93500a9d3a2935d02b Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 13 Oct 2025 09:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/resources/application.yml | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index 56e4165..d55c1bd 100644
--- a/ard-admin/src/main/resources/application.yml
+++ b/ard-admin/src/main/resources/application.yml
@@ -44,7 +44,7 @@
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
- expireTime: 10
+ expireTime: 720
# 是否允许账户多终端同时登录（true允许 false不允许）
soloLogin: true
@@ -91,6 +91,21 @@
log-response-content: true # 打开/关闭Forest响应内容日志（默认为 false）
async-mode: platform # [自v1.5.27版本起可用] 异步模式（默认为 platform）
+# 服务端点检查
+management:
+ endpoints:
+ web:
+ exposure:
+ include: health,info,logfile,loggers
+ endpoint:
+ info:
+ enabled: true
+ health:
+ enabled: true
+ show-details: always
+ logfile:
+ external-file: logs/info.log
+
# Spring配置
spring:
application:
@@ -114,7 +129,7 @@
# redis 配置
redis:
# 地址
- host: 192.168.1.15
+ host: localhost
# 端口，默认为6379
port: 6379
# 数据库索引
@@ -133,16 +148,7 @@
max-active: 8
# #连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
- jackson:
- property-naming-strategy: SNAKE_CASE
- date-format: yyyy-MM-dd HH:mm:ss
- default-property-inclusion: NON_NULL
- deserialization:
- FAIL_ON_UNKNOWN_PROPERTIES: false
- # 激活配置文件
- profiles:
- # active: prod-druid,prod
- active: dev-druid,dev
+
#健康监控
boot:
admin:
@@ -150,18 +156,13 @@
url: http://127.0.0.1:9100
username: admin
password: admin
+ instance:
+ name: ard-uav
+ management-url: http://127.0.0.1:8080/actuator
+ service-url: http://127.0.0.1:8080/
-# 服务端点检查
-management:
- endpoints:
- web:
- exposure:
- include: health,info,logfile,loggers
- endpoint:
- info:
- enabled: true
- health:
- enabled: true
- show-details: always
- logfile:
- external-file: logs/${spring.application.name}/info.log
+
+ # 激活配置文件
+ profiles:
+ #active: prod-druid,prod
+ active: dev-druid,dev
\ No newline at end of file
--
Gitblit v1.9.3