From a98b2ed2ddcf15db5b20907cd502e157d04d1b88 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 20 十月 2023 10:22:06 +0800
Subject: [PATCH] 去掉无用配置
---
conf/config.go | 30 ++----------------------------
1 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index 06955ee..b50a0e7 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -25,17 +25,9 @@
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
}
localConf struct {
@@ -47,10 +39,7 @@
WebConf = &webConf{}
LogConf = &logx.Conf{}
DbConf = &mysqlx.Conf{}
- NsqConf = &nsqConf{}
LocalConf = &localConf{}
- NodeId string
- GrpcPort string
Viper *viper.Viper
)
@@ -66,25 +55,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 +84,6 @@
_ = v.UnmarshalKey("web", WebConf)
_ = v.UnmarshalKey("log", LogConf)
_ = v.UnmarshalKey("db", DbConf)
- _ = v.UnmarshalKey("nsq", NsqConf)
_ = v.UnmarshalKey("local", LocalConf)
showConfig()
}
@@ -117,8 +93,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