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

rain

2024-04-26 544ebe49dbc2fa0d686cc7ff2d999235ee909828

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

 src/main/java/com/dji/sample/control/model/enums/RemoteDebugMethodEnum.java

@@ -24,6 +24,8 @@

    RETURN_HOME("return_home", false, ReturnHomeState.class),

    RETURN_HOME_CANCEL("return_home_cancel", false, ReturnHomeState.class),

    DEVICE_REBOOT("device_reboot", true, null),

    DRONE_OPEN("drone_open", true, null),

 src/main/resources/application-dev.yml

@@ -92,7 +92,7 @@
  expire: 3600
  region: us-east-1
  object-dir-prefix:
  out-net-file-address: http://dev.jxpskj.com:9000
  out-net-file-address: https://dev.jxpskj.com:8026

#图斑的解压地址和图斑文件转航线文件的地址
patches:

 src/main/resources/application-prod.yml

@@ -84,8 +84,8 @@
oss:
  enable: true
  provider: minio
  endpoint: https://dev.jxpskj.com:8026
  external-endpoint: https://dev.jxpskj.com:8026
  endpoint: http://dev.jxpskj.com:9000
  external-endpoint: http://dev.jxpskj.com:9000
  access-key: pskj
  secret-key: pskj@2021
  bucket: cloud-bucket