From 642dac3e705380eea241648f875836e64dbc809e Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Thu, 18 May 2023 17:43:06 +0800
Subject: [PATCH] Merge branch 'v1.5.0' What's new? 1. Add new model: DJI Matrices 350 RTK. 2. Update file hms.json. 3. Fixed some issues.

---
 src/main/resources/application.yml |   71 ++++++++++++++++++++++++-----------
 1 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5d93be2..a5c937a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -27,6 +27,10 @@
         max-idle: 8
         min-idle: 0
 
+  servlet:
+    multipart:
+      max-file-size: 2GB
+      max-request-size: 2GB
 
 jwt:
   issuer: DJI
@@ -35,14 +39,24 @@
   age: 86400
 
 mqtt:
-  protocol: tcp
-  host: Please enter your ip. # 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,thing/product/+/requests
+  # @see com.dji.sample.component.mqtt.model.MqttUseEnum
+  # BASIC parameters are required.
+  BASIC:
+    protocol: MQTT # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
+    host: Please enter your ip.
+    port: 1883
+    username: JavaServer
+    password: 123456
+    client-id: 123456
+    # If the protocol is ws/wss, this value is required.
+    path:
+    # Topics that need to be subscribed when initially connecting to mqtt, multiple topics are divided by ",".
+    inbound-topic: sys/product/+/status,thing/product/+/requests
+  DRC:
+    protocol: WS # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
+    host: Please enter your ip.
+    port: 8083
+    path: /mqtt
 
 url:
   manage:
@@ -60,10 +74,13 @@
   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
+# Tutorial: https://www.alibabacloud.com/help/en/object-storage-service/latest/use-a-temporary-credential-provided-by-sts-to-access-oss
 oss:
-  enable: true
+  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.
@@ -79,29 +96,39 @@
 #  enable: true
 #  provider: aws
 #  endpoint: https://s3.us-east-1.amazonaws.com
-#  access-key: 
-#  secret-key: 
+#  access-key:
+#  secret-key:
 #  expire: 3600
 #  region: us-east-1
 #  role-session-name: cloudApi
-#  role-arn: 
+#  role-arn:
 #  bucket: cloudapi-bucket
 #  object-dir-prefix: wayline
 
-# MinIO is temporarily unavailable.
 #oss:
-#  enable: false
+#  enable: true
 #  provider: minio
-#  endpoint: 
-#  access-key: 
-#  secret-key: 
-#  bucket: 
-#  expire: 
-#  region: 
-#  object-dir-prefix: 
+#  endpoint: http://192.168.1.1:9000
+#  access-key: minioadmin
+#  secret-key: minioadmin
+#  bucket: cloud-bucket
+#  expire: 3600
+#  region: us-east-1
+#  object-dir-prefix: wayline
 
 logging:
   level:
     com.dji.sample: debug
   file:
     name: logs/cloud-api-sample.log
+
+ntp:
+  server:
+    host: Google.mzr.me
+
+# To create a license for an application: https://developer.dji.com/user/apps/#all
+cloud-api:
+  app:
+    id: Please enter the app id.
+    key: Please enter the app key.
+    license: Please enter the app license.
\ No newline at end of file

--
Gitblit v1.9.3