From 2caa210098644f51ff46daa33b87ce4b7f862a91 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 10:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htxx_dev' into htxx_dev
---
src/main/java/com/dji/sample/media/controller/FileController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 6b0c8e8..e2daa1b 100644
--- a/src/main/java/com/dji/sample/media/controller/FileController.java
+++ b/src/main/java/com/dji/sample/media/controller/FileController.java
@@ -1,5 +1,6 @@
package com.dji.sample.media.controller;
+import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.media.model.MediaFileDTO;
@@ -9,9 +10,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URL;
+
+import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
/**
* @author sean
@@ -40,8 +44,10 @@
return ResponseResult.success(filesList);
}
- @GetMapping("/{workspace_id}/updateFile")
- public ResponseResult updateFile(@PathVariable(name = "workspace_id") String workspaceId, MediaFileEntity mediaFileEntity) {
+ @PostMapping("/{workspace_id}/updateFile")
+ public ResponseResult updateFile(HttpServletRequest request, @PathVariable(name = "workspace_id") String workspaceId, @RequestBody MediaFileEntity mediaFileEntity) {
+ CustomClaim claims = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
+ mediaFileEntity.setUserId(claims.getId());
return ResponseResult.success(fileService.updateMediaFile(workspaceId, mediaFileEntity));
}
--
Gitblit v1.9.3