From 359f2f3fd0da6d69474cce87353beb54bfdbf90c Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期四, 20 六月 2024 14:24:52 +0800
Subject: [PATCH] 概述->新建或编辑（出库/入库）信息，编辑的时候显示保存的成本单价和销售单价

---
 conf/config.go |   69 ++++++++++++++++++++++++++++------
 1 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/conf/config.go b/conf/config.go
index b50a0e7..8f40e75 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -23,24 +23,45 @@
 
 type (
 	webConf struct {
-		Host      string // 鏈満ip鍦板潃
-		Port      string // 绔彛鍙�
-		NodeId    string // 涓昏处鎴风敤鎴峰悕
-		OssType   string // 瀵硅薄瀛樺偍绫诲瀷
-		JWTSecret string
+		Host        string // 鏈満ip鍦板潃
+		Port        string // 绔彛鍙�
+		NodeId      string // 涓昏处鎴风敤鎴峰悕
+		OssType     string // 瀵硅薄瀛樺偍绫诲瀷
+		JWTSecret   string
+		FileServer  string //鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
+		ServerId    string //鏈嶅姟ID
+		GrpcPort    string //grpc绔彛鍙�
+		CompanyName string //鍏徃鍚�
 	}
 
 	localConf struct {
 		StorePath string // 鏈湴鏂囦欢瀛樺偍璺緞
 	}
+
+	grpcServerConf struct {
+		ApsAddr string //aps鏈嶅姟grpc鍦板潃
+		CrmAddr string //crm鏈嶅姟grpc鍦板潃
+		SrmAddr string //srm鏈嶅姟grpc鍦板潃
+	}
+
+	fileTemplateConf struct {
+		InputSelfmadeAddr string //鍏ュ簱鑷埗鍗曟ā鐗堝湴鍧�
+	}
+
+	dingTalkConf struct {
+		AlarmKey string
+		AlarmUrl string
+	}
 )
 
 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{}
+	DingTalkConf   = &dingTalkConf{}
 )
 
 func Init() error {
@@ -55,13 +76,33 @@
 	}
 	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")
+	crmAddr := os.Getenv("CRM_GRPC")
+	srmAddr := os.Getenv("SRM_GRPC")
+	companyName := os.Getenv("COMPANY_NAME")
+	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
+	}
+	if len(crmAddr) > 0 {
+		GrpcServerConf.CrmAddr = crmAddr
+	}
+	if len(srmAddr) > 0 {
+		GrpcServerConf.SrmAddr = srmAddr
+	}
+	if len(companyName) > 0 {
+		WebConf.CompanyName = companyName
 	}
 
 	DBHost := os.Getenv("DB_HOST")
@@ -85,6 +126,8 @@
 	_ = v.UnmarshalKey("log", LogConf)
 	_ = v.UnmarshalKey("db", DbConf)
 	_ = v.UnmarshalKey("local", LocalConf)
+	_ = v.UnmarshalKey("grpcServer", GrpcServerConf)
+	_ = v.UnmarshalKey("dingTalk", DingTalkConf)
 	showConfig()
 }
 
@@ -94,5 +137,7 @@
 	log.Printf("   LogConf:                %+v", LogConf)
 	log.Printf("   DbConf:                 %+v", DbConf)
 	log.Printf("   LocalConf:               %+v", LocalConf)
+	log.Printf("   GrpcServerConf:               %+v", GrpcServerConf)
+	log.Printf("   DingTalkConf:               %+v", DingTalkConf)
 	log.Println("......................................................")
 }

--
Gitblit v1.8.0