diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/device/CameraModeEnum.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/device/CameraModeEnum.java index df438f8..ee227c1 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/device/CameraModeEnum.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/device/CameraModeEnum.java @@ -21,6 +21,8 @@ public enum CameraModeEnum { PANORAMA(3), + PHONE_TIME(4), + UNSUPPORTED(-1), ; diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/device/EsimActivateStateEnum.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/device/EsimActivateStateEnum.java index 12f5133..472d419 100644 --- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/device/EsimActivateStateEnum.java +++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/device/EsimActivateStateEnum.java @@ -17,6 +17,7 @@ public enum EsimActivateStateEnum { ACTIVATED(1), + ACTIVATED_ALREADY(2), ; private final int state; diff --git a/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java b/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java index 556af9d..e92cf39 100644 --- a/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java +++ b/dk-common/common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java @@ -76,6 +76,8 @@ public class OssFactory { return AliyunOss.getCredentials(client); }else if(OssTypeEnum.MINIO.getType().equals(client.getOssProperties().getSThreeType())){ return Minio.getCredentials(client); + }else if(OssTypeEnum.MINIO.getType().equals(client.getOssProperties().getSThreeType())){ + return Minio.getCredentials(client); } return null; } diff --git a/dk-modules/sample/src/main/resources/application.yml b/dk-modules/sample/src/main/resources/application.yml index 1129415..fce08fe 100644 --- a/dk-modules/sample/src/main/resources/application.yml +++ b/dk-modules/sample/src/main/resources/application.yml @@ -34,96 +34,96 @@ spring: - optional:nacos:datasource.yml - optional:nacos:${spring.application.name}.yml -mqtt: - # @see org.dromara.sample.component.mqtt.model.MqttUseEnum - # BASIC parameters are required. - BASIC: - protocol: MQTT - host: 114.235.183.162 - port: 1883 - username: adminPCBASIC - password: yongqiang666 - client-id: gengbao1211 - # If the protocol is ws/wss, this value is required. - path: - DRC: - protocol: WS - host: 114.235.183.162 - port: 8083 - path: /mqtt - username: adminPCDRC - password: yongqiang666 - -cloud-sdk: - mqtt: - # Topics that need to be subscribed when initially connecting to mqtt, multiple topics are divided by ",". - inbound-topic: sys/product/+/status,thing/product/+/requests - -url: - manage: - prefix: manage - version: /api/v1 - map: - prefix: map - version: /api/v1 - media: - prefix: media - version: /api/v1 - wayline: - prefix: wayline - version: /api/v1 - storage: - prefix: storage - version: /api/v1 - control: - prefix: control - version: /api/v1 -logging: - level: - com.dji: debug - file: - name: logs/cloud-api-sample.log - -ntp: - server: - host: ntp.aliyun.com - -# To create a license for an application: https://developer.dji.com/user/apps/#all -cloud-api: - app: - id: 125297 - key: 182ae1ca69d9ba5103c0148bf16d68b - license: FixRisR747uGMZwaNbgCAWZojgrcUgZB1qhRyMTtptyKPKI/uETVwMK41HikhP+wbCjSKODdaQH4JIGAvzxdN/4HMrsEj3srLyGXi+BeJyFNyi94mpprv1Cx59fknCrBexAxLoc3f9GcgojEWrB0wCYxGp7l8mulwSDMP5yl++w= - -livestream: - url: - # It is recommended to use a program to create Token. https://github.com/AgoraIO/Tools/blob/master/DynamicKey/AgoraDynamicKey/java/src/main/java/io/agora/media/RtcTokenBuilder2.java - agora: - channel: cloud - token: 007eJxTYBBinhSg416uaGdw6G9J4bSDxYZ/mTm5HErajtq2+j09r6bAYGpinGKUkphokmYMxBZJiebJqWYGaanJyUnG5haGyda/RNMaAhkZNp5YxcrIAIEgPitDck5+aQoDAwC1CB6R - uid: 65432 - - # 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: rtmp://114.235.183.163/live/livesteam/ # Example: 'rtmp://192.168.1.1/live/' - rtsp: - username: Please enter the username. - password: Please enter the password. - 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: - serverIP: Please enter the server ip. - serverPort: 7788 - serverID: Please enter the server id. - agentID: Please enter the agent id. - agentPassword: Please enter the agent password. - localPort: 7788 - channel: Please enter the channel. - # Webrtc: Only supports using whip standard - whip: - url: http://114.235.183.163:1985/rtc/v1/whip/?app=live/livesteam&stream= # Example：http://192.168.1.1:1985/rtc/v1/whip/?app=live&stream= - - - +#mqtt: +# # @see org.dromara.sample.component.mqtt.model.MqttUseEnum +# # BASIC parameters are required. +# BASIC: +# protocol: MQTT +# host: 114.235.183.162 +# port: 1883 +# username: adminPCBASIC +# password: yongqiang666 +# client-id: gengbao1211 +# # If the protocol is ws/wss, this value is required. +# path: +# DRC: +# protocol: WS +# host: 114.235.183.162 +# port: 8083 +# path: /mqtt +# username: adminPCDRC +# password: yongqiang666 +# +#cloud-sdk: +# mqtt: +# # Topics that need to be subscribed when initially connecting to mqtt, multiple topics are divided by ",". +# inbound-topic: sys/product/+/status,thing/product/+/requests +# +#url: +# manage: +# prefix: manage +# version: /api/v1 +# map: +# prefix: map +# version: /api/v1 +# media: +# prefix: media +# version: /api/v1 +# wayline: +# prefix: wayline +# version: /api/v1 +# storage: +# prefix: storage +# version: /api/v1 +# control: +# prefix: control +# version: /api/v1 +#logging: +# level: +# com.dji: debug +# file: +# name: logs/cloud-api-sample.log +# +#ntp: +# server: +# host: ntp.aliyun.com +# +## To create a license for an application: https://developer.dji.com/user/apps/#all +#cloud-api: +# app: +# id: 125297 +# key: 182ae1ca69d9ba5103c0148bf16d68b +# license: FixRisR747uGMZwaNbgCAWZojgrcUgZB1qhRyMTtptyKPKI/uETVwMK41HikhP+wbCjSKODdaQH4JIGAvzxdN/4HMrsEj3srLyGXi+BeJyFNyi94mpprv1Cx59fknCrBexAxLoc3f9GcgojEWrB0wCYxGp7l8mulwSDMP5yl++w= +# +#livestream: +# url: +# # It is recommended to use a program to create Token. https://github.com/AgoraIO/Tools/blob/master/DynamicKey/AgoraDynamicKey/java/src/main/java/io/agora/media/RtcTokenBuilder2.java +# agora: +# channel: cloud +# token: 007eJxTYBBinhSg416uaGdw6G9J4bSDxYZ/mTm5HErajtq2+j09r6bAYGpinGKUkphokmYMxBZJiebJqWYGaanJyUnG5haGyda/RNMaAhkZNp5YxcrIAIEgPitDck5+aQoDAwC1CB6R +# uid: 65432 +# +# # 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: rtmp://114.235.183.163/live/livesteam/ # Example: 'rtmp://192.168.1.1/live/' +# rtsp: +# username: Please enter the username. +# password: Please enter the password. +# 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: +# serverIP: Please enter the server ip. +# serverPort: 7788 +# serverID: Please enter the server id. +# agentID: Please enter the agent id. +# agentPassword: Please enter the agent password. +# localPort: 7788 +# channel: Please enter the channel. +# # Webrtc: Only supports using whip standard +# whip: +# url: http://114.235.183.163:1985/rtc/v1/whip/?app=live/livesteam&stream= # Example：http://192.168.1.1:1985/rtc/v1/whip/?app=live&stream= +# +# +# diff --git a/pom.xml b/pom.xml index eca3ddd..247e106 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 2.2.2 UTF-8 UTF-8 - 17 + 21 3.2.11 2023.0.3 3.2.3