From 0ec0aef398704cd0219ed452f3aa96c8cdacd647 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期六, 06 七月 2024 15:27:51 +0800
Subject: [PATCH] 出库、入库、盘点涉及产品重复性检查调整（从【产品编号】变更为以【产品编号、出库库房编号、入库库房编号】作为唯一标识）
---
conf/config.go | 76 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index b50a0e7..da9d1d8 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -3,6 +3,7 @@
import (
"log"
"os"
+ "wms/constvar"
"wms/pkg/logx"
"wms/pkg/mysqlx"
@@ -23,24 +24,47 @@
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
+ Env constvar.Env
+ GrpcPort string //grpc绔彛鍙�
+ CompanyName string //鍏徃鍚�
}
localConf struct {
StorePath string // 鏈湴鏂囦欢瀛樺偍璺緞
}
+
+ grpcServerConf struct {
+ AdminAddr string //admin鏈嶅姟grpc鍦板潃
+ 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 +79,37 @@
}
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鏈嶅姟锛屾湰鏈嶅姟涓嶇敤
+ adminAddr := os.Getenv("ADMIN_GRPC")
+ 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(adminAddr) > 0 {
+ GrpcServerConf.AdminAddr = adminAddr
+ }
+ 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 +133,8 @@
_ = v.UnmarshalKey("log", LogConf)
_ = v.UnmarshalKey("db", DbConf)
_ = v.UnmarshalKey("local", LocalConf)
+ _ = v.UnmarshalKey("grpcServer", GrpcServerConf)
+ _ = v.UnmarshalKey("dingTalk", DingTalkConf)
showConfig()
}
@@ -94,5 +144,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