diff --git a/ruoyi-modules/ruoyi-content/pom.xml b/ruoyi-modules/ruoyi-content/pom.xml index 7b4033420..6775e0aa3 100644 --- a/ruoyi-modules/ruoyi-content/pom.xml +++ b/ruoyi-modules/ruoyi-content/pom.xml @@ -141,7 +141,16 @@ okhttp 4.12.0 - + + io.swagger + swagger-annotations + 1.6.2 + compile + + + org.springframework.amqp + spring-rabbit + diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/RedisConfig.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/RedisConfig.java index 55520f441..108d5d5fb 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/RedisConfig.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/RedisConfig.java @@ -34,7 +34,6 @@ public class RedisConfig { * 配置redisTemplate * * @param redisConnectionFactory - * @param enableTransactionSupport * @return */ private RedisTemplate buildRedisTemplate(RedisConnectionFactory redisConnectionFactory) { diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/knife4jConfig.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/knife4jConfig.java deleted file mode 100644 index 62609ae86..000000000 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/config/knife4jConfig.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.wzj.soopin.content.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.Contact; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; - -/** - * @author vercen - * @version 1.0 - * @date 2023/5/20 19:55 - */ -@Configuration -@EnableSwagger2WebMvc -public class knife4jConfig { - @Bean - public Docket defaultApi2() { - Docket docket=new Docket(DocumentationType.SWAGGER_2) - .apiInfo(new ApiInfoBuilder() - //.title("swagger-bootstrap-ui-demo RESTful APIs") - .description("短视频实战接口文档") - .termsOfServiceUrl("http://www.xx.com/") - .contact(new Contact("lee", "http://www.imooc.com/", "abc@imooc.com")) - .version("1.0") - .build()) - //分组名称 - .groupName("2.X版本") - .select() - //这里指定Controller扫描包路径 - .apis(RequestHandlerSelectors.basePackage("com.imooc.controller")) - .paths(PathSelectors.any()) - .build(); - return docket; - } -} diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/CommentController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/CommentController.java index 8b1a59981..51819115f 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/CommentController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/CommentController.java @@ -10,7 +10,6 @@ import com.wzj.soopin.content.enums.MessageEnum; import com.wzj.soopin.content.service.CommentService; import com.wzj.soopin.content.service.MsgService; import com.wzj.soopin.content.service.VlogService; -import io.swagger.annotations.Api; import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -25,7 +24,6 @@ import java.util.Map; @Slf4j -@Api(tags = "CommentController 评论模块的接口") @RequestMapping("comment") @RestController public class CommentController extends BaseInfoProperties { diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/MsgController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/MsgController.java index a8e78f308..876ffc929 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/MsgController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/MsgController.java @@ -4,7 +4,6 @@ import com.wzj.soopin.content.domain.base.BaseInfoProperties; import com.wzj.soopin.content.domain.mo.MessageMO; import com.wzj.soopin.content.result.GraceJSONResult; import com.wzj.soopin.content.service.MsgService; -import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -15,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; @Slf4j -@Api(tags = "MsgController 消息功能模块的接口") @RequestMapping("msg") @RestController public class MsgController extends BaseInfoProperties { diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/PassportController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/PassportController.java index 569623eb1..01082b099 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/PassportController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/PassportController.java @@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.web.bind.annotation.*; @@ -34,7 +33,6 @@ import java.util.UUID; @Slf4j @RestController @RequestMapping("passport") -@Api(tags = "通行证，验证码登录注册") public class PassportController extends BaseInfoProperties { @Autowired private SMSUtils smsUtils; @@ -42,8 +40,8 @@ public class PassportController extends BaseInfoProperties { @Autowired private UserService userService; - @Autowired - private PasswordEncoder passwordEncoder; +// @Autowired +// private PasswordEncoder passwordEncoder; @PostMapping("getSMSCode") public Object getSMSCode(@RequestParam String mobile, HttpServletRequest request) throws Exception { @@ -181,9 +179,9 @@ public class PassportController extends BaseInfoProperties { if (user == null) { return GraceJSONResult.errorCustom(ResponseStatusEnum.USER_NOT_EXIST_ERROR); } - if (!passwordEncoder.matches(password, user.getPassword())) { - return GraceJSONResult.errorCustom(ResponseStatusEnum.USER_PASSWORD_ERROR); - } +// if (!passwordEncoder.matches(password, user.getPassword())) { +// return GraceJSONResult.errorCustom(ResponseStatusEnum.USER_PASSWORD_ERROR); +// } String uToken = UUID.randomUUID().toString(); log.info(uToken); diff --git a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/UserInfoController.java b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/UserInfoController.java index b45c5ab6d..430da2761 100644 --- a/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/UserInfoController.java +++ b/ruoyi-modules/ruoyi-content/src/main/java/com/wzj/soopin/content/controller/UserInfoController.java @@ -28,7 +28,6 @@ import org.springframework.web.multipart.MultipartFile; */ @RestController @Slf4j -@Api(tags = "UserInfoController用户信息接口模块") @RequestMapping("userInfo") public class UserInfoController extends BaseInfoProperties {