From 78f8d067276a11c0450e9df51aa8786b19aab535 Mon Sep 17 00:00:00 2001 From: yovinchen Date: Wed, 14 Jun 2023 20:13:38 +0800 Subject: [PATCH] Changes --- .idea/compiler.xml | 4 ++-- .idea/misc.xml | 2 +- pom.xml | 2 +- .../yovinchen/forum/config/Knife4jConfig.java | 14 +++++++------- .../forum/controller/GiteeLogin.java | 11 ----------- .../forum/controller/UmsUserController.java | 9 ++++++++- .../forum/controller/UmsUserController.class | Bin 8603 -> 8818 bytes 7 files changed, 19 insertions(+), 23 deletions(-) delete mode 100644 src/main/java/com/yovinchen/forum/controller/GiteeLogin.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index deb76fb..fe26a3d 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 47988e6..9d31bee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -14,7 +14,7 @@ - + diff --git a/pom.xml b/pom.xml index f9516a6..203bfee 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.yovinchen - forum + forum-backend 0.0.1-SNAPSHOT doubao Demo project for Spring Boot diff --git a/src/main/java/com/yovinchen/forum/config/Knife4jConfig.java b/src/main/java/com/yovinchen/forum/config/Knife4jConfig.java index 5486a42..218b2f6 100644 --- a/src/main/java/com/yovinchen/forum/config/Knife4jConfig.java +++ b/src/main/java/com/yovinchen/forum/config/Knife4jConfig.java @@ -1,12 +1,5 @@ package com.yovinchen.forum.config; -/** - * ClassName: config - * Package: com.yovinchen.forum.config - * - * @author yovinchen - * @Create 2023/6/14 16:51 - */ import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import org.springframework.context.annotation.Bean; @@ -20,6 +13,13 @@ import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; +/** + * ClassName: config + * Package: com.yovinchen.forum.config + * + * @author yovinchen + * @Create 2023/6/14 16:51 + */ @Configuration @EnableSwagger2 @EnableKnife4j diff --git a/src/main/java/com/yovinchen/forum/controller/GiteeLogin.java b/src/main/java/com/yovinchen/forum/controller/GiteeLogin.java deleted file mode 100644 index 52d1c61..0000000 --- a/src/main/java/com/yovinchen/forum/controller/GiteeLogin.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yovinchen.forum.controller; - -/** - * ClassName: GiteeLogin - * Package: com.yovinchen.forum.controller - * /oauth/callback - * @author yovinchen - * @Create 2023/6/14 20:11 - */ -public class GiteeLogin { -} diff --git a/src/main/java/com/yovinchen/forum/controller/UmsUserController.java b/src/main/java/com/yovinchen/forum/controller/UmsUserController.java index 458b34f..d0e2740 100644 --- a/src/main/java/com/yovinchen/forum/controller/UmsUserController.java +++ b/src/main/java/com/yovinchen/forum/controller/UmsUserController.java @@ -22,6 +22,7 @@ import javax.annotation.Resource; import javax.validation.Valid; import java.util.HashMap; import java.util.Map; +import java.util.Objects; @Api(tags = "用户管理接口") @RestController @@ -75,7 +76,13 @@ public class UmsUserController extends BaseController { Map map = new HashMap<>(16); UmsUser user = iUmsUserService.getUserByUsername(username); Assert.notNull(user, "用户不存在"); - Page page = iBmsPostService.page(new Page<>(pageNo, size), new LambdaQueryWrapper().eq(BmsPost::getUserId, user.getId())); + Page page; + if (Objects.equals(user.getUsername(), "admin")) { + page = iBmsPostService.page(new Page<>(pageNo, size), null); + } else { + page = iBmsPostService.page(new Page<>(pageNo, size), new LambdaQueryWrapper().eq(BmsPost::getUserId, user.getId())); + + } map.put("user", user); map.put("topics", page); return ApiResult.success(map); diff --git a/target/classes/com/yovinchen/forum/controller/UmsUserController.class b/target/classes/com/yovinchen/forum/controller/UmsUserController.class index 0190396170862bb85f0e52aa62cd6b30e1d6d015..bd8ffece05418c69a8b3b4f862ab5f442c48ffbe 100644 GIT binary patch delta 2802 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 Vv0k7a;r@#xX&qj|%XkIr{{;<@$kG4+