From 19144edf60036ad3b9a30b1b92e985de69231137 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 21 Nov 2025 08:15:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-admin/src/main/resources/application-daqing.yml |   81 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 81 insertions(+), 0 deletions(-)

diff --git a/ard-admin/src/main/resources/application-daqing.yml b/ard-admin/src/main/resources/application-daqing.yml
new file mode 100644
index 0000000..c630210
--- /dev/null
+++ b/ard-admin/src/main/resources/application-daqing.yml
@@ -0,0 +1,81 @@
+# 开发环境配置
+server:
+  # 服务器的HTTP端口,默认为8080
+  port: 8080
+
+# token配置
+token:
+  # 是否允许账户多终端同时登录(true允许 false不允许)
+  soloLogin: false
+
+# 日志配置
+logging:
+  level:
+    com.ard: info
+    org.springframework: warn
+
+## knife4j配置
+knife4j:
+  # knife4j增强功能,开启后下面参数才生效
+  enable: true
+  #是否为生产模式 项目部属时为true 防止接口暴露
+  production: false
+  # 配置用户密码
+  basic:
+    enable: false
+    username: admin
+    password: ardkj12345
+
+# 地图资源配置
+geoserver:
+  deviceCoordinateType: WGS84
+  tifPath: H:\map\hlj.tif
+
+wayline:
+  #可理解为100米大小占图像的比例
+  targetRatio: 0.5
+  #最大航段距离
+  maxLength: 2000
+  #最小航段距离
+  minLength: 1
+  #随飞随动分段长度
+  PeerAtLength: 10
+  #航线KMZ临时存放路径
+  waylineSavePath: /home/ard/myworkspace/uav_server/mainserver/waylines
+
+#上云API
+cloud-api:
+  app:
+    id: 143640
+    key: da5babf38a5d05b0f46a7d82910da1b
+    license: khjd7FzUTzJgaArNv97XdA2nKQtYfESOvBHLqjC6MpvPqxCfuQ82nOlTgzoiLp7UoZujARopN2A1ctPFaJ8oHiHQrn3IRV4wqN3hdSM40xXj02YVvTWQBT54WS8Ks+E8Zatp3gk2T0+7cM5a5a3mWzxLMv7CNqw2z9pFBoOBdpY=
+    host: 192.168.10.103
+    port: 123
+
+#流媒体
+mediamtx:
+  apiHost: 192.168.10.103
+  playHost: 192.168.10.103
+  https: true
+
+# mqtt配置
+mqtt:
+  protocol: tcp
+  host: 192.168.10.103
+  port: 1883
+  username: admin
+  password: public
+  client-id: ard-uav
+  inbound-topic: sys/product/+/status,thing/product/+/requests
+
+# oss配置
+oss:
+  enable: true
+  provider: minio
+  endpoint: https://192.168.10.103:9001
+  access-key: admin
+  secret-key: ard12345
+  bucket: cloud-bucket
+  expire: 3600
+  region: us-east-1
+  object-dir-prefix: wayline

--
Gitblit v1.9.3