From bf4990ffb53e2a0e7b2ec0c7a8a054bdf8a57db5 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 16 Nov 2023 10:02:13 +0800
Subject: [PATCH] 无人机 -设备分页新增保护区ID查询条件
---
src/main/resources/application.yml | 138 +++++++++++++++++++++++++++++++++------------
1 files changed, 100 insertions(+), 38 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9cb4e88..24fb258 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,26 +1,42 @@
server:
port: 6789
spring:
+ jackson:
+ date-format: yyyy-MM-dd HH:mm:ss
+ time-zone: GMT+8
application:
name: cloud-api-sample
datasource:
druid:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/cloud_sample?useSSL=false&allowPublicKeyRetrieval=true
+# url: jdbc:mysql://172.16.13.129:3306/cloud_sample?useSSL=false&allowPublicKeyRetrieval=true
+# username: root
+# password: 123456
+ url: jdbc:mysql://182.106.212.58:3308/drone_test?useSSL=false&allowPublicKeyRetrieval=true
username: root
- password: root
+ password: yshb@123
initial-size: 10
min-idle: 10
max-active: 20
max-wait: 60000
- 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
+ redis:
+ host: 127.0.0.1
+ port: 6379
+ database: 0
+ username: # if you enable
+ password:
+ lettuce:
+ pool:
+ max-active: 8
+ max-idle: 8
+ min-idle: 0
+
+ servlet:
+ multipart:
+ max-file-size: 2GB
+ max-request-size: 2GB
jwt:
issuer: DJI
@@ -29,14 +45,29 @@
age: 86400
mqtt:
- protocol: tcp
- host: Please enter the address of the emqx server. # Example: 192.168.1.1
- port: 1883
- username: JavaServer
- password: 123456
- client-id: 123456
- # Topics that need to be subscribed when initially connecting to mqtt, multiple topics are divided by ",".
- inbound-topic: sys/product/+/status
+ # @see com.dji.sample.component.mqtt.model.MqttUseEnum
+ # BASIC parameters are required.
+ BASIC:
+ protocol: MQTT # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
+ host: 182.106.212.58
+ port: 31883
+ username: root
+ password: root
+# host: 127.0.0.1
+# port: 1883
+# username: guest
+# password: guest
+ client-id: aix123456
+ # 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/+/+
+ DRC:
+ protocol: WS # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
+ host: 182.106.212.58
+ port: 35675
+ path: /ws
url:
manage:
@@ -54,34 +85,65 @@
storage:
prefix: /storage
version: /api/v1
+ control:
+ prefix: /control
+ version: /api/v1
-# Tutorial: https://help.aliyun.com/document_detail/100624.htm?spm=a2c4g.11186623.0.0.74075e34eIhK7T#concept-xzh-nzk-2gb
-aliyun:
- oss:
- enable: true
- endpoint: Please enter your endpoint. # Example: https://oss-cn-shenzhen.aliyuncs.com
- access-key: Please enter your access key.
- secret-key: Please enter your secret key.
- expire: 3600
- region: Please enter oss region. # Example: cn-shenzhen
- role-session-name: Please enter session name. # A custom role session name to distinguish the different tokens, for example it could be filled in as SessionTest.
- role-arn: Please enter role ARN. # Example: acs:ram::123456789:role/oss
- bucket: Please enter bucket name.
- object-dir-prefix: Please enter object prefix.
+# Tutorial: https://www.alibabacloud.com/help/en/object-storage-service/latest/use-a-temporary-credential-provided-by-sts-to-access-oss
+#oss:
+# enable: false
+# provider: ali # @see com.dji.sample.component.OssConfiguration.model.enums.OssTypeEnum
+# endpoint: https://oss-cn-hangzhou.aliyuncs.com
+# access-key: Please enter your access key.
+# secret-key: Please enter your secret key.
+# expire: 3600
+# region: Please enter your oss region. # cn-hangzhou
+# role-session-name: cloudApi
+# role-arn: Please enter your role arn. # acs:ram::123456789:role/stsrole
+# bucket: Please enter your bucket name.
+# object-dir-prefix: Please enter a folder name.
-# MinIO is temporarily unavailable.
-minio:
- enable: false
- endpoint: Please enter your endpoint. #http://192.168.1.1:9000/
- access-key: minioadmin
- secret-key: minioadmin
- bucket: Please enter bucket name.
+#oss:
+# enable: true
+# provider: aws
+# endpoint: https://s3.us-east-1.amazonaws.com
+# access-key:
+# secret-key:
+# expire: 3600
+# region: us-east-1
+# role-session-name: cloudApi
+# role-arn:
+# bucket: cloudapi-bucket
+# object-dir-prefix: wayline
+
+oss:
+ enable: true
+ provider: minio
+# endpoint: http://172.16.13.129:9000
+# access-key: admin
+# secret-key: 12345678
+ endpoint: http://dev.jxpskj.com:9000
+# endpoint: https://dev.jxpskj.com:8026
+ access-key: pskj
+ secret-key: pskj@2021
+ bucket: cloud-bucket
expire: 3600
- region: Please enter minio region.
- object-dir-prefix: Please enter object prefix.
+ region: us-east-1
+ object-dir-prefix:
logging:
level:
com.dji.sample: debug
file:
name: logs/cloud-api-sample.log
+
+ntp:
+ server:
+ host: ntp.ntsc.ac.cn
+
+# To create a license for an application: https://developer.dji.com/user/apps/#all
+cloud-api:
+ app:
+ id: 136971
+ key: 3e56cb20958060caeb1071cdb32400e
+ license: eS2rczbPpEUZZkOuek7hB1fugv3TE0RdKyEU319A2cxmVKs7Bc11RadcPcHnQJjBq/Peja5R6bp2IILCypa2lskCUGXkXHmqxdPIVTyMQpkZtjM+eXLut/VHPdXVZOvYxKFMVel6jfEyd4rWL9jBI1N34rCvwSgad6T49mRC8R0=
\ No newline at end of file
--
Gitblit v1.9.3