diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/UserCenterConfig.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/UserCenterConfig.java index 6b54cbd2..7719af18 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/UserCenterConfig.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/UserCenterConfig.java @@ -98,7 +98,8 @@ public class UserCenterConfig { * @return */ public String configAddBigUser() { - return dbUserInfoUrl + "/api/user/addUserInfo"; + String url = StringUtils.isNotBlank(System.getenv("DEBUG_ITAX_HOST")) ? "http://localhost:18100/itax" : dbUserInfoUrl; + return url + "/api/user/addUserInfo"; } /** diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/SwaggerConfig.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/SwaggerConfig.java index 8d154da0..6c4251d0 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/SwaggerConfig.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/config/SwaggerConfig.java @@ -1,55 +1,55 @@ -package com.dxhy.order.consumer.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.context.request.async.DeferredResult; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -import static springfox.documentation.builders.PathSelectors.regex; - -/** - * swagger配置 - * 1.全局配置,所有订单相关的,大而全的东西 - * 2.订单相关配置 - * 3.发票相关配置 - * 4.税控底层相关配置 - * - * @author ZSC-DXHY - */ -@Configuration -@EnableSwagger2 -public class SwaggerConfig { - - - @Bean - public Docket simsOrderSwagger() { - return new Docket(DocumentationType.SWAGGER_2) - .groupName("order-api-swagger") - .genericModelSubstitutes(DeferredResult.class) - .useDefaultResponseMessages(false) - .forCodeGeneration(true) - // base,最终调用接口后会和paths拼接在一起 - .pathMapping("/") - .select() - .paths(regex("/.*")) - .build() - .apiInfo(apiInfo()); - } - - private ApiInfo apiInfo() { - // 大标题 - return new ApiInfoBuilder().title("销项基础服务") - // 详细描述 - .description("订单管理系统") - // 版本 - .version("1.0") - // 作者 -// .contact(new Contact("chengyafu", "", "chengyafu@ele-cloud.com")) - .build(); - } - -} +// package com.dxhy.order.consumer.config; +// +// import org.springframework.context.annotation.Bean; +// import org.springframework.context.annotation.Configuration; +// import org.springframework.web.context.request.async.DeferredResult; +// import springfox.documentation.builders.ApiInfoBuilder; +// import springfox.documentation.service.ApiInfo; +// import springfox.documentation.spi.DocumentationType; +// import springfox.documentation.spring.web.plugins.Docket; +// import springfox.documentation.swagger2.annotations.EnableSwagger2; +// +// import static springfox.documentation.builders.PathSelectors.regex; +// +// /** +// * swagger配置 +// * 1.全局配置,所有订单相关的,大而全的东西 +// * 2.订单相关配置 +// * 3.发票相关配置 +// * 4.税控底层相关配置 +// * +// * @author ZSC-DXHY +// */ +// @Configuration +// @EnableSwagger2 +// public class SwaggerConfig { +// +// +// @Bean +// public Docket simsOrderSwagger() { +// return new Docket(DocumentationType.SWAGGER_2) +// .groupName("order-api-swagger") +// .genericModelSubstitutes(DeferredResult.class) +// .useDefaultResponseMessages(false) +// .forCodeGeneration(true) +// // base,最终调用接口后会和paths拼接在一起 +// .pathMapping("/") +// .select() +// .paths(regex("/.*")) +// .build() +// .apiInfo(apiInfo()); +// } +// +// private ApiInfo apiInfo() { +// // 大标题 +// return new ApiInfoBuilder().title("销项基础服务") +// // 详细描述 +// .description("订单管理系统") +// // 版本 +// .version("1.0") +// // 作者 +// // .contact(new Contact("chengyafu", "", "chengyafu@ele-cloud.com")) +// .build(); +// } +// +// }