结构 >> 提交补充

build.gradle

-plugins {
-    id 'org.springframework.boot' version '2.6.4'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-    id 'java'
-}
+group 'org.example'
+apply plugin: 'idea'
+apply plugin: 'java'
+apply plugin: 'application'
 
 group = 'moe.mycard'
 version = '0.0.1-SNAPSHOT'
@@ -21,11 +20,11 @@ repositories {
 }
 
 dependencies {
-    // https://mvnrepository.com/artifact/com.google.guava/guava
-    implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'
 
     // https://mvnrepository.com/artifact/io.springfox/springfox-boot-starter
     implementation group: 'io.springfox', name: 'springfox-boot-starter', version: '3.0.0'
+//    implementation group: 'io.springfox', name: 'springfox-swagger-ui', version: '3.0.0'
+//    implementation group: 'io.springfox', name: 'springfox-swagger2', version: '3.0.0'
 
     // ----- Spring Boot
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.5.7'

src/main/java/moe/mycard/tabulator/SwaggerConfiguration.java

@@ -3,8 +3,12 @@ package moe.mycard.tabulator;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.oas.annotations.EnableOpenApi;
 
-@EnableOpenApi
+
 @Configuration
+//@Profile({"dev", "test", "uat"})
+@EnableOpenApi//会自动开启配置，启动类不需要加任何注解
 public class SwaggerConfiguration {
 
+
+
 }
\ No newline at end of file

src/main/java/moe/mycard/tabulator/api/IndexApi.java

@@ -21,7 +21,7 @@ public interface IndexApi {
 
   @ApiOperation("新增 - 创建新的比赛")
   @PostMapping("/save_tournament")
-  ReturnMessage<Void> save_tournament(@RequestBody GlobalAskBody<SaveTournamentReq> body);
+  ReturnMessage<?> save_tournament(@RequestBody GlobalAskBody<SaveTournamentReq> body);
 
   @ApiOperation("分页 - 获取比赛列表")
   @PostMapping("/page_tournament")
@@ -29,11 +29,11 @@ public interface IndexApi {
 
   @ApiOperation("编辑 - 单场次比赛信息")
   @PostMapping("/edit_tournament")
-  ReturnMessage<Void> edit_tournament(@RequestBody GlobalAskBody<UpdateTournamentReq> body);
+  ReturnMessage<?> edit_tournament(@RequestBody GlobalAskBody<UpdateTournamentReq> body);
 
   @ApiOperation("删除 - 单场次比赛")
   @PostMapping("/delete_tournament")
-  ReturnMessage<Void> delete_tournament(@RequestBody GlobalAskBody<TidReq> body);
+  ReturnMessage<?> delete_tournament(@RequestBody GlobalAskBody<TidReq> body);
 
   @ApiOperation("详情 - 单场次比赛信息")
   @PostMapping("/details_tournament_info")
@@ -41,9 +41,9 @@ public interface IndexApi {
 
   @ApiOperation("导出比赛")
   @PostMapping("/export_tournament")
-  ReturnMessage<Void> export_tournament(@RequestBody GlobalAskBody<TidReq> body);
+  ReturnMessage<?> export_tournament(@RequestBody GlobalAskBody<TidReq> body);
 
   @ApiOperation("比赛授权")
   @PostMapping("/authorize")
-  ReturnMessage<Void> authorize(@RequestBody GlobalAskBody<?> body);
+  ReturnMessage<?> authorize(@RequestBody GlobalAskBody<?> body);
 }

src/main/java/moe/mycard/tabulator/api/TournamentApi.java

 package moe.mycard.tabulator.api;
 
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import moe.mycard.tabulator.model.dto.GlobalAskBody;
 import moe.mycard.tabulator.model.dto.ReturnMessage;
@@ -28,12 +27,11 @@ public interface TournamentApi {
 
   @ApiOperation("制表")
   @PostMapping("tabulation")
-  @ApiImplicitParam(name = "比赛id")
   ReturnMessage<TTree> tabulation(@RequestBody GlobalAskBody<TidReq> body);
 
   @ApiOperation("编辑 - 单场次比赛信息")
   @PostMapping("/edit_tournament")
-  ReturnMessage<Void> edit_tournament(@RequestBody GlobalAskBody<UpdateTournamentReq> body);
+  ReturnMessage<?> edit_tournament(@RequestBody GlobalAskBody<UpdateTournamentReq> body);
 
   @ApiOperation("详情 - 单场次比赛信息 常规信息")
   @PostMapping("/details_tournament_info")
@@ -45,11 +43,11 @@ public interface TournamentApi {
 
   @ApiOperation("编辑 - 座位信息")
   @PostMapping("/edit_seat")
-  ReturnMessage<Void> edit_seat(@RequestBody GlobalAskBody<UpdateSeatNode> body);
+  ReturnMessage<?> edit_seat(@RequestBody GlobalAskBody<UpdateSeatNode> body);
 
   @ApiOperation("晋级")
   @PostMapping("/promotion")
-  ReturnMessage<Void> promotion(@RequestBody GlobalAskBody<TidReq> body);
+  ReturnMessage<?> promotion(@RequestBody GlobalAskBody<TidReq> body);
 
   //  @ApiOperation("分页 - 参赛者对战记录")
   //  @PostMapping("/page_match_record")
@@ -61,9 +59,9 @@ public interface TournamentApi {
 
   //  @ApiOperation("导出比赛 - 单轮次")
   //  @PostMapping("/export_round")
-  //  ReturnMessage<Void> export_round(@RequestBody GlobalAskBody<?> body);
+  //  ReturnMessage<?> export_round(@RequestBody GlobalAskBody<?> body);
 
   //  @ApiOperation("导入比赛 - 单轮次")
   //  @PostMapping("/import_round")
-  //  ReturnMessage<Void> import_round(@RequestBody GlobalAskBody<?> body);
+  //  ReturnMessage<?> import_round(@RequestBody GlobalAskBody<?> body);
 }

src/main/java/moe/mycard/tabulator/common/LoginInterceptor.java

@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class LoginInterceptor implements HandlerInterceptor {
 
-  public boolean isAuth = true;
+  public boolean isAuth = false;
 
   @Resource private RedisTemplate<String, Long> redisTemplate;
 

src/main/java/moe/mycard/tabulator/common/MvcConfigurer.java

@@ -3,6 +3,7 @@ package moe.mycard.tabulator.common;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
 /**
@@ -25,7 +26,26 @@ public class MvcConfigurer extends WebMvcConfigurationSupport {
   @Override
   protected void addInterceptors(InterceptorRegistry registry) {
     /** 拦截器按照顺序执行,如果不同拦截器拦截存在相同的URL，前面的拦截器会执行，后面的拦截器将不执行 */
-    registry.addInterceptor(getLoginInterceptor()).addPathPatterns("/**");
+    registry.addInterceptor(getLoginInterceptor()).addPathPatterns("/api/**")
+            .excludePathPatterns("/**/login/**")
+            .excludePathPatterns("/actuator/health/**")
+            .excludePathPatterns("/v2/api-docs/**")
+            .excludePathPatterns("/v2/api-docs-ext/**")
+            .excludePathPatterns("/swagger-resources")
+            .excludePathPatterns("/error/**")
+            .excludePathPatterns("/webjars/**")
+            .excludePathPatterns("/swagger-ui.html")
+            .excludePathPatterns("/swagger-ui/index.html")
+            .excludePathPatterns("/swagger-ui/**")
+            .excludePathPatterns("/doc.html");
     super.addInterceptors(registry);
   }
+
+  @Override
+  protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+    registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
+
+  }
+
+
 }

src/main/java/moe/mycard/tabulator/controllers/IndexDo.java

@@ -23,7 +23,7 @@ public class IndexDo implements IndexApi {
   @Resource private TournamentDoService tournamentDoService;
 
   @Override
-  public ReturnMessage<Void> save_tournament(GlobalAskBody<SaveTournamentReq> body) {
+  public ReturnMessage<?> save_tournament(GlobalAskBody<SaveTournamentReq> body) {
     indexService.saveTournament(body);
     return ReturnMessage.ok();
   }
@@ -35,13 +35,13 @@ public class IndexDo implements IndexApi {
   }
 
   @Override
-  public ReturnMessage<Void> edit_tournament(GlobalAskBody<UpdateTournamentReq> body) {
+  public ReturnMessage<?> edit_tournament(GlobalAskBody<UpdateTournamentReq> body) {
     indexService.editTournament(body);
     return ReturnMessage.ok();
   }
 
   @Override
-  public ReturnMessage<Void> delete_tournament(GlobalAskBody<TidReq> body) {
+  public ReturnMessage<?> delete_tournament(GlobalAskBody<TidReq> body) {
     indexService.deleteTournament(body);
     return ReturnMessage.ok();
   }
@@ -53,12 +53,12 @@ public class IndexDo implements IndexApi {
   }
 
   @Override
-  public ReturnMessage<Void> export_tournament(GlobalAskBody<TidReq> body) {
+  public ReturnMessage<?> export_tournament(GlobalAskBody<TidReq> body) {
     return null;
   }
 
   @Override
-  public ReturnMessage<Void> authorize(GlobalAskBody<?> body) {
+  public ReturnMessage<?> authorize(GlobalAskBody<?> body) {
     return null;
   }
 }

src/main/java/moe/mycard/tabulator/controllers/TournamentDo.java

@@ -36,7 +36,7 @@ public class TournamentDo implements TournamentApi {
   }
 
   @Override
-  public ReturnMessage<Void> edit_tournament(GlobalAskBody<UpdateTournamentReq> body) {
+  public ReturnMessage<?> edit_tournament(GlobalAskBody<UpdateTournamentReq> body) {
     indexDoService.editTournament(body);
     return ReturnMessage.ok();
   }
@@ -54,13 +54,13 @@ public class TournamentDo implements TournamentApi {
   }
 
   @Override
-  public ReturnMessage<Void> edit_seat(GlobalAskBody<UpdateSeatNode> body) {
+  public ReturnMessage<?> edit_seat(GlobalAskBody<UpdateSeatNode> body) {
     tournamentDoService.editSeat(body);
     return ReturnMessage.ok();
   }
 
   @Override
-  public ReturnMessage<Void> promotion(GlobalAskBody<TidReq> body) {
+  public ReturnMessage<?> promotion(GlobalAskBody<TidReq> body) {
     return null;
   }
 
@@ -75,12 +75,12 @@ public class TournamentDo implements TournamentApi {
   //  }
 
   //  @Override
-  //  public ReturnMessage<Void> export_round(GlobalAskBody<?> body) {
+  //  public ReturnMessage<?> export_round(GlobalAskBody<?> body) {
   //    return null;
   //  }
   //
   //  @Override
-  //  public ReturnMessage<Void> import_round(GlobalAskBody<?> body) {
+  //  public ReturnMessage<?> import_round(GlobalAskBody<?> body) {
   //    return null;
   //  }
 }

src/main/java/moe/mycard/tabulator/exception/CavException.java

@@ -48,7 +48,7 @@ public class CavException extends RuntimeException {
    *
    * @return 异常信息
    */
-  public ReturnMessage<Void> result() {
+  public ReturnMessage<?> result() {
     return ReturnMessage.error(code, this.getMessage());
   }
 }

src/main/java/moe/mycard/tabulator/exception/GlobalExceptionProcessor.java

@@ -28,14 +28,14 @@ public class GlobalExceptionProcessor extends Method {
 
   /** 全局未知异常捕获 */
   @ExceptionHandler(Exception.class)
-  public ReturnMessage<Void> exception(Exception ex, HttpServletRequest request) {
+  public ReturnMessage<?> exception(Exception ex, HttpServletRequest request) {
     log(true, ex, request);
     return ReturnMessage.error();
   }
 
   /** 请求类型错误 */
   @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
-  public ReturnMessage<Void> exception(
+  public ReturnMessage<?> exception(
       HttpRequestMethodNotSupportedException ex, HttpServletRequest request) {
     log(false, ex, request);
     return ReturnMessage.error("请求类型错误,该资源不支持此请求类型");
@@ -43,7 +43,7 @@ public class GlobalExceptionProcessor extends Method {
 
   /** 内置异常捕获 */
   @ExceptionHandler(CavException.class)
-  public ReturnMessage<Void> exception(CavException ex, HttpServletRequest request) {
+  public ReturnMessage<?> exception(CavException ex, HttpServletRequest request) {
     log(true, ex, request);
     return ex.result();
   }

src/main/java/moe/mycard/tabulator/model/dto/ReturnMessage.java

@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 @Data
 public class ReturnMessage<T> extends BlankReturnMessage {
 
-  private Object data;
+  private T data;
 
   public static <vo> ReturnMessage<vo> ok() {
     ReturnMessage<vo> result = new ReturnMessage<>();
@@ -24,22 +24,22 @@ public class ReturnMessage<T> extends BlankReturnMessage {
     return result;
   }
 
-  public static ReturnMessage<Void> error(Integer code, String message) {
-    ReturnMessage<Void> result = new ReturnMessage<>();
+  public static ReturnMessage<?> error(Integer code, String message) {
+    ReturnMessage<?> result = new ReturnMessage<>();
     result.setCode(code);
     result.setMessage(message);
     return result;
   }
 
-  public static ReturnMessage<Void> error(String message) {
-    ReturnMessage<Void> result = new ReturnMessage<>();
+  public static ReturnMessage<?> error(String message) {
+    ReturnMessage<?> result = new ReturnMessage<>();
     result.setCode(300);
     result.setMessage(message);
     return result;
   }
 
-  public static ReturnMessage<Void> error() {
-    ReturnMessage<Void> result = new ReturnMessage<>();
+  public static ReturnMessage<?> error() {
+    ReturnMessage<?> result = new ReturnMessage<>();
     result.setCode(300);
     result.setMessage("系统异常");
     return result;