From d81fdeef2ad2f7ecc548cebad6ab15455bf3da27 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 30 Jul 2024 14:53:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/storage/controller/StorageController.java | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/dji/sample/storage/controller/StorageController.java b/src/main/java/com/dji/sample/storage/controller/StorageController.java
index 7c40607..01147e7 100644
--- a/src/main/java/com/dji/sample/storage/controller/StorageController.java
+++ b/src/main/java/com/dji/sample/storage/controller/StorageController.java
@@ -1,13 +1,8 @@
package com.dji.sample.storage.controller;
import com.dji.sample.common.model.ResponseResult;
-import com.dji.sample.component.oss.model.AliyunOSSConfiguration;
-import com.dji.sample.component.oss.model.MinIOConfiguration;
import com.dji.sample.media.model.StsCredentialsDTO;
import com.dji.sample.storage.service.IStorageService;
-import com.dji.sample.storage.service.impl.AliyunStorageServiceImpl;
-import com.dji.sample.storage.service.impl.MinIOStorageServiceImpl;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
@@ -21,24 +16,11 @@
*/
@RestController
@RequestMapping("${url.storage.prefix}${url.storage.version}/workspaces/")
-@Slf4j
public class StorageController {
+ @Autowired
private IStorageService storageService;
- @Autowired
- private void setOssService(@Autowired(required = false) AliyunStorageServiceImpl aliyunStorageService,
- @Autowired(required = false) MinIOStorageServiceImpl minIOStorageService) {
- if (AliyunOSSConfiguration.enable) {
- this.storageService = aliyunStorageService;
- return;
- }
- if (MinIOConfiguration.enable) {
- this.storageService = minIOStorageService;
- return;
- }
- log.error("storageService is null.");
- }
/**
* Get temporary credentials for uploading the media and wayline in DJI Pilot.
* @param workspaceId
@@ -50,4 +32,5 @@
StsCredentialsDTO stsCredentials = storageService.getSTSCredentials();
return ResponseResult.success(stsCredentials);
}
+
}
--
Gitblit v1.9.3