Merge remote-tracking branch 'origin/ht-dev' into ht-dev

rain

2024-08-20 74d1c21ebb6b3b916904d95d13d289df23dcdedd

 src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@
#          url: jdbc:mysql://182.108.40.114:3308/drone_zt_test?useSSL=false&allowPublicKeyRetrieval=true
#          username: root
#          password: yshb@123
          url: jdbc:mysql://139.196.74.78:3306/drone_test?useSSL=false&allowPublicKeyRetrieval=true
          url: jdbc:mysql://139.196.74.78:3306/drone_o_test?useSSL=false&allowPublicKeyRetrieval=true
          username: root
          password: jxpskj_2018
        sqlite-resource:
@@ -62,10 +62,10 @@
  # BASIC parameters are required.
  BASIC:
    protocol: MQTT # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
    host: 139.196.74.78
    port: 1883
    username: manage
    password: 123456
    host: 182.108.40.114
    port: 31883
    username: root
    password: root
#    host: 127.0.0.1
#    port: 1883
#    username: guest
@@ -74,13 +74,13 @@
    # If the protocol is ws/wss, this value is required.
    path:
    # 最初连接到mqtt时需要订阅的主题 多个订阅用 "," .
    inbound-topic: sys/product/+/status,thing/product/+/requests,thing/product/+/osd
#    inbound-topic: sys/product/+/+,thing/product/+/+
#    inbound-topic: sys/product/+/status,thing/product/+/requests,thing/product/+/osd
    inbound-topic: sys/product/+/+,thing/product/+/+
  DRC:
    protocol: WS # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
    host: 139.196.74.78
    port: 8083
    path: /mqtt
    protocol: ws # @see com.dji.sample.component.mqtt.model.MqttProtocolEnum
    host: 182.108.40.114
    port: 35675
    path: /ws

oss:
  enable: true