From 256e96b104a562921fff17588c2c59331803f977 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 15 Dec 2021 15:01:52 +0800 Subject: [PATCH] 20211214 --- src/main/java/cc/mrbird/febs/video/controller/CommonController.java | 1 + src/main/java/cc/mrbird/febs/video/entity/AppVersion.java | 27 +++++++++++++++++++++++++++ src/main/java/cc/mrbird/febs/common/configure/FebsConfigure.java | 16 ++++++++++++---- src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java | 1 + src/main/java/cc/mrbird/febs/video/controller/ApiVideoMemberController.java | 2 ++ 5 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/common/configure/FebsConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/FebsConfigure.java index 1417078..45c7ce9 100644 --- a/src/main/java/cc/mrbird/febs/common/configure/FebsConfigure.java +++ b/src/main/java/cc/mrbird/febs/common/configure/FebsConfigure.java @@ -4,22 +4,24 @@ import cc.mrbird.febs.common.properties.FebsProperties; import cc.mrbird.febs.common.properties.SwaggerProperties; import cc.mrbird.febs.common.xss.XssFilter; +import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import springfox.documentation.builders.ParameterBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.schema.ModelRef; import springfox.documentation.service.ApiInfo; import springfox.documentation.service.Contact; +import springfox.documentation.service.Parameter; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger2.annotations.EnableSwagger2; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import java.util.*; import java.util.concurrent.ThreadPoolExecutor; /** @@ -67,11 +69,17 @@ @Bean public Docket swaggerApi() { SwaggerProperties swagger = properties.getSwagger(); + ParameterBuilder parameterBuilder = new ParameterBuilder(); + List<Parameter> parameters = new ArrayList<Parameter>(); + parameterBuilder.name("token").description("token参数").modelRef(new ModelRef("string")).parameterType("header") + .required(false).build(); + parameters.add(parameterBuilder.build()); return new Docket(DocumentationType.SWAGGER_2) .select() - .apis(RequestHandlerSelectors.basePackage(swagger.getBasePackage())) + .apis(RequestHandlerSelectors.withClassAnnotation(Api.class)) .paths(PathSelectors.any()) .build() + .globalOperationParameters(parameters) .apiInfo(apiInfo(swagger)); } diff --git a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java index f931afd..0fba505 100644 --- a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java +++ b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java @@ -13,5 +13,6 @@ InterceptorRegistration registration = registry.addInterceptor(new LoginInterceptor()); registration.addPathPatterns("/api/**"); registration.excludePathPatterns("/api/login/**"); +// registration.excludePathPatterns("/api/member/**"); } } diff --git a/src/main/java/cc/mrbird/febs/video/controller/ApiVideoMemberController.java b/src/main/java/cc/mrbird/febs/video/controller/ApiVideoMemberController.java index 5cb81f7..a6e4065 100644 --- a/src/main/java/cc/mrbird/febs/video/controller/ApiVideoMemberController.java +++ b/src/main/java/cc/mrbird/febs/video/controller/ApiVideoMemberController.java @@ -8,6 +8,7 @@ import cc.mrbird.febs.video.vo.ApiMyVideoHistoryVo; import cc.mrbird.febs.video.vo.ApiVideoMemberVo; import cc.mrbird.febs.video.vo.ApiVipCostVo; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; @@ -20,6 +21,7 @@ @RequiredArgsConstructor @RestController @RequestMapping(value = "/api/member") +@Api(value = "ApiVideoMemberController", tags = "我的") public class ApiVideoMemberController { private final IApiVideoMemberService memberService; diff --git a/src/main/java/cc/mrbird/febs/video/controller/CommonController.java b/src/main/java/cc/mrbird/febs/video/controller/CommonController.java index 6f0ba8a..8d40a5e 100644 --- a/src/main/java/cc/mrbird/febs/video/controller/CommonController.java +++ b/src/main/java/cc/mrbird/febs/video/controller/CommonController.java @@ -98,4 +98,5 @@ return fileUrlMap; } + } diff --git a/src/main/java/cc/mrbird/febs/video/entity/AppVersion.java b/src/main/java/cc/mrbird/febs/video/entity/AppVersion.java new file mode 100644 index 0000000..fcb2248 --- /dev/null +++ b/src/main/java/cc/mrbird/febs/video/entity/AppVersion.java @@ -0,0 +1,27 @@ +package cc.mrbird.febs.video.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * 版本表 + **/ +@Data +@TableName("app_version") +public class AppVersion { + + @TableId(value = "id", type = IdType.AUTO) + private Long id; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createtime; + private String version; + private String content; + private String address; + private Integer type; + +} -- Gitblit v1.9.1