From 638408723ebbf884f59ecaafcaab1c29f69bc689 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 15 Jul 2024 16:58:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/controller/FileController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/controller/FileController.java b/src/main/java/com/dji/sample/media/controller/FileController.java
index b034651..4fdd5cd 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.net.URL;
import java.util.List;
+import java.util.Objects;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -65,11 +66,12 @@
@GetMapping("/getMediaInfo")
public ResponseResult mediaInfo(@RequestParam String fileName) {
+
Object info = fileService.mediaInfo(fileName);
- if (info == null) {
- return ResponseResult.error("图片正在解析中");
+ if (info!=null){
+ return ResponseResult.success(info);
}
- return ResponseResult.success(fileService.mediaInfo(fileName));
+ return ResponseResult.success("图片正在加载");
}
@GetMapping("/{workspace_id}/files/{job_id}")
--
Gitblit v1.9.3