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 0190396..bd8ffec 100644 Binary files a/target/classes/com/yovinchen/forum/controller/UmsUserController.class and b/target/classes/com/yovinchen/forum/controller/UmsUserController.class differ