兼容多个小程序配置3

ch-core/src/main/java/com/wwdz/ch/core/api/qiandao/QdWxLoginManager.java

@@ -13,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -50,7 +51,8 @@ public class QdWxLoginManager {
     // 微信小程序获取短链接地址
     private static final String GET_LINK_URL = "https://api.weixin.qq.com/wxa/genwxashortlink?access_token=%s";
 
-    @Resource(name = "qdWxMaService")
+    @Autowired
+    @Qualifier("qdWxMaService")
     private WxMaService qdWxMaService;
 
     @Autowired

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

@@ -24,7 +24,7 @@ public class QdWxConfig {
 	@Qualifier("qdWxMaConfig")
 	public WxMaConfig qdWxMaConfig() {
 		WxMaInMemoryConfig config = new WxMaInMemoryConfig();
-		config.setAppid(qdWxProperties.getQdAppId());
+		config.setAppid(qdWxProperties.getAppId());
 		config.setSecret(qdWxProperties.getAppSecret());
 		return config;
 	}

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

@@ -35,12 +35,12 @@ public class QdWxProperties {
 		this.mchKey = mchKey;
 	}
 
-	public String getQdAppId() {
+	public String getAppId() {
 		return appId;
 	}
 
-	public void setQdAppId(String qdAppId) {
-		this.appId = qdAppId;
+	public void setAppId(String appId) {
+		this.appId = appId;
 	}
 
 	public String getAppSecret() {

ch-core/src/main/resources/application-dev.yml

@@ -3,16 +3,15 @@ dts:
     #乾岛
     app-id: wx598b9e95a8b13209
     app-secret: 107406ff0fcc8d7c3a658b90dd938a08
-    merchant-id: 123
-    private-key: 123
-    merchant-serial_number: 123
-    apiV3Key: 123123
-    pay-notify-url: 123
+    merchant-id: 1234
+    private-key: 1234
+    merchant-serial_number: 12344
+    apiV3Key: 1231234
+    pay-notify-url: 12334
 
   # 开发者应该设置成自己的wx相关信息
   # 更换主体要更换id和secret
   wx:
-
     app-id: wx5b4409448bf2c72b
     app-secret: 6fee0d7b2197845fed0a3fe8f5a9bd66
     merchant-id: 123