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

coolstore-partner-service/src/main/java/com/cool/store/config/weixin/WxPayAutoCertificateConfig.java

@@ -21,7 +21,7 @@ public class WxPayAutoCertificateConfig {
      * 一个商户号只能初始化一个配置，否则会因为重复的下载任务报错
      * @return
      */
-    @Bean
+    /*@Bean
     public RSAAutoCertificateConfig rsaAutoCertificateConfig() {
         RSAAutoCertificateConfig config = new RSAAutoCertificateConfig.Builder()
                 .merchantId(wxPayConfig.getMerchantId())
@@ -30,5 +30,5 @@ public class WxPayAutoCertificateConfig {
                 .apiV3Key(wxPayConfig.getApiV3Key())
                 .build();
         return config;
-    }
+    }*/
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/WxPayServiceImpl.java

@@ -40,7 +40,7 @@ import java.math.BigDecimal;
 @Service
 public class WxPayServiceImpl implements WxPayService {
 
-    @Resource
+    // @Resource
     private RSAAutoCertificateConfig rsaAutoCertificateConfig;
 
     @Resource