fix: 支付模块调整

wfc-modules/wfc-payment/src/main/java/org/wfc/payment/WfcPaymentApplication.java

@@ -22,8 +22,6 @@ import org.wfc.payment.ccpay.config.CcpayConfig;
 @EnableCustomConfig
 @EnableRyFeignClients
 @SpringBootApplication
-@ComponentScan(basePackages = {"org.wfc.payment"})
-@ConfigurationPropertiesScan("org.wfc.payment")
 public class WfcPaymentApplication
 {
     private static final Logger logger = LoggerFactory.getLogger(WfcPaymentApplication.class);

wfc-modules/wfc-payment/src/main/java/org/wfc/payment/unionpay/config/UnionPayServiceConfig.java

@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration;
 import com.egzosn.pay.common.util.sign.SignUtils;
 import com.egzosn.pay.common.bean.CertStoreType;
 
-@Configuration
+//@Configuration
 public class UnionPayServiceConfig {
 
     private final UnionPayConfig unionPayConfig;

wfc-modules/wfc-payment/src/main/java/org/wfc/payment/unionpay/controller/UnionPayController.java

@@ -37,7 +37,7 @@ import org.wfc.payment.unionpay.config.UnionPayConfig;
  *  Union pay controller
  *
  */
-@RestController
+//@RestController
 @RequestMapping("unionpay")
 public class UnionPayController {
 

wfc-modules/wfc-payment/src/main/java/org/wfc/payment/wxpay/config/SwaggerConfig.java

@@ -1,49 +0,0 @@
-package org.wfc.payment.wxpay.config;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.info.Contact;
-import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.info.License;
-
-import org.springdoc.core.GroupedOpenApi;
-
-@Configuration
-@Slf4j
-public class SwaggerConfig extends WebMvcConfigurationSupport {
-  @Override
-  public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    registry.addResourceHandler("swagger-ui.html")
-      .addResourceLocations("classpath:/META-INF/resources/");
-
-    registry.addResourceHandler("/webjars/**")
-      .addResourceLocations("classpath:/META-INF/resources/webjars/");
-    super.addResourceHandlers(registry);
-  }
-
-  @Bean
-  public GroupedOpenApi publicApi() {
-      return GroupedOpenApi.builder()
-              .group("public")
-              .pathsToMatch("/payment/**")
-              .packagesToScan("org.wfc.payment.wxpay.controller")
-              .build();
-  }
-
-  @Bean
-  public OpenAPI customOpenAPI() {
-    return new OpenAPI()
-        .openapi("3.0.0")
-        .info(new Info()
-            .title("WeChat Pay API")
-            .version("1.0.0")
-            .description("WeChat Pay API for Java")
-            .termsOfService("http://swagger.io/terms/")
-            .contact(new Contact().name("API Support").url("http://www.wfc.vip/support").email("support@wfc.com"))
-            .license(new License().name("wfc 1.0").url("http://springdoc.org")));
-  }
-}

wfc-modules/wfc-payment/src/main/resources/application.yml

@@ -1,14 +1,5 @@
 # spring配置
 spring:
-  application:
-    name: wfc-payment
-  cloud:
-    nacos:
-      discovery:
-        server-addr: ${NACOS_SERVER_ADDR:wfc-nacos}:${NACOS_SERVER_PORT:8848}
-        namespace: ${NACOS_NAME_SPACE:wfc-prod}      
-  main:
-    allow-bean-definition-overriding: true
   
   redis:
     host: wfc-redis
@@ -55,7 +46,7 @@ spring:
 # mybatis-plus配置
 mybatis-plus:
   # 搜索指定包别名
-  type-aliases-package: org.wfc.payment.*.model
+  type-aliases-package: org.wfc.payment
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapper-locations: classpath:mapper/**/*.xml
   global-config:
@@ -64,22 +55,6 @@ mybatis-plus:
       logic-delete-value: 1
       logic-not-delete-value: 0
 
-# swagger configuration
-swagger:
-  title: payment modules api 
-  license: Powered By wfc
-  licenseUrl: https://wfc.vip
-
-logging:
-  level:
-    root: info
-    org.springframework.web: info
-    org.mybatis.mapper: debug
-    com.github.binarywang: debug
-    org.wfc.payment.wxpay: debug
-    org.wfc.payment.alipay: debug
-    org.wfc.payment.ccpay: debug
-
 wxpay:
   appId: 121412414112
   mchId: 1131412414