Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-10 503c2e1cba7975481af960d5fdfa840be647dc46

Merge remote-tracking branch 'origin/score_shop' into score_shop

 zq-erp/pom.xml

@@ -374,7 +374,7 @@
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.4.2</version>
            <version>3.2.0</version>
        </dependency>
        <dependency>
            <groupId>cn.hutool</groupId>

 zq-erp/src/main/java/com/matrix/config/SwaggerConfig.java

@@ -43,7 +43,7 @@
                .required(false).build();
        parameters.add(parameterBuilder.build());
        return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).enable(swaggerEnable).select().apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
                .paths(PathSelectors.any()).build().globalOperationParameters(parameters);
                .paths(PathSelectors.ant("/api/**")).build().globalOperationParameters(parameters).groupName("HIVE");
//                .ignoredParameterTypes(MemberEntity.class);
    }

@@ -54,4 +54,25 @@
                .version("1.0")
                .build();
    }

    @Bean
    public Docket wxRestApi(){
        // 添加请求参数，我们这里把token作为请求头部参数传入后端
        ParameterBuilder parameterBuilder = new ParameterBuilder();
        List<Parameter> parameters = new ArrayList<Parameter>();
        parameterBuilder.name("Authorization").description("令牌").modelRef(new ModelRef("string")).parameterType("header")
                .required(false).build();
        parameters.add(parameterBuilder.build());
        return new Docket(DocumentationType.SWAGGER_2).apiInfo(wxApiInfo()).enable(swaggerEnable).select().apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
                .paths(PathSelectors.ant("/wxapi/**")).build().globalOperationParameters(parameters).groupName("小程序接口");
//                .ignoredParameterTypes(MemberEntity.class);
    }

    private ApiInfo wxApiInfo(){
        return new ApiInfoBuilder()
                .title("Hive Wx")
                .description("This is a restful api document of Hive Wx.")
                .version("1.0")
                .build();
    }
}

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java

New file
@@ -0,0 +1,24 @@
package com.matrix.system.shopXcx.api.action;

import com.matrix.core.pojo.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * @author wzy
 * @date 2021-03-10
 **/
@Api(tags = "推广员接口类")
@RestController
@RequestMapping(value = "/wxapi/salesman")
public class WxSalesmanAction {

    @ApiOperation(value = "测试接口", notes = "测试接口")
    @GetMapping(value = "/test")
    public AjaxResult test() {
        return null;
    }
}