From a8e83d12274b776b215895273e7021c4eb2ba789 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 05 六月 2025 09:54:07 +0800
Subject: [PATCH] 小程序接口 发布优化 首页放行
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserController.java | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserController.java
index dd34949..7352939 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -8,7 +8,11 @@
import com.ruoyi.common.utils.NumberUtil;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.model.TbQuestion;
+import com.ruoyi.system.model.TbSystemConfig;
import com.ruoyi.system.model.TbUser;
+import com.ruoyi.system.service.TbQuestionService;
+import com.ruoyi.system.service.TbSystemConfigService;
import com.ruoyi.system.service.TbUserService;
import com.ruoyi.system.vo.InviteUserListVo;
import io.swagger.annotations.Api;
@@ -16,12 +20,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.TimeUnit;
@Slf4j
@@ -36,21 +39,25 @@
@Autowired
private TokenService tokenService;
+ @Autowired
+ private TbQuestionService questionService;
+
+ @Autowired
+ private TbSystemConfigService systemConfigService;
+
@ApiOperation(value = "修改用户信息",tags = {"用户模块"})
@PostMapping("/updateUserInfo")
public R<?> updateUserInfo(String avatar,String username) {
LoginUser loginUser = tokenService.getLoginUser();
- if (StringUtils.isBlank(avatar)) {
- return R.fail("头像不能为空");
- }
- if (StringUtils.isBlank(username)) {
- return R.fail("姓名不能为空");
- }
Long userId = loginUser.getUserId();
TbUser user = userService.getById(userId);
- user.setUserName(username);
- user.setAvatar(avatar);
+ if(StringUtils.isNotEmpty(username)) {
+ user.setUserName(username);
+ }
+ if(StringUtils.isNotEmpty(avatar)){
+ user.setAvatar(avatar);
+ }
userService.updateById(user);
return R.ok();
}
@@ -66,7 +73,7 @@
}
@ApiOperation(value = "账号注销",tags = {"用户模块"})
- @GetMapping("/accountCancellation")
+ @PostMapping("/accountCancellation")
public R<?> accountCancellation() {
LoginUser loginUser = tokenService.getLoginUser();
Long userId = loginUser.getUserId();
@@ -102,4 +109,27 @@
}
+ @ApiOperation(value = "常见问题",tags = {"用户模块"})
+ @GetMapping("/getQuestion")
+ public R<List<TbQuestion>> getQuestion() {
+ List<TbQuestion> list = questionService.list(new LambdaQueryWrapper<TbQuestion>().eq(TbQuestion::getDelFlag,0).orderByDesc(TbQuestion::getOrderNum));
+ return R.ok(list);
+ }
+
+ @ApiOperation(value = "客服",tags = {"用户模块"})
+ @GetMapping("/customerService")
+ public R<String> customerService() {
+ TbSystemConfig config = systemConfigService.getOne(new LambdaQueryWrapper<TbSystemConfig>().eq(TbSystemConfig::getType, 2));
+ String content = config.getContent();
+ return R.ok(content);
+ }
+
+
+ @ApiOperation(value = "退出登录",tags = {"用户模块"})
+ @PostMapping("/quit")
+ public R<String> quit(HttpServletRequest request) {
+ tokenService.quitLogin(request);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1