11

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),
 
     ;

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;

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;
     }

dk-modules/sample/src/main/resources/application.yml

@@ -34,96 +34,96 @@ spring:
       - optional:nacos:datasource.yml
       - optional:nacos:${spring.application.name}.yml
 
-mqtt:
+#mqtt:
-  # @see org.dromara.sample.component.mqtt.model.MqttUseEnum
+#  # @see org.dromara.sample.component.mqtt.model.MqttUseEnum
-  # BASIC parameters are required.
+#  # BASIC parameters are required.
-  BASIC:
+#  BASIC:
-    protocol: MQTT
+#    protocol: MQTT
-    host: 114.235.183.162
+#    host: 114.235.183.162
-    port: 1883
+#    port: 1883
-    username: adminPCBASIC
+#    username: adminPCBASIC
-    password: yongqiang666
+#    password: yongqiang666
-    client-id: gengbao1211
+#    client-id: gengbao1211
-    # 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: WS
+#    protocol: WS
-    host: 114.235.183.162
+#    host: 114.235.183.162
-    port: 8083
+#    port: 8083
-    path: /mqtt
+#    path: /mqtt
-    username: adminPCDRC
+#    username: adminPCDRC
-    password: yongqiang666
+#    password: yongqiang666
-
+#
-cloud-sdk:
+#cloud-sdk:
-  mqtt:
+#  mqtt:
-    # Topics that need to be subscribed when initially connecting to mqtt, multiple topics are divided by ",".
+#    # Topics that need to be subscribed when initially connecting to mqtt, multiple topics are divided by ",".
-    inbound-topic: sys/product/+/status,thing/product/+/requests
+#    inbound-topic: sys/product/+/status,thing/product/+/requests
-
+#
-url:
+#url:
-  manage:
+#  manage:
-    prefix: manage
+#    prefix: manage
-    version: /api/v1
+#    version: /api/v1
-  map:
+#  map:
-    prefix: map
+#    prefix: map
-    version: /api/v1
+#    version: /api/v1
-  media:
+#  media:
-    prefix: media
+#    prefix: media
-    version: /api/v1
+#    version: /api/v1
-  wayline:
+#  wayline:
-    prefix: wayline
+#    prefix: wayline
-    version: /api/v1
+#    version: /api/v1
-  storage:
+#  storage:
-    prefix: storage
+#    prefix: storage
-    version: /api/v1
+#    version: /api/v1
-  control:
+#  control:
-    prefix: control
+#    prefix: control
-    version: /api/v1
+#    version: /api/v1
-logging:
+#logging:
-  level:
+#  level:
-    com.dji: debug
+#    com.dji: debug
-  file:
+#  file:
-    name: logs/cloud-api-sample.log
+#    name: logs/cloud-api-sample.log
-
+#
-ntp:
+#ntp:
-  server:
+#  server:
-    host: ntp.aliyun.com
+#    host: ntp.aliyun.com
-
+#
-# 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: 125297
+#    id: 125297
-    key: 182ae1ca69d9ba5103c0148bf16d68b
+#    key: 182ae1ca69d9ba5103c0148bf16d68b
-    license: FixRisR747uGMZwaNbgCAWZojgrcUgZB1qhRyMTtptyKPKI/uETVwMK41HikhP+wbCjSKODdaQH4JIGAvzxdN/4HMrsEj3srLyGXi+BeJyFNyi94mpprv1Cx59fknCrBexAxLoc3f9GcgojEWrB0wCYxGp7l8mulwSDMP5yl++w=
+#    license: FixRisR747uGMZwaNbgCAWZojgrcUgZB1qhRyMTtptyKPKI/uETVwMK41HikhP+wbCjSKODdaQH4JIGAvzxdN/4HMrsEj3srLyGXi+BeJyFNyi94mpprv1Cx59fknCrBexAxLoc3f9GcgojEWrB0wCYxGp7l8mulwSDMP5yl++w=
-
+#
-livestream:
+#livestream:
-  url:
+#  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
+#    # 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:
+#    agora:
-      channel: cloud
+#      channel: cloud
-      token: 007eJxTYBBinhSg416uaGdw6G9J4bSDxYZ/mTm5HErajtq2+j09r6bAYGpinGKUkphokmYMxBZJiebJqWYGaanJyUnG5haGyda/RNMaAhkZNp5YxcrIAIEgPitDck5+aQoDAwC1CB6R
+#      token: 007eJxTYBBinhSg416uaGdw6G9J4bSDxYZ/mTm5HErajtq2+j09r6bAYGpinGKUkphokmYMxBZJiebJqWYGaanJyUnG5haGyda/RNMaAhkZNp5YxcrIAIEgPitDck5+aQoDAwC1CB6R
-      uid:  65432
+#      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  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: rtmp://114.235.183.163/live/livesteam/  # Example: 'rtmp://192.168.1.1/live/'
+#      url: rtmp://114.235.183.163/live/livesteam/  # Example: 'rtmp://192.168.1.1/live/'
-    rtsp:
+#    rtsp:
-      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.
-      serverPort: 7788
+#      serverPort: 7788
-      serverID: Please enter the server id.
+#      serverID: Please enter the server id.
-      agentID: Please enter the agent id.
+#      agentID: Please enter the agent id.
-      agentPassword: Please enter the agent password.
+#      agentPassword: Please enter the agent password.
-      localPort: 7788
+#      localPort: 7788
-      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: 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=
+#      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=
-
+#
-
+#
-
+#
 

pom.xml

@@ -16,7 +16,7 @@
         <revision>2.2.2</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <spring-boot.version>3.2.11</spring-boot.version>
         <spring-cloud.version>2023.0.3</spring-cloud.version>
         <spring-boot-admin.version>3.2.3</spring-boot-admin.version>