From eff5bd84bc43bec2fec99d829b6f3216dee509f0 Mon Sep 17 00:00:00 2001
From: dsmzx <dsmzx@123.com>
Date: 星期五, 14 六月 2024 17:52:37 +0800
Subject: [PATCH] 出入库调拨产品明细增加备注字段（同步产品的备注字段）添加字段
---
conf/config.go | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index 607d60e..8f40e75 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -23,14 +23,15 @@
type (
webConf struct {
- Host string // 鏈満ip鍦板潃
- Port string // 绔彛鍙�
- NodeId string // 涓昏处鎴风敤鎴峰悕
- OssType string // 瀵硅薄瀛樺偍绫诲瀷
- JWTSecret string
- FileServer string //鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
- ServerId string //鏈嶅姟ID
- GrpcPort string //grpc绔彛鍙�
+ Host string // 鏈満ip鍦板潃
+ Port string // 绔彛鍙�
+ NodeId string // 涓昏处鎴风敤鎴峰悕
+ OssType string // 瀵硅薄瀛樺偍绫诲瀷
+ JWTSecret string
+ FileServer string //鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
+ ServerId string //鏈嶅姟ID
+ GrpcPort string //grpc绔彛鍙�
+ CompanyName string //鍏徃鍚�
}
localConf struct {
@@ -39,6 +40,17 @@
grpcServerConf struct {
ApsAddr string //aps鏈嶅姟grpc鍦板潃
+ CrmAddr string //crm鏈嶅姟grpc鍦板潃
+ SrmAddr string //srm鏈嶅姟grpc鍦板潃
+ }
+
+ fileTemplateConf struct {
+ InputSelfmadeAddr string //鍏ュ簱鑷埗鍗曟ā鐗堝湴鍧�
+ }
+
+ dingTalkConf struct {
+ AlarmKey string
+ AlarmUrl string
}
)
@@ -49,6 +61,7 @@
LocalConf = &localConf{}
Viper *viper.Viper
GrpcServerConf = &grpcServerConf{}
+ DingTalkConf = &dingTalkConf{}
)
func Init() error {
@@ -67,6 +80,9 @@
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
}
@@ -78,6 +94,15 @@
}
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")
@@ -102,6 +127,7 @@
_ = v.UnmarshalKey("db", DbConf)
_ = v.UnmarshalKey("local", LocalConf)
_ = v.UnmarshalKey("grpcServer", GrpcServerConf)
+ _ = v.UnmarshalKey("dingTalk", DingTalkConf)
showConfig()
}
@@ -112,5 +138,6 @@
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