From 99ffda4126a4217ecaf57f4eab2a5615ae353aff Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 07 十一月 2023 14:30:51 +0800
Subject: [PATCH] crm获取库存信息

---
 conf/config.go |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/conf/config.go b/conf/config.go
index b50a0e7..ccb00c6 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -28,19 +28,25 @@
 		NodeId    string // 涓昏处鎴风敤鎴峰悕
 		OssType   string // 瀵硅薄瀛樺偍绫诲瀷
 		JWTSecret string
+		GrpcPort  string //grpc绔彛鍙�
 	}
 
 	localConf struct {
 		StorePath string // 鏈湴鏂囦欢瀛樺偍璺緞
 	}
+
+	grpcServerConf struct {
+		ApsAddr string //aps鏈嶅姟grpc鍦板潃
+	}
 )
 
 var (
-	WebConf   = &webConf{}
-	LogConf   = &logx.Conf{}
-	DbConf    = &mysqlx.Conf{}
-	LocalConf = &localConf{}
-	Viper     *viper.Viper
+	WebConf        = &webConf{}
+	LogConf        = &logx.Conf{}
+	DbConf         = &mysqlx.Conf{}
+	LocalConf      = &localConf{}
+	Viper          *viper.Viper
+	GrpcServerConf = &grpcServerConf{}
 )
 
 func Init() error {
@@ -55,13 +61,21 @@
 	}
 	read2Conf(Viper)
 
-	nodeId := os.Getenv("NODE_ID") // 涓昏处鎴风敤鎴峰悕
-	host := os.Getenv("HOST")      // 鏈満IP鍦板潃
+	nodeId := os.Getenv("NODE_ID")    // 涓昏处鎴风敤鎴峰悕
+	host := os.Getenv("HOST")         // 鏈満IP鍦板潃
+	GrpcPort := os.Getenv("WMS_GRPC") // 鍙澶栨彁渚沢rpc鏈嶅姟锛屾湰鏈嶅姟涓嶇敤
+	apsAddr := os.Getenv("APS_GRPC")
+	if len(GrpcPort) > 0 {
+		WebConf.GrpcPort = GrpcPort
+	}
 	if len(nodeId) > 0 {
 		WebConf.NodeId = nodeId
 	}
 	if len(host) > 0 {
 		WebConf.Host = host
+	}
+	if len(apsAddr) > 0 {
+		GrpcServerConf.ApsAddr = apsAddr
 	}
 
 	DBHost := os.Getenv("DB_HOST")
@@ -85,6 +99,7 @@
 	_ = v.UnmarshalKey("log", LogConf)
 	_ = v.UnmarshalKey("db", DbConf)
 	_ = v.UnmarshalKey("local", LocalConf)
+	_ = v.UnmarshalKey("grpcServer", GrpcServerConf)
 	showConfig()
 }
 
@@ -94,5 +109,6 @@
 	log.Printf("   LogConf:                %+v", LogConf)
 	log.Printf("   DbConf:                 %+v", DbConf)
 	log.Printf("   LocalConf:               %+v", LocalConf)
+	log.Printf("   GrpcServerConf:               %+v", GrpcServerConf)
 	log.Println("......................................................")
 }

--
Gitblit v1.8.0