From 9de7bdfd10bf84a5e5fbbdc4853e8b30bf7cd0c9 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 04 Dec 2025 13:15:05 +0800
Subject: [PATCH] 2025-12-03 zwy 跟踪任务id获取任务详情接口调整;定时任务时,增加status状态pending:待执行,并发给前端

---
 ard-admin/src/main/resources/application.yml |   49 +++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index 4347a12..243a257 100644
--- a/ard-admin/src/main/resources/application.yml
+++ b/ard-admin/src/main/resources/application.yml
@@ -6,8 +6,8 @@
   version: 3.8.8
   # 版权年份
   copyrightYear: 2024
-  # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
-  profile: D:/ruoyi/uploadPath
+  # 文件路径 示例( Windows配置D:/ard/uploadPath,Linux配置 /home/ard/uploadPath)
+  profile: /home/ard/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -46,9 +46,10 @@
   # 令牌有效期(默认30分钟)
   expireTime: 10
   # 是否允许账户多终端同时登录(true允许 false不允许)
-  soloLogin: false
-# MyBatis配置
-mybatis:
+  soloLogin: true
+
+# MyBatis Plus配置
+mybatis-plus:
   # 搜索指定包别名
   typeAliasesPackage: com.ard.**.domain
   # 配置mapper的扫描,找到所有的mapper.xml映射文件
@@ -90,8 +91,25 @@
   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:
+    name: ard-uav
   # 资源信息
   messages:
     # 国际化资源文件路径
@@ -111,13 +129,13 @@
   # redis 配置
   redis:
     # 地址
-    host: 127.0.0.1
+    host: localhost
     # 端口,默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码
-    password: xzx12345
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -130,6 +148,21 @@
         max-active: 8
         # #连接池最大阻塞等待时间(使用负值表示没有限制)
         max-wait: -1ms
+  #健康监控
+  boot:
+    admin:
+      client:
+        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/
+
+
   # 激活配置文件
   profiles:
-    active: dev-druid,dev
\ No newline at end of file
+    active: daqing-druid,daqing
+    #active: prod-druid,prod
+    #active: dev-druid,dev
\ No newline at end of file

--
Gitblit v1.9.3