localnet/localhost-back
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'khj' into main

Browse Source
This commit is contained in:
khj0414 2025-02-10 10:53:14 +09:00
commit 8d88545c2b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/io/company/localhost/controller/api/worddictController.java
View File

@ -109,7 +109,9 @@ public class worddictController {
public ApiResponse<Long> insertWord(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) { public ApiResponse<Long> insertWord(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) {
//userId //userId
Long userId = AuthUtil.getUser().getId(); //Long userId = AuthUtil.getUser().getId();
//임시
int userId = 38;
map.put("userId", userId); map.put("userId", userId);
Long result = worddictyservice.insertWord(map); Long result = worddictyservice.insertWord(map);
@ -126,7 +128,9 @@ public class worddictController {
public ApiResponse<Long> updateWord(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) { public ApiResponse<Long> updateWord(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) {
//userId //userId
Long userId = AuthUtil.getUser().getId(); //Long userId = AuthUtil.getUser().getId();
//임시
int userId = 38;
map.put("userId", userId); map.put("userId", userId);
Long result = worddictyservice.updateWord(map); Long result = worddictyservice.updateWord(map);

1
src/main/java/io/company/localhost/controller/common/ImageUploadController.java
View File

@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;