swagger2在线接口文档bug

51003d61 · Simon Cheng · ccf8781b · 51003d61 · 51003d61 · 51003d61
Commit 51003d61 authored Apr 14, 2020 by Simon Cheng
7 changed files
--- a/yd-api/pom.xml
+++ b/yd-api/pom.xml
@@ -94,6 +94,7 @@
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
 			<version>1.2.5</version>
 		</dependency>	
+<!-- 	
 		<dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
@@ -103,7 +104,8 @@
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger-ui</artifactId>
            <version>2.8.0</version>
-        </dependency>
+		</dependency>
+-->
    </dependencies>
    <build>

--- a/yd-api/src/main/java/com/yd/api/commission/CommissionController.java
+++ b/yd-api/src/main/java/com/yd/api/commission/CommissionController.java
@@ -7,11 +7,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.yd.api.commission.service.CommissionService;
-import io.swagger.annotations.Api;
+//import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
+//import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
+//import io.swagger.annotations.ApiOperation;
+//
-@Api(value="/commission", tags="佣金接口:")
+//@Api(value="/commission", tags="佣金接口:")
 @RestController
 public class CommissionController {
@@ -22,8 +22,8 @@ public class CommissionController {
 	 * @param login
 	 * @return
 	 */
-	@ApiOperation(value="根据登录账号查询用户佣金", notes = "根据登录账号查询用户佣金", httpMethod = "POST")
+/*	@ApiOperation(value="根据登录账号查询用户佣金", notes = "根据登录账号查询用户佣金", httpMethod = "POST")
-    @ApiImplicitParam(name="login", value="String", required = true)	
+    @ApiImplicitParam(name="login", value="String", required = true)*/	
 	@RequestMapping("/queryCommissionByLogin")
 	public Object queryCommissionByLogin(@RequestBody String login){
@@ -35,8 +35,8 @@ public class CommissionController {
 	 * @param login
 	 * @return
 	 */
-	@ApiOperation(value="根据登录账号查询EGolden用户佣金", notes = "根据登录账号查询EGolden用户佣金", httpMethod = "POST")
+/*	@ApiOperation(value="根据登录账号查询EGolden用户佣金", notes = "根据登录账号查询EGolden用户佣金", httpMethod = "POST")
-    @ApiImplicitParam(name="login", value="String", required = true)		
+    @ApiImplicitParam(name="login", value="String", required = true)	*/	
 	@RequestMapping("/queryCommissionByLoginFromEGolden")
 	public Object listAllUserfromEGolden(@RequestBody String login){

--- a/yd-api/src/main/java/com/yd/api/customer/CustomerController.java
+++ b/yd-api/src/main/java/com/yd/api/customer/CustomerController.java
@@ -15,18 +15,18 @@ import com.yd.api.customer.vo.CustomerQueryResponseVO;
 import com.yd.api.customer.vo.CustomerVO;
 import com.yd.api.result.JsonResult;
-import io.swagger.annotations.Api;
+/*import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-@Api(value="/customer", tags="用户接口:")
+@Api(value="/customer", tags="用户接口:")*/
 @RestController
 public class CustomerController {
 	@Autowired
 	private CustomerService customerService;
-    @ApiOperation(value="查询所有用户信息", notes = "查询所有用户信息", httpMethod = "GET",response = Object.class)
+    //@ApiOperation(value="查询所有用户信息", notes = "查询所有用户信息", httpMethod = "GET",response = Object.class)
 	@RequestMapping("/listAllCustomer")
 	public Object listAllCustomer(){
        JsonResult result = new JsonResult();
@@ -42,8 +42,8 @@ public class CustomerController {
 	 * @param customerQueryRequestVO
 	 * @return
 	 */
-    @ApiOperation(value="分页查询用户列表", notes = "分页查询用户列表", httpMethod = "POST",response = CustomerQueryResponseVO.class)
+    //@ApiOperation(value="分页查询用户列表", notes = "分页查询用户列表", httpMethod = "POST",response = CustomerQueryResponseVO.class)
-    @ApiImplicitParam(name="customerQueryRequestVO", value="CustomerQueryRequestVO", required = true, dataType = "CustomerQueryRequestVO")	
+    //@ApiImplicitParam(name="customerQueryRequestVO", value="CustomerQueryRequestVO", required = true, dataType = "CustomerQueryRequestVO")	
 	@RequestMapping("/findByPage")
 	public Object findByPage(@RequestBody CustomerQueryRequestVO customerQueryRequestVO){
 		JsonResult result = new JsonResult();
@@ -57,8 +57,8 @@ public class CustomerController {
 	 * @param customerQueryRequestVO
 	 * @return
 	 */
-    @ApiOperation(value="根据customerId分页查询用户财富", notes = "查询用户财富列表", httpMethod = "POST",response = CustomerFortuneResponseVO.class)
+    //@ApiOperation(value="根据customerId分页查询用户财富", notes = "查询用户财富列表", httpMethod = "POST",response = CustomerFortuneResponseVO.class)
-    @ApiImplicitParam(name="customerFortuneRequestVO", value="CustomerFortuneRequestVO", required = true, dataType = "CustomerFortuneRequestVO")
+    //@ApiImplicitParam(name="customerFortuneRequestVO", value="CustomerFortuneRequestVO", required = true, dataType = "CustomerFortuneRequestVO")
 	@RequestMapping("/selectByCustomerId")
 	public Object selectByCustomerId(@RequestBody CustomerFortuneRequestVO customerFortuneRequestVO){
 		JsonResult result = new JsonResult();

--- a/yd-api/src/main/java/com/yd/api/market/MarketController.java
+++ b/yd-api/src/main/java/com/yd/api/market/MarketController.java
@@ -2,10 +2,10 @@ package com.yd.api.market;
 import com.yd.api.result.JsonResult;
-import io.swagger.annotations.Api;
+/*import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+*/
 import com.yd.api.market.service.MarketService;
 import com.yd.api.market.vo.announcement.AnnouncementInfoVO;
 import com.yd.api.market.vo.announcement.AnnouncementQueryRequestVO;
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-@Api(value="/market", tags="Market接口:")
+//@Api(value="/market", tags="Market接口:")
 @RestController
 public class MarketController {
@@ -28,8 +28,8 @@ public class MarketController {
     * @param requestVO
     * @return AnnouncementQueryResponseVO
     */
-    @ApiOperation(value="按分类查询市场公告", notes = "按分类查询市场公告", httpMethod = "POST",response = AnnouncementQueryRequestVO.class)
+    //@ApiOperation(value="按分类查询市场公告", notes = "按分类查询市场公告", httpMethod = "POST",response = AnnouncementQueryRequestVO.class)
-    @ApiImplicitParam(name="requestVO", value="AnnouncementQueryRequestVO", required = true, dataType = "AnnouncementQueryRequestVO")    
+    //@ApiImplicitParam(name="requestVO", value="AnnouncementQueryRequestVO", required = true, dataType = "AnnouncementQueryRequestVO")    
    @RequestMapping("/announcementQuery")
    public Object announcementQuery(@RequestBody AnnouncementQueryRequestVO requestVO){
        JsonResult result = new JsonResult();
@@ -43,8 +43,8 @@ public class MarketController {
     * @param announcementInfoVO
     * @return
     */
-    @ApiOperation(value="添加市场公告", notes = "添加市场公告", httpMethod = "POST",response = AnnouncementQueryRequestVO.class)
+    //@ApiOperation(value="添加市场公告", notes = "添加市场公告", httpMethod = "POST",response = AnnouncementQueryRequestVO.class)
-    @ApiImplicitParam(name="announcementInfoVO", value="AnnouncementInfoVO", required = true, dataType = "AnnouncementInfoVO")        
+    //@ApiImplicitParam(name="announcementInfoVO", value="AnnouncementInfoVO", required = true, dataType = "AnnouncementInfoVO")        
    @RequestMapping("/addannouncement")
    public Object addAnnouncement(@RequestBody AnnouncementInfoVO announcementInfoVO){
        JsonResult result = new JsonResult();
@@ -58,8 +58,8 @@ public class MarketController {
     * @param announcementInfoVO
     * @return
     */
-    @ApiOperation(value="修改市场公告", notes = "修改市场公告", httpMethod = "POST",response = AnnouncementQueryRequestVO.class)
+    //@ApiOperation(value="修改市场公告", notes = "修改市场公告", httpMethod = "POST",response = AnnouncementQueryRequestVO.class)
-    @ApiImplicitParam(name="announcementInfoVO", value="AnnouncementInfoVO", required = true, dataType = "AnnouncementInfoVO")    
+    //@ApiImplicitParam(name="announcementInfoVO", value="AnnouncementInfoVO", required = true, dataType = "AnnouncementInfoVO")    
    @RequestMapping("/updateannouncement")
    public Object updateAnnouncement(@RequestBody AnnouncementInfoVO announcementInfoVO){
        JsonResult result = new JsonResult();
@@ -72,8 +72,8 @@ public class MarketController {
     * @param announcementInfoVO
     * @return
     */
-    @ApiOperation(value="删除市场公告", notes = "删除市场公告", httpMethod = "POST",response = AnnouncementQueryRequestVO.class)
+    //@ApiOperation(value="删除市场公告", notes = "删除市场公告", httpMethod = "POST",response = AnnouncementQueryRequestVO.class)
-    @ApiImplicitParam(name="announcementInfoVO", value="AnnouncementInfoVO", required = true, dataType = "AnnouncementInfoVO")        
+    //@ApiImplicitParam(name="announcementInfoVO", value="AnnouncementInfoVO", required = true, dataType = "AnnouncementInfoVO")        
    @RequestMapping("/deleteannouncement")
    public Object deleteAnnouncement(@RequestBody AnnouncementInfoVO announcementInfoVO){
        JsonResult result = new JsonResult();

--- a/yd-api/src/main/java/com/yd/api/result/JsonResult.java
+++ b/yd-api/src/main/java/com/yd/api/result/JsonResult.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import io.swagger.annotations.ApiModelProperty;
+//import io.swagger.annotations.ApiModelProperty;
 //import com.ajb.config.ZHBErrorConfig;
@@ -16,11 +16,11 @@ import io.swagger.annotations.ApiModelProperty;
 */
 public class JsonResult implements Serializable {
 	private static final long serialVersionUID = 1L;
-	@ApiModelProperty(value = "返回码：成功true, 失败false")
+	//@ApiModelProperty(value = "返回码：成功true, 失败false")
 	private boolean success;
-	@ApiModelProperty(value = "提示信息")
+	//@ApiModelProperty(value = "提示信息")
 	private String message;
-	@ApiModelProperty(value = "返回内容")
+	//@ApiModelProperty(value = "返回内容")
 	private Object data;
 	public  JsonResult(){}

--- a/yd-api/src/main/java/com/yd/util/config/Swagger2Config.java
+++ b/yd-api/src/main/java/com/yd/util/config/Swagger2Config.java
-package com.yd.util.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.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-/**
- * 描述
- *
- */
-@Configuration
-@EnableSwagger2
-public class Swagger2Config {
-    @Bean
-    public Docket api() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .apiInfo(apiInfo())
-                .select()
-                // 自行修改为自己的包路径
-                .apis(RequestHandlerSelectors.basePackage("com.yd.api"))
-                .paths(PathSelectors.any())
-                .build();
-    }
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .title("yd-api银盾接口文档")
-                .description("银盾接口文档说明")
-                .version("1.0")
-                .build();
-    }
-}
--- a/yd-api/src/main/resources/application-local.properties
+++ b/yd-api/src/main/resources/application-local.properties
@@ -3,13 +3,13 @@ server.context-path=/ydapi
 #mybatis mapping文件位置配置
 mybatis.mapper-locations=classpath:mapper/**/*.xml
 ######datasource######
-###spring boot自动配置单数据源###
+###spring boot缺省配置单数据源###
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://139.224.139.2:13307/ajb?useUnicode=true&characterEncoding=utf8&useSSL=false&useAffectedRows=true
 spring.datasource.username=devdbuser
 spring.datasource.password=devdbpass1
-###手动配置多数据源###
+###手动配置主数据源###
 #master
 multiple.datasource.master.driver-class-name=com.mysql.jdbc.Driver
 multiple.datasource.master.url=jdbc:mysql://139.224.139.2:13307/ajb?useUnicode=true&characterEncoding=utf8&useSSL=false&useAffectedRows=true