From d29abc0813eaab34ebde4ee399ff12a436363dcd Mon Sep 17 00:00:00 2001
From: duanhf2012 <6549168@qq.com>
Date: Fri, 29 Nov 2024 14:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cluster/parsecfg.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cluster/parsecfg.go b/cluster/parsecfg.go
index 34c69dc..2d7e931 100644
--- a/cluster/parsecfg.go
+++ b/cluster/parsecfg.go
@@ -88,15 +88,16 @@ func yamlToJson(data []byte, v interface{}) ([]byte, error) {
 }
 
 func unmarshalConfig(data []byte, v interface{}) error {
-	if !json.Valid(data) {
+	envData := []byte(os.ExpandEnv(string(data)))
+	if !json.Valid(envData) {
 		var err error
-		data, err = yamlToJson(data, v)
+		envData, err = yamlToJson(envData, v)
 		if err != nil {
 			return err
 		}
 	}
 
-	return json.Unmarshal(data, v)
+	return json.Unmarshal(envData, v)
 }
 
 func (d *DiscoveryInfo) getDiscoveryType() DiscoveryType {