From 76e70c5b098c9857863139dcc9becbcefab9a5b2 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 17 Sep 2025 10:39:37 +0800
Subject: [PATCH] 1.无人机项目基础配置修改。
---
ard-admin/src/main/resources/application-dev-druid.yml | 4
ard-admin/src/main/java/com/ard/ArdUavApplication.java | 2
ard-admin/src/main/resources/application-dev.yml | 3
ard-admin/src/main/resources/application.yml | 10 ++-
ard-admin/src/main/resources/application-prod-druid.yml | 61 ++++++++++++++++++++
ard-admin/src/main/resources/application-prod.yml | 73 ++++++++++++++++++++++++
6 files changed, 145 insertions(+), 8 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/ArdUavApplication.java b/ard-admin/src/main/java/com/ard/ArdUavApplication.java
index 3778c26..da7d46f 100644
--- a/ard-admin/src/main/java/com/ard/ArdUavApplication.java
+++ b/ard-admin/src/main/java/com/ard/ArdUavApplication.java
@@ -18,7 +18,7 @@
{
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(ArdUavApplication.class, args);
- System.out.println("(♥◠‿◠)ﾉﾞ 无人机4.0平台启动成功 ლ(´ڡ`ლ)ﾞ \n" +
+ System.out.println("(♥◠‿◠)ﾉﾞ 智云 [3.0] 平台启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" ___ ___ \n" +
" /\\ \\ /\\ \\ _____ \n" +
" /::\\ \\ /::\\ \\ /::\\ \\ \n" +
diff --git a/ard-admin/src/main/resources/application-dev-druid.yml b/ard-admin/src/main/resources/application-dev-druid.yml
index 8e4b37f..50a4bbd 100644
--- a/ard-admin/src/main/resources/application-dev-druid.yml
+++ b/ard-admin/src/main/resources/application-dev-druid.yml
@@ -6,9 +6,9 @@
druid:
# 主库数据源
master:
- url: jdbc:mysql://192.168.1.15:3306/ard-uav?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/ard-uav?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: password
+ password: root
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ard-admin/src/main/resources/application-dev.yml b/ard-admin/src/main/resources/application-dev.yml
index 9889498..d9225f2 100644
--- a/ard-admin/src/main/resources/application-dev.yml
+++ b/ard-admin/src/main/resources/application-dev.yml
@@ -37,7 +37,8 @@
# 天宇服务器配置
tianyu:
# 天宇http服务器地址
- endpoint: 192.168.1.97:8060
+ # endpoint: 192.168.1.97:8060 # 哈尔滨环境
+ endpoint: 112.98.104.134:8060 # 哈尔滨环境
accesskeyid: wuwuwu
accesskeysecret: 9c9f139f63b343b0a9ef42e05ed29b0b
# 天宇tcp服务器地址
diff --git a/ard-admin/src/main/resources/application-prod-druid.yml b/ard-admin/src/main/resources/application-prod-druid.yml
new file mode 100644
index 0000000..5cc7e8d
--- /dev/null
+++ b/ard-admin/src/main/resources/application-prod-druid.yml
@@ -0,0 +1,61 @@
+# 数据源配置
+spring:
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 主库数据源
+ master:
+ url: jdbc:mysql://192.168.1.3:3306/ard-uav?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: root
+ password: Ard12345*
+ # 从库数据源
+ slave:
+ # 从数据源开关/默认关闭
+ enabled: false
+ url:
+ username:
+ password:
+ # 初始连接数
+ initialSize: 5
+ # 最小连接池数量
+ minIdle: 10
+ # 最大连接池数量
+ maxActive: 20
+ # 配置获取连接等待超时的时间
+ maxWait: 60000
+ # 配置连接超时时间
+ connectTimeout: 30000
+ # 配置网络超时时间
+ socketTimeout: 60000
+ # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+ timeBetweenEvictionRunsMillis: 60000
+ # 配置一个连接在池中最小生存的时间，单位是毫秒
+ minEvictableIdleTimeMillis: 300000
+ # 配置一个连接在池中最大生存的时间，单位是毫秒
+ maxEvictableIdleTimeMillis: 900000
+ # 配置检测连接是否有效
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ enabled: true
+ # 设置白名单，不填则允许所有访问
+ allow:
+ url-pattern: /druid/*
+ # 控制台管理用户名和密码
+ login-username: ruoyi
+ login-password: 123456
+ filter:
+ stat:
+ enabled: true
+ # 慢SQL记录
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
\ No newline at end of file
diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..5e7fb73
--- /dev/null
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -0,0 +1,73 @@
+# 开发环境配置
+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
+
+# 天宇服务器配置
+#tianyu:
+# # 天宇http服务器地址
+# endpoint: 112.98.106.22:12000
+# accesskeyid: qmfmd3Ws7M4dMcylnrTU
+# accesskeysecret: 5WBU2uEhHZaVefpZdaxpFh4LJW9fZZaa
+# # 天宇tcp服务器地址
+# tcpserver: 123.56.170.94
+# tcpport: 12345
+
+# 天宇服务器配置
+tianyu:
+ # 天宇http服务器地址
+ # endpoint: 192.168.1.97:8060 # 哈尔滨环境
+ endpoint: 112.98.104.134:8060 # 哈尔滨环境
+ accesskeyid: wuwuwu
+ accesskeysecret: 9c9f139f63b343b0a9ef42e05ed29b0b
+ # 天宇tcp服务器地址
+ tcpserver: 192.168.1.97
+ tcpport: 8126
+
+# 地图资源配置
+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
+
+# MinIO
+minio:
+ url: http://192.168.1.3:9001
+ accessKey: admin
+ secretKey: ard12345
+ bucketName: kmz
+#流媒体配置
+mediamtx:
+ # 流媒体服务器地址
+ host: 192.168.1.3
\ No newline at end of file
diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index 2d96918..45b845c 100644
--- a/ard-admin/src/main/resources/application.yml
+++ b/ard-admin/src/main/resources/application.yml
@@ -46,7 +46,7 @@
# 令牌有效期（默认30分钟）
expireTime: 10
# 是否允许账户多终端同时登录（true允许 false不允许）
- soloLogin: false
+ soloLogin: true
# MyBatis配置
mybatis:
# 搜索指定包别名
@@ -111,13 +111,14 @@
# redis 配置
redis:
# 地址
- host: 192.168.1.15
+ host: 192.168.1.3
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 密码
- password:
+ # password: 123456
+ password: Ardkj.2025
# 连接超时时间
timeout: 10s
lettuce:
@@ -132,4 +133,5 @@
max-wait: -1ms
# 激活配置文件
profiles:
- active: dev-druid,dev
\ No newline at end of file
+ # active: dev-druid,dev
+ active: prod-druid,prod
\ No newline at end of file
--
Gitblit v1.9.3