|
@@ -4,19 +4,19 @@ spring:
|
|
|
main:
|
|
main:
|
|
|
allow-bean-definition-overriding: true
|
|
allow-bean-definition-overriding: true
|
|
|
application:
|
|
application:
|
|
|
- name: uas-ryuiso-com
|
|
|
|
|
|
|
+ name: cloud-api-sample
|
|
|
datasource:
|
|
datasource:
|
|
|
druid:
|
|
druid:
|
|
|
type: com.alibaba.druid.pool.DruidDataSource
|
|
type: com.alibaba.druid.pool.DruidDataSource
|
|
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
|
- url: jdbc:mysql://60.204.184.98:33308/dji_uas?useSSL=false&allowPublicKeyRetrieval=true
|
|
|
|
|
- username: dji_uas
|
|
|
|
|
- password: AD24cGwazeX5DYeLTaV
|
|
|
|
|
|
|
+ url: jdbc:mysql://10.1.27.10:3306/uav?useSSL=false&allowPublicKeyRetrieval=true
|
|
|
|
|
+ username: uav
|
|
|
|
|
+ password: pacsWY6l4B!f5efY8f
|
|
|
initial-size: 10
|
|
initial-size: 10
|
|
|
min-idle: 10
|
|
min-idle: 10
|
|
|
max-active: 20
|
|
max-active: 20
|
|
|
max-wait: 60000
|
|
max-wait: 60000
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
redis:
|
|
redis:
|
|
|
host: localhost
|
|
host: localhost
|
|
|
port: 6379
|
|
port: 6379
|
|
@@ -28,37 +28,60 @@ spring:
|
|
|
max-active: 100
|
|
max-active: 100
|
|
|
max-idle: 10
|
|
max-idle: 10
|
|
|
min-idle: 0
|
|
min-idle: 0
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
servlet:
|
|
servlet:
|
|
|
multipart:
|
|
multipart:
|
|
|
max-file-size: 2GB
|
|
max-file-size: 2GB
|
|
|
max-request-size: 2GB
|
|
max-request-size: 2GB
|
|
|
|
|
+
|
|
|
|
|
+ jackson:
|
|
|
|
|
+ time-zone: Asia/Shanghai
|
|
|
|
|
|
|
|
jwt:
|
|
jwt:
|
|
|
- issuer: Ryuiso
|
|
|
|
|
- subject: UAS-RYUISO
|
|
|
|
|
- secret: UAS-RYUISO
|
|
|
|
|
|
|
+ issuer: JKEC
|
|
|
|
|
+ subject: YunJi
|
|
|
|
|
+ secret: YunJi
|
|
|
age: 86400
|
|
age: 86400
|
|
|
|
|
|
|
|
mqtt:
|
|
mqtt:
|
|
|
# @see com.dji.sample.component.mqtt.model.MqttUseEnum
|
|
# @see com.dji.sample.component.mqtt.model.MqttUseEnum
|
|
|
# BASIC parameters are required.
|
|
# BASIC parameters are required.
|
|
|
|
|
+ # 内网环境
|
|
|
BASIC:
|
|
BASIC:
|
|
|
protocol: MQTT # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
|
|
protocol: MQTT # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
|
|
|
- host: 118.195.177.247
|
|
|
|
|
|
|
+ host: 203.156.230.4
|
|
|
port: 1883
|
|
port: 1883
|
|
|
username: admin
|
|
username: admin
|
|
|
- password: T1SqDxbdSPVV24
|
|
|
|
|
- client-id: ZYUAS
|
|
|
|
|
|
|
+ password: Lx@304307910
|
|
|
|
|
+ client-id: JKEC
|
|
|
# If the protocol is ws/wss, this value is required.
|
|
# If the protocol is ws/wss, this value is required.
|
|
|
path:
|
|
path:
|
|
|
DRC:
|
|
DRC:
|
|
|
protocol: WSS # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
|
|
protocol: WSS # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
|
|
|
- host: 118.195.177.247
|
|
|
|
|
|
|
+ host: 203.156.230.4
|
|
|
port: 8083
|
|
port: 8083
|
|
|
path: /mqtt
|
|
path: /mqtt
|
|
|
username: admin
|
|
username: admin
|
|
|
- password: T1SqDxbdSPVV24
|
|
|
|
|
|
|
+ password: Lx@304307910
|
|
|
|
|
+
|
|
|
|
|
+ # 公网环境
|
|
|
|
|
+# BASIC:
|
|
|
|
|
+# protocol: MQTT # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
|
|
|
|
|
+# host: 118.195.177.247
|
|
|
|
|
+# port: 1883
|
|
|
|
|
+# username: admin
|
|
|
|
|
+# password: T1SqDxbdSPVV24
|
|
|
|
|
+# client-id: JKEC
|
|
|
|
|
+# # If the protocol is ws/wss, this value is required.
|
|
|
|
|
+# path:
|
|
|
|
|
+# DRC:
|
|
|
|
|
+# protocol: WSS # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
|
|
|
|
|
+# host: 118.195.177.247
|
|
|
|
|
+# port: 8083
|
|
|
|
|
+# path: /mqtt
|
|
|
|
|
+# username: admin
|
|
|
|
|
+# password: T1SqDxbdSPVV24#
|
|
|
|
|
+
|
|
|
|
|
|
|
|
cloud-sdk:
|
|
cloud-sdk:
|
|
|
mqtt:
|
|
mqtt:
|
|
@@ -115,11 +138,9 @@ url:
|
|
|
oss:
|
|
oss:
|
|
|
enable: true
|
|
enable: true
|
|
|
provider: minio
|
|
provider: minio
|
|
|
- endpoint: https://minio.ryuiso.com
|
|
|
|
|
- # access-key: dji_media
|
|
|
|
|
- # secret-key: W9AB^CJ*3WcBR6z#
|
|
|
|
|
- access-key: 3dDsiNrJcXhP4Bjm
|
|
|
|
|
- secret-key: DpC3hvqSS9va7ZJN
|
|
|
|
|
|
|
+ endpoint: https://minio.jkec.info:9000
|
|
|
|
|
+ access-key: uavadmin
|
|
|
|
|
+ secret-key: YEDG9DZ8oby97UGMyxW&
|
|
|
bucket: dji-cloudapi
|
|
bucket: dji-cloudapi
|
|
|
bucket-logs: log-files
|
|
bucket-logs: log-files
|
|
|
expire: 3600
|
|
expire: 3600
|
|
@@ -130,12 +151,14 @@ logging:
|
|
|
level:
|
|
level:
|
|
|
com.dji: info
|
|
com.dji: info
|
|
|
file:
|
|
file:
|
|
|
- name: logs/uas-ryuiso-com.log
|
|
|
|
|
|
|
+ name: logs/uav-jkec-info.log
|
|
|
logback:
|
|
logback:
|
|
|
rollingpolicy:
|
|
rollingpolicy:
|
|
|
- max-file-size: 50MB
|
|
|
|
|
|
|
+ max-file-size: 10MB
|
|
|
max-history: 30
|
|
max-history: 30
|
|
|
total-size-cap: 1GB
|
|
total-size-cap: 1GB
|
|
|
|
|
+ pattern:
|
|
|
|
|
+ timezone: Asia/Shanghai
|
|
|
|
|
|
|
|
ntp:
|
|
ntp:
|
|
|
server:
|
|
server:
|
|
@@ -145,9 +168,9 @@ ntp:
|
|
|
# To create a license for an application: https://developer.dji.com/user/apps/#all
|
|
# To create a license for an application: https://developer.dji.com/user/apps/#all
|
|
|
cloud-api:
|
|
cloud-api:
|
|
|
app:
|
|
app:
|
|
|
- id: 146815
|
|
|
|
|
- key: 7c9e9108f2ddcbab32d2b508f452151
|
|
|
|
|
- license: ZK7Dzih4Qc9JCZhDiyDsWJwTW+1rhnnzT1SqDxbdSPVV24bbDC4r1KNjXo7tIPBnPne7ipnXeefP0lJ0OHvxMpkKiag5lFCIndKSvYYdQkyScT3dahCXjmYsd0YyWyHj4tvXoR2DRVq1PdBHLB1iUo2FGLCIZ8QHbGyqglyGdHY=
|
|
|
|
|
|
|
+ id: 151064
|
|
|
|
|
+ key: 43f18442d9ebe3f5d0599e6152269ad
|
|
|
|
|
+ license: iZ1GBKGRfpFE9Pa1oKF4XSbN04ZgprChDR5ciAqeUwcnw0YTvmR6expuIWxeNv4/DdegoqHrz4EYhMS1nRjQV4DIpURkGy6G7eDWXfJKVhzuSVblSxyNsJUrM7cvrNwTJ2o4RLaQY+KG+h2oXyPDLNa8U429zJk8DLcAIZh/jv8=
|
|
|
|
|
|
|
|
livestream:
|
|
livestream:
|
|
|
url:
|
|
url:
|
|
@@ -156,7 +179,7 @@ livestream:
|
|
|
# channel: Please enter the agora channel.
|
|
# channel: Please enter the agora channel.
|
|
|
# token: Please enter the agora temporary token.
|
|
# token: Please enter the agora temporary token.
|
|
|
# uid: 654321
|
|
# uid: 654321
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
# RTMP Note: This IP is the address of the streaming server. If you want to see livestream on web page, you need to convert the RTMP stream to WebRTC stream.
|
|
# RTMP Note: This IP is the address of the streaming server. If you want to see livestream on web page, you need to convert the RTMP stream to WebRTC stream.
|
|
|
# rtmp:
|
|
# rtmp:
|
|
|
# url: Please enter the rtmp access address. # Example: 'rtmp://192.168.1.1/live/'
|
|
# url: Please enter the rtmp access address. # Example: 'rtmp://192.168.1.1/live/'
|
|
@@ -164,7 +187,7 @@ livestream:
|
|
|
# username: Please enter the username.
|
|
# username: Please enter the username.
|
|
|
# password: Please enter the password.
|
|
# password: Please enter the password.
|
|
|
# port: 8554
|
|
# port: 8554
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
# GB28181 Note:If you don't know what these parameters mean, you can go to Pilot2 and select the GB28181 page in the cloud platform. Where the parameters same as these parameters.
|
|
# GB28181 Note:If you don't know what these parameters mean, you can go to Pilot2 and select the GB28181 page in the cloud platform. Where the parameters same as these parameters.
|
|
|
# gb28181:
|
|
# gb28181:
|
|
|
# serverIP: Please enter the server ip.
|
|
# serverIP: Please enter the server ip.
|
|
@@ -174,7 +197,7 @@ livestream:
|
|
|
# agentPassword: Please enter the agent password.
|
|
# agentPassword: Please enter the agent password.
|
|
|
# localPort: Please enter the local port.
|
|
# localPort: Please enter the local port.
|
|
|
# channel: Please enter the channel.
|
|
# channel: Please enter the channel.
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
# Webrtc: Only supports using whip standard
|
|
# Webrtc: Only supports using whip standard
|
|
|
# whip:
|
|
# whip:
|
|
|
# url: Please enter the rtmp access address. # Example:http://192.168.1.1:1985/rtc/v1/whip/?app=live&stream=
|
|
# url: Please enter the rtmp access address. # Example:http://192.168.1.1:1985/rtc/v1/whip/?app=live&stream=
|