From c3432d4eef8e6545708e30004189ca3f27b8a067 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 04 七月 2024 17:58:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/controller/student/UploadController.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/student/UploadController.java b/src/main/java/com/ycl/jxkg/controller/student/UploadController.java
index 16fa105..b67e3a2 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/UploadController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/UploadController.java
@@ -2,9 +2,10 @@
import com.ycl.jxkg.base.BaseApiController;
-import com.ycl.jxkg.base.RestResponse;
+import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.service.FileUpload;
import com.ycl.jxkg.service.UserService;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -16,7 +17,7 @@
import java.io.IOException;
import java.io.InputStream;
-
+@RequiredArgsConstructor
@RequestMapping("/api/student/upload")
@RestController("StudentUploadController")
public class UploadController extends BaseApiController {
@@ -24,16 +25,10 @@
private final FileUpload fileUpload;
private final UserService userService;
- @Autowired
- public UploadController(FileUpload fileUpload, UserService userService) {
- this.fileUpload = fileUpload;
- this.userService = userService;
- }
-
@RequestMapping("/image")
@ResponseBody
- public RestResponse questionUploadAndReadExcel(HttpServletRequest request) {
+ public Result questionUploadAndReadExcel(HttpServletRequest request) {
MultipartHttpServletRequest multipartHttpServletRequest = (MultipartHttpServletRequest) request;
MultipartFile multipartFile = multipartHttpServletRequest.getFile("file");
long attachSize = multipartFile.getSize();
@@ -41,9 +36,9 @@
try (InputStream inputStream = multipartFile.getInputStream()) {
String filePath = fileUpload.uploadFile(inputStream, attachSize, imgName);
userService.changePicture(getCurrentUser(), filePath);
- return RestResponse.ok(filePath);
+ return Result.ok(filePath);
} catch (IOException e) {
- return RestResponse.fail(2, e.getMessage());
+ return Result.fail(2, e.getMessage());
}
}
--
Gitblit v1.8.0