diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index e662c312..080d98cd 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -114,13 +114,12 @@ public class XmTaskController { } @ApiOperation( value = "查询xm_task信息列表",notes="listXmTask,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") - @ApiGlobalModel(component = XmTask.class, value = "id,name") @ApiResponses({ @ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/getTask",method=RequestMethod.GET) - public Map getTask( @RequestParam Map xmTask){ + public Map getTask( @ApiIgnore @RequestParam Map xmTask){ Map m = new HashMap<>(); RequestUtils.transformArray(xmTask, "ids"); RequestUtils.transformArray(xmTask, "skillIds"); @@ -468,7 +467,7 @@ public class XmTaskController { @ApiResponse(code = 200,response=XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) - public Map listXmTask( @RequestParam Map xmTask){ + public Map listXmTask(@ApiIgnore @RequestParam Map xmTask){ Map m = new HashMap<>(); RequestUtils.transformArray(xmTask, "ids"); RequestUtils.transformArray(xmTask, "tagIdList"); diff --git a/xm-core/src/test/java/com/xm/SwaggerConfig.java b/xm-core/src/test/java/com/xm/SwaggerConfig.java index 7f02e49f..6a1f35d9 100644 --- a/xm-core/src/test/java/com/xm/SwaggerConfig.java +++ b/xm-core/src/test/java/com/xm/SwaggerConfig.java @@ -4,13 +4,11 @@ import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import springfox.documentation.service.SecurityReference; +import springfox.documentation.builders.ParameterBuilder; +import springfox.documentation.schema.ModelRef; +import springfox.documentation.service.*; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.ApiKey; -import springfox.documentation.service.Contact; -import springfox.documentation.service.AuthorizationScope; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.Docket; @@ -48,9 +46,15 @@ public class SwaggerConfig { @Bean public Docket customDocket() { + ParameterBuilder tokenPar= new ParameterBuilder(); + List pars=new ArrayList<>(); + tokenPar.name("Authorization").description("令牌 格式:【bearer 令牌值】,注意bearer后根一个空格。").modelRef(new ModelRef("string")).parameterType("header").required(false).build(); + pars.add(tokenPar.build()); + tokenPar.name("accessToken").description("令牌,直接填写令牌值").modelRef(new ModelRef("string")).parameterType("query").required(false).build(); + pars.add(tokenPar.build()); Docket docket= new Docket(DocumentationType.SWAGGER_2).select(). apis(RequestHandlerSelectors.any()) - .build() + .build().globalOperationParameters(pars) .apiInfo(apiInfo()).enable(true); /* @@ -60,7 +64,7 @@ public class SwaggerConfig { //存储用户必须提交的参数 List apikey = new ArrayList(); //规定用户需要输入什么参数 - apikey.add(new ApiKey("token", "token", "token")); + apikey.add(new ApiKey("accesToken", "accesToken", "accesToken")); docket.securitySchemes(apikey); //以下定义如果用户JWT认证通过,则在Swagger中全局有效