From 47000c8d61e28bc590d085753c8b9ceff8546121 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 08 十一月 2023 14:23:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
conf/config.go | 43 ++++++++++---------------------------------
1 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index 06955ee..59e6c92 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -23,19 +23,14 @@
type (
webConf struct {
- Host string // 鏈満ip鍦板潃
- Port string // 绔彛鍙�
- APPort string // 鏈満浣滀负鐨凣rpc鏈嶅姟绔殑绔彛鍙�
- AlHost string // 绠楁硶鏈嶅姟ip鍦板潃
- AlPort string // 绠楁硶鏈嶅姟绔彛鍙�
- NodeId string // 涓昏处鎴风敤鎴峰悕
- OssType string // 瀵硅薄瀛樺偍绫诲瀷
- JWTSecret string
- }
-
- nsqConf struct {
- NsqdAddr string
- NsqlookupdAddr string
+ Host string // 鏈満ip鍦板潃
+ Port string // 绔彛鍙�
+ NodeId string // 涓昏处鎴风敤鎴峰悕
+ OssType string // 瀵硅薄瀛樺偍绫诲瀷
+ JWTSecret string
+ FileServer string //鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
+ ServerId string //鏈嶅姟ID
+ GrpcPort string //grpc绔彛鍙�
}
localConf struct {
@@ -47,10 +42,7 @@
WebConf = &webConf{}
LogConf = &logx.Conf{}
DbConf = &mysqlx.Conf{}
- NsqConf = &nsqConf{}
LocalConf = &localConf{}
- NodeId string
- GrpcPort string
Viper *viper.Viper
)
@@ -66,25 +58,13 @@
}
read2Conf(Viper)
- GrpcPort = os.Getenv("GRPC_PORT") // 鍙粰grpc绠楁硶鏈嶅姟浣跨敤锛屾湰鏈嶅姟涓嶇敤
- nodeId := os.Getenv("NODE_ID") // 涓昏处鎴风敤鎴峰悕
- host := os.Getenv("HOST") // 鏈満IP鍦板潃
- algHost := os.Getenv("AL_HOST") // 绠楁硶鏈嶅姟鐨処P鍦板潃
- nsqdAddr := os.Getenv("NSQD_ADDR")
- if len(GrpcPort) == 0 { // 濡傛灉gprcPort涓虹┖锛岄偅涔堢敤閰嶇疆鐨凙PPort
- GrpcPort = WebConf.APPort
- }
+ nodeId := os.Getenv("NODE_ID") // 涓昏处鎴风敤鎴峰悕
+ host := os.Getenv("HOST") // 鏈満IP鍦板潃
if len(nodeId) > 0 {
WebConf.NodeId = nodeId
}
- if len(algHost) > 0 {
- WebConf.AlHost = algHost
- }
if len(host) > 0 {
WebConf.Host = host
- }
- if len(nsqdAddr) > 0 {
- NsqConf.NsqdAddr = nsqdAddr
}
DBHost := os.Getenv("DB_HOST")
@@ -107,7 +87,6 @@
_ = v.UnmarshalKey("web", WebConf)
_ = v.UnmarshalKey("log", LogConf)
_ = v.UnmarshalKey("db", DbConf)
- _ = v.UnmarshalKey("nsq", NsqConf)
_ = v.UnmarshalKey("local", LocalConf)
showConfig()
}
@@ -117,8 +96,6 @@
log.Printf(" WebConf: %+v", WebConf)
log.Printf(" LogConf: %+v", LogConf)
log.Printf(" DbConf: %+v", DbConf)
- log.Printf(" NsqConf: %+v", NsqConf)
- log.Printf(" GrpcPort: %+v", GrpcPort)
log.Printf(" LocalConf: %+v", LocalConf)
log.Println("......................................................")
}
--
Gitblit v1.8.0