From 74d1c21ebb6b3b916904d95d13d289df23dcdedd Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 20 Aug 2024 18:06:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/resources/application-dev.yml | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 594ce31..c413807 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@
# url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
# username: root
# password: yshb@123
- url: jdbc:mysql://139.196.74.78:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://139.196.74.78:3306/drone_o_test?useSSL=false&allowPublicKeyRetrieval=true
username: root
password: jxpskj_2018
sqlite-resource:
@@ -62,10 +62,10 @@
# BASIC parameters are required.
BASIC:
protocol: MQTT # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
- host: 139.196.74.78
- port: 1883
- username: manage
- password: 123456
+ host: 182.108.40.114
+ port: 31883
+ username: root
+ password: root
# host: 127.0.0.1
# port: 1883
# username: guest
@@ -74,26 +74,26 @@
# If the protocol is ws/wss, this value is required.
path:
# 最初连接到mqtt时需要订阅的主题 多个订阅用 "," .
- inbound-topic: sys/product/+/status,thing/product/+/requests,thing/product/+/osd
-# inbound-topic: sys/product/+/+,thing/product/+/+
+# inbound-topic: sys/product/+/status,thing/product/+/requests,thing/product/+/osd
+ inbound-topic: sys/product/+/+,thing/product/+/+
DRC:
- protocol: WS # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
- host: 139.196.74.78
- port: 8083
- path: /mqtt
+ protocol: ws # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
+ host: 182.108.40.114
+ port: 35675
+ path: /ws
oss:
enable: true
provider: minio
- endpoint: http://139.196.74.78:9000
- external-endpoint: http://139.196.74.78:9000
- access-key: sxkj
- secret-key: sxkj2024
+ endpoint: http://dev.jxpskj.com:9000
+ external-endpoint: http://dev.jxpskj.com:9000
+ access-key: pskj
+ secret-key: pskj@2021
bucket: cloud-bucket
expire: 3600
region: us-east-1
object-dir-prefix:
- out-net-file-address: https://wrj.shuixiongit.com/minio
+ out-net-file-address: https://dev.jxpskj.com:8026
#图斑的解压地址和图斑文件转航线文件的地址
patches:
@@ -102,15 +102,20 @@
unzip: src/main/resources/tmp/
kmz:
destKMZFile: src/main/resources/template/kmz/
+ planeKmzFile: src/main/resources/template/kmz2/
sourceDir: src/main/resources/template/wpmz/
xml:
temple:
template: src/main/resources/template/template.xml
waylines: src/main/resources/template/waylines.xml
+ planeTemplate: src/main/resources/template/template-polygon.xml
+ planeWaylines: src/main/resources/template/waylines-polygon.xml
target:
template: src/main/resources/template/wpmz/template.kml
waylines: src/main/resources/template/wpmz/waylines.wpml
+ planeTemplate: src/main/resources/template/wpmz/template.kml
+ planeWaylines: src/main/resources/template/wpmz/waylines.wpml
db:
@@ -119,3 +124,4 @@
result: DB/result_db.db
resultSave: src/main/resources/tmp
resourceSave: src/main/resources/tmp
+ resultGtSave: src/main/resources/tmp
--
Gitblit v1.9.3