diff --git a/community-8073/pom.xml b/community-8073/pom.xml index 6f0f39c..6f9a9f6 100644 --- a/community-8073/pom.xml +++ b/community-8073/pom.xml @@ -41,11 +41,12 @@ spring-boot-starter-data-redis + cn.dev33 - sa-token-spring-boot-starter - 1.28.0 + sa-token-spring-boot3-starter + io.minio minio @@ -132,7 +133,6 @@ cn.dev33 sa-token-redis-jackson - 1.38.0 org.apache.commons diff --git a/community-8073/src/main/java/com/ivmiku/tutorial/config/SaTokenConfig.java b/community-8073/src/main/java/com/ivmiku/tutorial/config/SaTokenConfig.java index 6905542..9a0541c 100644 --- a/community-8073/src/main/java/com/ivmiku/tutorial/config/SaTokenConfig.java +++ b/community-8073/src/main/java/com/ivmiku/tutorial/config/SaTokenConfig.java @@ -1,6 +1,7 @@ package com.ivmiku.tutorial.config; -import cn.dev33.satoken.interceptor.SaAnnotationInterceptor; +import cn.dev33.satoken.interceptor.SaInterceptor; +import cn.dev33.satoken.stp.StpUtil; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -11,7 +12,7 @@ public class SaTokenConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { // 注册注解拦截器，并排除不需要注解鉴权的接口地址 (与登录拦截器无关) - registry.addInterceptor(new SaAnnotationInterceptor()) + registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin())) .addPathPatterns("/**"); } } diff --git a/community-8073/src/main/java/com/ivmiku/tutorial/controller/PostController.java b/community-8073/src/main/java/com/ivmiku/tutorial/controller/PostController.java index ae796d4..8855e9e 100644 --- a/community-8073/src/main/java/com/ivmiku/tutorial/controller/PostController.java +++ b/community-8073/src/main/java/com/ivmiku/tutorial/controller/PostController.java @@ -1,6 +1,7 @@ package com.ivmiku.tutorial.controller; import cn.dev33.satoken.annotation.SaCheckLogin; +import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.stp.StpUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.pagehelper.PageInfo; @@ -47,11 +48,12 @@ public class PostController { @Operation(summary = "创建帖子") public Result createPost(@RequestParam("title") String title, @RequestParam("content") String content, - @RequestParam("communityId") Long communityId, - @RequestParam("imageFiles") MultipartFile[] imageFiles, - @RequestParam("videoFile") MultipartFile videoFile, + @RequestParam(value = "communityId") Long communityId, + @RequestParam(value = "imageFiles", required = false) MultipartFile[] imageFiles, + @RequestParam(value = "videoFile", required = false) MultipartFile videoFile, @RequestParam("isPublic") Integer isPublic, - @RequestParam("location") String location) { + @RequestParam(value = "location", required = false) String location) { + System.out.println("Aaa"); String userId = StpUtil.getLoginIdAsString(); logger.info("用户ID：{}开始创建帖子", userId); @@ -278,7 +280,7 @@ public class PostController { post.setTitle(title); post.setContent(content); post.setCommunityId(communityId); - post.setIsDraft(0); // 0 表示草稿 + post.setIsDraft(1); // 0 表示草稿 post.setLocation(location); try { diff --git a/community-8073/src/main/java/com/ivmiku/tutorial/controller/TutorialController.java b/community-8073/src/main/java/com/ivmiku/tutorial/controller/TutorialController.java index ac26b2f..d12ad8d 100644 --- a/community-8073/src/main/java/com/ivmiku/tutorial/controller/TutorialController.java +++ b/community-8073/src/main/java/com/ivmiku/tutorial/controller/TutorialController.java @@ -38,7 +38,7 @@ public class TutorialController { @RequestParam(value = "imageFile", required = false) MultipartFile imageFile, @RequestParam(value = "videoFile", required = false) MultipartFile videoFile, @RequestParam("isOfficial") Integer isOfficial) { - String userId = StpUtil.getLoginIdAsString(); // 获取 userOpenid + String userId = (String) StpUtil.getLoginId(); // 获取 userOpenid logger.info("用户ID：{} 开始创建教程", userId); Tutorials tutorial = new Tutorials(); @@ -77,7 +77,7 @@ public class TutorialController { public Result getTutorial(@PathVariable Long id) { Tutorials tutorial = tutorialsService.getById(id); if (tutorial != null) { - return Result.ok("教程获取成功"); + return Result.ok(tutorial); } return Result.error("未找到教程"); } @@ -110,7 +110,7 @@ public class TutorialController { @Operation(summary = "获取所有教程") public Result listTutorials() { List tutorials = tutorialsService.list(); - return Result.ok("教程列表获取成功"); + return Result.ok(tutorials); } // 根据教程标签ID获取教程列表 @GetMapping("/listByTag/{tagId}") diff --git a/community-8073/src/main/java/com/ivmiku/tutorial/service/impl/PostServiceImpl.java b/community-8073/src/main/java/com/ivmiku/tutorial/service/impl/PostServiceImpl.java index 3423dda..769e647 100644 --- a/community-8073/src/main/java/com/ivmiku/tutorial/service/impl/PostServiceImpl.java +++ b/community-8073/src/main/java/com/ivmiku/tutorial/service/impl/PostServiceImpl.java @@ -204,7 +204,7 @@ public class PostServiceImpl extends ServiceImpl implements Po public List getDraftsByUserId(String userId) { return postMapper.selectList(new LambdaQueryWrapper() .eq(Post::getUserOpenid, userId) - .eq(Post::getIsDraft, 0)); // 0 表示草稿 + .eq(Post::getIsDraft, 1)); // 0 表示草稿 } diff --git a/community-8073/src/main/resources/application-dep.properties b/community-8073/src/main/resources/application-dep.properties index afe6821..56e2304 100644 --- a/community-8073/src/main/resources/application-dep.properties +++ b/community-8073/src/main/resources/application-dep.properties @@ -5,6 +5,7 @@ spring.data.redis.host=127.0.0.1 spring.data.redis.port=6379 spring.data.redis.database=0 + spring.application.name=community server.port=8073 diff --git a/pom.xml b/pom.xml index 18e7bd4..69c865d 100644 --- a/pom.xml +++ b/pom.xml @@ -178,6 +178,11 @@ sa-token-spring-boot3-starter ${satoken-version} + + cn.dev33 + sa-token-redis-jackson + ${satoken-version} + org.apache.dubbo