Commit 1f16ad0b by gdj

1.增加oss配置。

2.修改rtmp-url。
3.修改航线保存时,oss文件路径objectKey格式问题。
parent b9172adf
......@@ -228,7 +228,8 @@ public class WaylineFileServiceImpl implements IWaylineFileService {
return Optional.of(WaylineFileDTO.builder()
.droneModelKey(DeviceEnum.find(DeviceDomainEnum.DRONE, type, subType).getDevice())
.payloadModelKeys(List.of(DeviceEnum.find(DeviceDomainEnum.PAYLOAD, payloadType, payloadSubType).getDevice()))
.objectKey(OssConfiguration.objectDirPrefix + File.separator + filename)
// .objectKey(OssConfiguration.objectDirPrefix + File.separator + filename)
.objectKey(OssConfiguration.objectDirPrefix + "/" + filename)
.name(filename.substring(0, filename.lastIndexOf(WAYLINE_FILE_SUFFIX)))
.sign(DigestUtils.md5DigestAsHex(file.getInputStream()))
.templateTypes(List.of(WaylineTypeEnum.find(templateType).getValue()))
......
......@@ -90,18 +90,18 @@ url:
version: /api/v1
# 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: ALIYUN # @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.
#oss:
# enable: false
# provider: ALIYUN # @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.
#oss:
# enable: true
......@@ -116,16 +116,16 @@ oss:
# bucket: cloudapi-bucket
# object-dir-prefix: wayline
#oss:
# enable: true
# provider: minio
# 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
oss:
enable: true
provider: minio
endpoint: http://218.17.9.14:54429
access-key: Geoair
secret-key: Geoair#0304
bucket: cloud-bucket
expire: 3600
region: cn-guangzhou # us-east-1
object-dir-prefix: wayline
logging:
level:
......@@ -142,7 +142,7 @@ cloud-api:
app:
id: 158488
key: 15e3972c29ef16b9eda5e3415d943d7
license: el2GS5tHPIEjXazwGZC1LkIEQ3B43U7uQ9x30ateJAACX1miOSOdjKLn0clBJTLKO3Fd/1xF7gD2ujuN+0tmh+rDzOb7xECeIcRoyGItLcicTGWu3OkunX4XB8/7RcUp5yjyZhyvjHuqhkRDxSwfToidln8mRJ9UvltcSgKRCYCYnR/Oa6u3u0bs2azz20t6zCKmfdAIY0GzHI7YqgmOHowBXU=
license: el2GS5tHPIEjXazwGZC1LkIEQ3B43U7uQ9x30ateJAACX1miOSOdjKLn0clBJTLKO3Fd/EnrlNnVwoPOmYvn9K6skalfLgY3bBv5I6sJq0nzaIGpdCHelNA/81GCvb9j1sWdN3adRIk/v5GtmSswauqElmgBGN/r37yp7pi5b5E=
# id: 158487
# key: 11de4b6e406e51bf78c75c4cabefe09
# license: MQzV5RtcqtuZuPlP6MAq0/1xF7gD2ujuN+0tmh+rDzOb7xECeIcRoyGItLcicTGWu3OkunX4XB8/7RcUp5yjyZhyvjHuqhkRDxSwfToidln8mRJ9UvltcSgKRCYCYnR/Oa6u3u0bs2azz20t6zCKmfdAIY0GzHI7YqgmOHowBXU=
......@@ -156,7 +156,7 @@ livestream:
# 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:
url: Please enter the rtmp access address. # Example: 'rtmp://192.168.1.1/live/'
url: rtmp://218.17.9.14:54424/live/ # Example: 'rtmp://192.168.1.1/live/'
rtsp:
username: Please enter the username.
password: Please enter the password.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment