From 28bc67b88a9eb4c1d3686c3579dbb417085e0208 Mon Sep 17 00:00:00 2001 From: xiaoqiantx223 <491437285@qq.com> Date: Thu, 18 Jul 2024 14:01:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maku-framework/src/main/resources/auth.yml | 3 ++- .../net/maku/maku/controller/TUserController.java | 27 +++++++++++++++++----- .../maku/maku/service/impl/TUserServiceImpl.java | 4 +--- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/maku-framework/src/main/resources/auth.yml b/maku-framework/src/main/resources/auth.yml index 00fcd50..918c917 100644 --- a/maku-framework/src/main/resources/auth.yml +++ b/maku-framework/src/main/resources/auth.yml @@ -12,4 +12,5 @@ auth: - /maku/t_user/login - /maku/t_user/updateUser - /maku/t_user/register - - /maku/t_user/logout \ No newline at end of file + - /maku/t_user/logout + - /maku/t_user/info/{username} \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/controller/TUserController.java b/maku-server/src/main/java/net/maku/maku/controller/TUserController.java index ff71544..15e0fbf 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TUserController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TUserController.java @@ -1,5 +1,7 @@ package net.maku.maku.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -13,14 +15,16 @@ import net.maku.maku.entity.TUserEntity; import net.maku.maku.service.TUserService; import net.maku.maku.query.TUserQuery; import net.maku.maku.vo.TUserVO; -import oracle.jdbc.proxy.annotation.Post; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import jakarta.validation.Valid; + +import java.time.Duration; import java.util.List; +import java.util.UUID; /** * @@ -36,6 +40,7 @@ public class TUserController { private final TUserService tUserService; private final RedisCache redisCache; + @PostMapping("/register") @Operation(summary = "注册") public ResponseEntity> register(@RequestBody TUserEntity entity) { @@ -54,28 +59,38 @@ public class TUserController { public Result login(@RequestBody TUserEntity entity){ TUserEntity entity1 = tUserService.login(entity); if(ObjectUtils.isNotNull(entity1)){ - return Result.ok(entity1); + String token = UUID.randomUUID()+""; + redisCache.set(token, entity1); + return Result.ok(token); }else { return Result.error("登录失败"); } } - @GetMapping("/updateUser") + + + @PutMapping("/updateUser") @Operation(summary = "修改") public Result updateUser(@RequestBody TUserVO vo){ TUserVO tUserVO = tUserService.updateUser(vo); return Result.ok(tUserVO); } + //根据用户的用户名获取属性 +// @PostMapping("/info/{username}") +// @Operation(summary = "用户中心") +// public Result findByUsername(@PathVariable String username){ +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.eq(,username); +// return Result.ok(); +// } + @PostMapping("/logout") @Operation(summary = "退出登录") public Result logout(HttpServletRequest request) { String token = request.getHeader("token"); - if (token == null) { - return Result.error("token为空"); - } Object o = redisCache.get(token); if (o != null) { redisCache.delete(token); diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java index 3cea877..8590454 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TUserServiceImpl.java @@ -69,9 +69,6 @@ public class TUserServiceImpl extends BaseServiceImpl imp wrapper.eq(TUserEntity::getPassword, entity.getPassword()); TUserEntity one = getOne(wrapper); if(ObjectUtils.isNotNull(one)) { - UUID uuid = UUID.randomUUID(); - one.setAvatar(uuid.toString()); - updateById(one); return one; } return null; @@ -80,6 +77,7 @@ public class TUserServiceImpl extends BaseServiceImpl imp @Override public TUserVO updateUser(TUserVO vo) { TUserEntity entity = new TUserEntity(); + entity.setId(vo.getId()); entity.setUsername(vo.getUsername()); entity.setPassword(vo.getPassword()); updateById(entity); From 00a062331bf9940e91acd7c5286bd4d8234d25d3 Mon Sep 17 00:00:00 2001 From: xiaoqiantx223 <491437285@qq.com> Date: Thu, 18 Jul 2024 14:45:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maku-framework/src/main/resources/auth.yml | 2 +- .../net/maku/maku/controller/TUserController.java | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/maku-framework/src/main/resources/auth.yml b/maku-framework/src/main/resources/auth.yml index 918c917..8e68d07 100644 --- a/maku-framework/src/main/resources/auth.yml +++ b/maku-framework/src/main/resources/auth.yml @@ -13,4 +13,4 @@ auth: - /maku/t_user/updateUser - /maku/t_user/register - /maku/t_user/logout - - /maku/t_user/info/{username} \ No newline at end of file + - /maku/t_user/info \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/controller/TUserController.java b/maku-server/src/main/java/net/maku/maku/controller/TUserController.java index 15e0fbf..7bb8fef 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TUserController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TUserController.java @@ -68,8 +68,6 @@ public class TUserController { } - - @PutMapping("/updateUser") @Operation(summary = "修改") public Result updateUser(@RequestBody TUserVO vo){ @@ -77,14 +75,14 @@ public class TUserController { return Result.ok(tUserVO); } - //根据用户的用户名获取属性 -// @PostMapping("/info/{username}") -// @Operation(summary = "用户中心") -// public Result findByUsername(@PathVariable String username){ -// QueryWrapper wrapper = new QueryWrapper<>(); -// wrapper.eq(,username); -// return Result.ok(); -// } + + @GetMapping("/info") + @Operation(summary = "用户中心") + public Result findByUsername(HttpServletRequest request){ + String token = request.getHeader("token"); + TUserEntity entity = (TUserEntity) redisCache.get(token); + return Result.ok(entity); + } @PostMapping("/logout") @@ -96,7 +94,7 @@ public class TUserController { redisCache.delete(token); return Result.ok("退出登录"); } - return Result.error("登录失败"); + return Result.error("登出失败"); } @GetMapping("page") From 9abbaea73eded0cb4758f11eee345510c5ceccfd Mon Sep 17 00:00:00 2001 From: zhao <2796247050@qq.com> Date: Thu, 18 Jul 2024 15:08:37 +0800 Subject: [PATCH 3/4] zyh --- maku-framework/src/main/resources/auth.yml | 4 +++- .../src/main/java/net/maku/maku/controller/TBookController.java | 5 ++--- maku-server/src/main/java/net/maku/maku/service/TBookService.java | 2 +- .../src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/maku-framework/src/main/resources/auth.yml b/maku-framework/src/main/resources/auth.yml index 8e68d07..6adef47 100644 --- a/maku-framework/src/main/resources/auth.yml +++ b/maku-framework/src/main/resources/auth.yml @@ -13,4 +13,6 @@ auth: - /maku/t_user/updateUser - /maku/t_user/register - /maku/t_user/logout - - /maku/t_user/info \ No newline at end of file + - /maku/t_user/info + - /maku/t_book/list/search + - /maku/t_book/{id} \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/controller/TBookController.java b/maku-server/src/main/java/net/maku/maku/controller/TBookController.java index 874cbf7..c9140a6 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TBookController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TBookController.java @@ -50,9 +50,8 @@ public class TBookController { @GetMapping("/list/search") @Operation(summary = "根据书名查询书籍") @Parameter - public Result getByName(@RequestParam String name){ - TBookEntity entity = tBookService.getByName(name); - + public Result getByName(@RequestParam String bookName){ + TBookEntity entity = tBookService.getByName(bookName); return Result.ok(entity); } diff --git a/maku-server/src/main/java/net/maku/maku/service/TBookService.java b/maku-server/src/main/java/net/maku/maku/service/TBookService.java index 1d975c4..6b62863 100644 --- a/maku-server/src/main/java/net/maku/maku/service/TBookService.java +++ b/maku-server/src/main/java/net/maku/maku/service/TBookService.java @@ -24,5 +24,5 @@ public interface TBookService extends BaseService { void delete(List idList); - TBookEntity getByName(String name); + TBookEntity getByName(String bookName); } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java index d51002f..965081a 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java @@ -62,9 +62,9 @@ public class TBookServiceImpl extends BaseServiceImpl imp } @Override - public TBookEntity getByName(String name) { + public TBookEntity getByName(String bookName) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.eq(TBookEntity::getBookName, name); + wrapper.eq(TBookEntity::getBookName, bookName); return baseMapper.selectOne(wrapper); } From f4d4047b900b67dfb9c1b95067191ccdd4c5be9a Mon Sep 17 00:00:00 2001 From: zhao <2796247050@qq.com> Date: Thu, 18 Jul 2024 17:45:18 +0800 Subject: [PATCH 4/4] zyh --- .../main/java/net/maku/maku/controller/TBookCommentController.java | 3 +-- .../src/main/java/net/maku/maku/controller/TBookController.java | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/maku-server/src/main/java/net/maku/maku/controller/TBookCommentController.java b/maku-server/src/main/java/net/maku/maku/controller/TBookCommentController.java index 95fc087..0cc316a 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TBookCommentController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TBookCommentController.java @@ -48,12 +48,11 @@ public class TBookCommentController { return Result.ok(TBookCommentConvert.INSTANCE.convert(entity)); } - @PostMapping + @PostMapping("/comment") @Operation(summary = "保存") @PreAuthorize("hasAuthority('maku:t_book_comment:save')") public Result save(@RequestBody TBookCommentVO vo){ tBookCommentService.save(vo); - return Result.ok(); } diff --git a/maku-server/src/main/java/net/maku/maku/controller/TBookController.java b/maku-server/src/main/java/net/maku/maku/controller/TBookController.java index c9140a6..f4c56e6 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TBookController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TBookController.java @@ -54,9 +54,6 @@ public class TBookController { TBookEntity entity = tBookService.getByName(bookName); return Result.ok(entity); } - - - @GetMapping("page") @Operation(summary = "分页") @PreAuthorize("hasAuthority('maku:t_book:page')") @@ -65,8 +62,6 @@ public class TBookController { return Result.ok(page); } - - @GetMapping("{id}") @Operation(summary = "信息") // @PreAuthorize("hasAuthority('maku:t_book:info')") @@ -74,7 +69,6 @@ public class TBookController { TBookEntity entity = tBookService.getById(id); return Result.ok(TBookConvert.INSTANCE.convert(entity)); } - @PostMapping @Operation(summary = "保存") @PreAuthorize("hasAuthority('maku:t_book:save')")