兼容多个小程序配置

ch-core/src/main/java/com/wwdz/ch/core/api/WxLoginManager.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -51,7 +52,7 @@ public class WxLoginManager {
 
 
 
-    @Autowired
+    @Resource(name = "wxMaService")
     private WxMaService wxMaService;
 
     @Autowired

ch-core/src/main/java/com/wwdz/ch/core/config/QdWxConfig.java

@@ -8,6 +8,7 @@ import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -18,6 +19,7 @@ public class QdWxConfig {
 	private QdWxProperties qdWxProperties;
 
 	@Bean(name = "qdWxMaConfig")
+	@Qualifier()
 	public WxMaConfig qdWxMaConfig() {
 		WxMaInMemoryConfig config = new WxMaInMemoryConfig();
 		config.setAppid(qdWxProperties.getQdAppId());
@@ -32,23 +34,4 @@ public class QdWxConfig {
 		return service;
 	}
 
-	@Bean
-	public WxPayConfig qdWxPayConfig() {
-		WxPayConfig payConfig = new WxPayConfig();
-		payConfig.setAppId(qdWxProperties.getQdAppId());
-		payConfig.setMchId(qdWxProperties.getMchId());
-		payConfig.setMchKey(qdWxProperties.getMchKey());
-		payConfig.setNotifyUrl(qdWxProperties.getNotifyUrl());
-		payConfig.setKeyPath(qdWxProperties.getKeyPath());
-		payConfig.setTradeType("JSAPI");
-		payConfig.setSignType("MD5");
-		return payConfig;
-	}
-
-	@Bean
-	public WxPayService qdWxPayService(WxPayConfig wxPayConfig) {
-		WxPayService wxPayService = new WxPayServiceImpl();
-		wxPayService.setConfig(wxPayConfig);
-		return wxPayService;
-	}
 }
\ No newline at end of file

ch-core/src/main/java/com/wwdz/ch/core/config/WxConfig.java

@@ -13,10 +13,11 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class WxConfig {
+
 	@Autowired
 	private WxProperties properties;
 
-	@Bean
+	@Bean(name = "wxMaConfig")
 	public WxMaConfig wxMaConfig() {
 		WxMaInMemoryConfig config = new WxMaInMemoryConfig();
 		config.setAppid(properties.getAppId());
@@ -24,10 +25,10 @@ public class WxConfig {
 		return config;
 	}
 
-	@Bean
-	public WxMaService wxMaService(WxMaConfig maConfig) {
+	@Bean(name = "wxMaService")
+	public WxMaService wxMaService(WxMaConfig wxMaConfig) {
 		WxMaService service = new WxMaServiceImpl();
-		service.setWxMaConfig(maConfig);
+		service.setWxMaConfig(wxMaConfig);
 		return service;
 	}