From c5a0eb549cba2cd358a2d0496c44f3a289f15d9c Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期一, 28 八月 2023 14:22:06 +0800 Subject: [PATCH] fix --- conf/config.go | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/conf/config.go b/conf/config.go index d6541dd..54544a4 100644 --- a/conf/config.go +++ b/conf/config.go @@ -59,7 +59,8 @@ } GrpcServiceAddr struct { - Aps string // jwt绛惧悕 + Aps string // aps鏈嶅姟鍦板潃 + Admin string // admin鏈嶅姟鍦板潃 } config struct { @@ -126,7 +127,21 @@ Conf.Mysql.Dsn = DBUser + ":" + DBPasswd + "@tcp(" + DBHost + ":" + DBPort + ")/" + DBName + "?charset=utf8&parseTime=True&loc=Local" } + AdminGrpc := os.Getenv("ADMIN_GRPC") + if len(AdminGrpc) > 0 { + Conf.GrpcServiceAddr.Admin = AdminGrpc + } + + ApsGrpc := os.Getenv("GRPC_PORT") + Host := os.Getenv("HOST") + + if len(Host) > 0 && len(ApsGrpc) > 0 { + Conf.GrpcServiceAddr.Aps = Host + ":" + ApsGrpc + //Conf.GrpcServiceAddr.Aps = DBUser + DBUser + + } + ShowConfig() + CheckConfig() } // WriteConfig 鍥炲啓閰嶇疆 @@ -148,3 +163,9 @@ log.Printf(" GrpcServiceAddr: %+v", Conf.GrpcServiceAddr) log.Println("......................................................") } + +func CheckConfig() { + if Conf.GrpcServiceAddr.Aps == "" { + log.Fatalf("%v 灏氭湭閰嶇疆", "GrpcServiceAddr.Aps") + } +} -- Gitblit v1.8.0