|
@@ -1,6 +1,7 @@
|
|
|
package com.yingpai.gupiao.controller;
|
|
package com.yingpai.gupiao.controller;
|
|
|
|
|
|
|
|
import com.yingpai.gupiao.domain.dto.UpdateProfileDTO;
|
|
import com.yingpai.gupiao.domain.dto.UpdateProfileDTO;
|
|
|
|
|
+import com.yingpai.gupiao.domain.dto.UserFeedbackDTO;
|
|
|
import com.yingpai.gupiao.domain.vo.LoginVO;
|
|
import com.yingpai.gupiao.domain.vo.LoginVO;
|
|
|
import com.yingpai.gupiao.domain.vo.Result;
|
|
import com.yingpai.gupiao.domain.vo.Result;
|
|
|
import com.yingpai.gupiao.service.UserService;
|
|
import com.yingpai.gupiao.service.UserService;
|
|
@@ -18,14 +19,14 @@ import org.springframework.web.bind.annotation.*;
|
|
|
@RequiredArgsConstructor
|
|
@RequiredArgsConstructor
|
|
|
@RequestMapping("/v1/user")
|
|
@RequestMapping("/v1/user")
|
|
|
public class UserController {
|
|
public class UserController {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
private final UserService userService;
|
|
private final UserService userService;
|
|
|
private final JwtUtil jwtUtil;
|
|
private final JwtUtil jwtUtil;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 获取用户信息(通过token)
|
|
* 获取用户信息(通过token)
|
|
|
* 接口路径:GET /v1/user/info
|
|
* 接口路径:GET /v1/user/info
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param authorization 请求头中的token
|
|
* @param authorization 请求头中的token
|
|
|
* @return 用户完整信息
|
|
* @return 用户完整信息
|
|
|
*/
|
|
*/
|
|
@@ -35,9 +36,9 @@ public class UserController {
|
|
|
// 从token中获取用户ID
|
|
// 从token中获取用户ID
|
|
|
String token = authorization.replace("Bearer ", "");
|
|
String token = authorization.replace("Bearer ", "");
|
|
|
Long userId = jwtUtil.getUserIdFromToken(token);
|
|
Long userId = jwtUtil.getUserIdFromToken(token);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
log.info("获取用户信息,userId: {}", userId);
|
|
log.info("获取用户信息,userId: {}", userId);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
LoginVO.UserInfoVO userInfo = userService.getUserInfo(userId);
|
|
LoginVO.UserInfoVO userInfo = userService.getUserInfo(userId);
|
|
|
return Result.success(userInfo);
|
|
return Result.success(userInfo);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -45,12 +46,12 @@ public class UserController {
|
|
|
return Result.error("获取用户信息失败:" + e.getMessage());
|
|
return Result.error("获取用户信息失败:" + e.getMessage());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 更新用户资料
|
|
* 更新用户资料
|
|
|
* 接口路径:PUT /v1/user/profile
|
|
* 接口路径:PUT /v1/user/profile
|
|
|
- *
|
|
|
|
|
- * @param authorization 请求头中的token
|
|
|
|
|
|
|
+ *
|
|
|
|
|
+ * @param authorization 请求头中的token
|
|
|
* @param updateProfileDTO 更新资料DTO
|
|
* @param updateProfileDTO 更新资料DTO
|
|
|
* @return 更新后的用户信息
|
|
* @return 更新后的用户信息
|
|
|
*/
|
|
*/
|
|
@@ -62,9 +63,9 @@ public class UserController {
|
|
|
// 从token中获取用户ID
|
|
// 从token中获取用户ID
|
|
|
String token = authorization.replace("Bearer ", "");
|
|
String token = authorization.replace("Bearer ", "");
|
|
|
Long userId = jwtUtil.getUserIdFromToken(token);
|
|
Long userId = jwtUtil.getUserIdFromToken(token);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
log.info("更新用户资料,userId: {}, nickname: {}", userId, updateProfileDTO.getNickname());
|
|
log.info("更新用户资料,userId: {}, nickname: {}", userId, updateProfileDTO.getNickname());
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
LoginVO.UserInfoVO userInfo = userService.updateProfile(userId, updateProfileDTO);
|
|
LoginVO.UserInfoVO userInfo = userService.updateProfile(userId, updateProfileDTO);
|
|
|
return Result.success(userInfo);
|
|
return Result.success(userInfo);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -72,4 +73,37 @@ public class UserController {
|
|
|
return Result.error("更新失败:" + e.getMessage());
|
|
return Result.error("更新失败:" + e.getMessage());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 提交反馈
|
|
|
|
|
+ * 接口路径:POST /v1/user/feedback/submit
|
|
|
|
|
+ *
|
|
|
|
|
+ * @param authorization 请求头中的token
|
|
|
|
|
+ * @param feedbackDTO 反馈DTO
|
|
|
|
|
+ */
|
|
|
|
|
+ @PostMapping("/feedback/submit")
|
|
|
|
|
+ public Result<Boolean> submitFeedback(
|
|
|
|
|
+ @RequestHeader("Authorization") String authorization,
|
|
|
|
|
+ @RequestBody UserFeedbackDTO feedbackDTO) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ log.info("=== 收到提交反馈请求 ===");
|
|
|
|
|
+ log.info("Authorization: {}", authorization);
|
|
|
|
|
+ log.info("反馈内容: {}", feedbackDTO.getContent());
|
|
|
|
|
+ log.info("图片数量: {}", feedbackDTO.getImages() != null ? feedbackDTO.getImages().split(",").length : 0);
|
|
|
|
|
+
|
|
|
|
|
+ // 从token中获取用户ID
|
|
|
|
|
+ String token = authorization.replace("Bearer ", "");
|
|
|
|
|
+ Long userId = jwtUtil.getUserIdFromToken(token);
|
|
|
|
|
+
|
|
|
|
|
+ log.info("提交反馈,userId: {}, content: {}", userId, feedbackDTO.getContent());
|
|
|
|
|
+
|
|
|
|
|
+ boolean success = userService.submitFeedback(userId, feedbackDTO);
|
|
|
|
|
+ log.info("提交反馈结果: {}", success);
|
|
|
|
|
+ return Result.success(success);
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ log.error("提交反馈失败", e);
|
|
|
|
|
+ return Result.error("提交失败:" + e.getMessage());
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|