From 544ebe49dbc2fa0d686cc7ff2d999235ee909828 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 26 Apr 2024 08:49:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/control/model/enums/RemoteDebugMethodEnum.java | 2 ++
src/main/resources/application-dev.yml | 2 +-
src/main/resources/application-prod.yml | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/dji/sample/control/model/enums/RemoteDebugMethodEnum.java b/src/main/java/com/dji/sample/control/model/enums/RemoteDebugMethodEnum.java
index 3bfed6e..0797662 100644
--- a/src/main/java/com/dji/sample/control/model/enums/RemoteDebugMethodEnum.java
+++ b/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),
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f0ab298..a83df86 100644
--- a/src/main/resources/application-dev.yml
+++ b/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:
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 3a8b41f..731f40b 100644
--- a/src/main/resources/application-prod.yml
+++ b/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
--
Gitblit v1.9.3