From f0786e779666d67a50cd57d82cfe1e278b47d397 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 04 七月 2024 11:54:11 +0800
Subject: [PATCH] fix
---
conf/config.go | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index 24352f9..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,14 +24,16 @@
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
+ Env constvar.Env
+ GrpcPort string //grpc绔彛鍙�
+ CompanyName string //鍏徃鍚�
}
localConf struct {
@@ -38,24 +41,30 @@
}
grpcServerConf struct {
- ApsAddr string //aps鏈嶅姟grpc鍦板潃
- CrmAddr string //crm鏈嶅姟grpc鍦板潃
- SrmAddr string //srm鏈嶅姟grpc鍦板潃
+ 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
- GrpcServerConf = &grpcServerConf{}
- FileTemplateConf = &fileTemplateConf{}
+ WebConf = &webConf{}
+ LogConf = &logx.Conf{}
+ DbConf = &mysqlx.Conf{}
+ LocalConf = &localConf{}
+ Viper *viper.Viper
+ GrpcServerConf = &grpcServerConf{}
+ DingTalkConf = &dingTalkConf{}
)
func Init() error {
@@ -73,9 +82,11 @@
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
}
@@ -85,6 +96,9 @@
if len(host) > 0 {
WebConf.Host = host
}
+ if len(adminAddr) > 0 {
+ GrpcServerConf.AdminAddr = adminAddr
+ }
if len(apsAddr) > 0 {
GrpcServerConf.ApsAddr = apsAddr
}
@@ -93,6 +107,9 @@
}
if len(srmAddr) > 0 {
GrpcServerConf.SrmAddr = srmAddr
+ }
+ if len(companyName) > 0 {
+ WebConf.CompanyName = companyName
}
DBHost := os.Getenv("DB_HOST")
@@ -117,7 +134,7 @@
_ = v.UnmarshalKey("db", DbConf)
_ = v.UnmarshalKey("local", LocalConf)
_ = v.UnmarshalKey("grpcServer", GrpcServerConf)
- _ = v.UnmarshalKey("fileTemplate", FileTemplateConf)
+ _ = v.UnmarshalKey("dingTalk", DingTalkConf)
showConfig()
}
@@ -128,6 +145,6 @@
log.Printf(" DbConf: %+v", DbConf)
log.Printf(" LocalConf: %+v", LocalConf)
log.Printf(" GrpcServerConf: %+v", GrpcServerConf)
- log.Printf(" FileTemplateConf: %+v", FileTemplateConf)
+ log.Printf(" DingTalkConf: %+v", DingTalkConf)
log.Println("......................................................")
}
--
Gitblit v1.8.0