From 0eff52e68801d4ce8674bb142f400bda3c86021f Mon Sep 17 00:00:00 2001
From: xiaolongzuo <150349407@qq.com>
Date: Thu, 20 Dec 2018 17:47:35 +0800
Subject: [PATCH] Fix ACM group.

---
 .../acm/bootstrap/AcmPropertySourceLocator.java        | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceLocator.java b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceLocator.java
index a7c16761..cb5ebdfb 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceLocator.java
+++ b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceLocator.java
@@ -31,8 +31,6 @@ public class AcmPropertySourceLocator implements PropertySourceLocator {
 
 	private static final String DIAMOND_PROPERTY_SOURCE_NAME = "diamond";
 
-	private static String defaultDiamondGroup = "DEFAULT_GROUP";
-
 	private AcmPropertySourceBuilder acmPropertySourceBuilder = new AcmPropertySourceBuilder();
 
 	@Autowired
@@ -45,14 +43,14 @@ public class AcmPropertySourceLocator implements PropertySourceLocator {
 				DIAMOND_PROPERTY_SOURCE_NAME);
 
 		for (String dataId : acmIntegrationProperties.getGroupConfigurationDataIds()) {
-			loadDiamondDataIfPresent(compositePropertySource, dataId, defaultDiamondGroup,
-					true);
+			loadDiamondDataIfPresent(compositePropertySource, dataId,
+					acmIntegrationProperties.getAcmProperties().getGroup(), true);
 		}
 
 		for (String dataId : acmIntegrationProperties
 				.getApplicationConfigurationDataIds()) {
-			loadDiamondDataIfPresent(compositePropertySource, dataId, defaultDiamondGroup,
-					false);
+			loadDiamondDataIfPresent(compositePropertySource, dataId,
+					acmIntegrationProperties.getAcmProperties().getGroup(), false);
 		}
 
 		return compositePropertySource;