From ca4e829a60e74774f6ef87fc62d23094aadb9859 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期六, 23 十二月 2023 23:09:19 +0800
Subject: [PATCH] 第一阶段
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index ab1a56f..c9a93bc 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -1,5 +1,11 @@
package com.yuanchu.mom.controller;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -7,8 +13,11 @@
import com.yuanchu.mom.utils.RedisUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.DigestUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
@@ -29,7 +38,7 @@
@PostMapping("/enter")
public Result login(String account, String password) {
User user = userService.selectUserByPwd(account, password);
- if (user==null) return Result.fail("鐧诲綍澶辫触");
+ if (user == null) return Result.fail("鐧诲綍澶辫触");
String jwtToken = jwt.createJwt(user.getName(), user.getId(), 60);
String jwtReToken = jwt.createJwt(user.getName(), user.getId(), 24 * 60);
RedisUtil.set("" + user.getId(), jwtToken, 60);
@@ -66,4 +75,27 @@
return Result.fail(map.get("info"));
}
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
+ @PostMapping("/selectUserList")
+ public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
+ return Result.success(userService.selectUserList(page, user));
+ }
+
+ @ApiOperation(value = "淇敼鐢ㄦ埛淇℃伅")
+ @PostMapping("/updateUser")
+ public Result<?> updateUser(@RequestBody User user) {
+ if ("".equals(user.getPassword())) user.setPassword(null);
+ else user.setPassword(DigestUtils.md5DigestAsHex(user.getPassword().getBytes()));
+ return Result.success(userService.updateUser(user));
+ }
+
+ @ApiOperation(value = "娣诲姞鐢ㄦ埛淇℃伅")
+ @PostMapping("/addUser")
+ public Result<?> addUser(@RequestBody User user) {
+ if ("".equals(user.getPassword())) user.setPassword(null);
+ else user.setPassword(DigestUtils.md5DigestAsHex(user.getPassword().getBytes()));
+ return Result.success(userService.addUser(user));
+ }
}
--
Gitblit v1.9.3