From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0
---
conf/config.go | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index a998029..54544a4 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -8,6 +8,7 @@
"flag"
"github.com/spf13/viper"
"log"
+ "os"
)
var (
@@ -38,6 +39,13 @@
Issuer string // 绛惧彂鑰�
}
+ JWT2 struct {
+ SigningKey string // jwt绛惧悕
+ ExpiresTime string // 杩囨湡鏃堕棿
+ BufferTime string // 缂撳啿鏃堕棿
+ Issuer string // 绛惧彂鑰�
+ }
+
System struct {
Env string // 鐜鍊� develop test public
Port int // 绔彛
@@ -48,6 +56,11 @@
LimitTimeIP int
RouterPrefix string // 璺敱鍓嶇紑
SudoPassword string // sudo瀵嗙爜
+ }
+
+ GrpcServiceAddr struct {
+ Aps string // aps鏈嶅姟鍦板潃
+ Admin string // admin鏈嶅姟鍦板潃
}
config struct {
@@ -68,6 +81,8 @@
// JWT閰嶇疆
JWT JWT
+
+ GrpcServiceAddr GrpcServiceAddr
}
)
@@ -98,7 +113,35 @@
if err := Viper.Unmarshal(&Conf); err != nil {
log.Fatalf("Unmarshal err:%v", err)
}
+
+ DBHost := os.Getenv("DB_HOST")
+ DBName := os.Getenv("DB_NAME")
+ DBPort := os.Getenv("DB_PORT")
+ DBUser := os.Getenv("DB_USER")
+ DBPasswd := os.Getenv("DB_PASSWD")
+ if len(DBHost) > 0 &&
+ len(DBName) > 0 &&
+ len(DBPort) > 0 &&
+ len(DBUser) > 0 &&
+ len(DBPasswd) > 0 {
+ 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 鍥炲啓閰嶇疆
@@ -117,5 +160,12 @@
log.Printf(" Mysql: %+v", Conf.Mysql)
log.Printf(" Captcha: %+v", Conf.Captcha)
log.Printf(" JWT: %+v", Conf.JWT)
+ log.Printf(" GrpcServiceAddr: %+v", Conf.GrpcServiceAddr)
log.Println("......................................................")
}
+
+func CheckConfig() {
+ if Conf.GrpcServiceAddr.Aps == "" {
+ log.Fatalf("%v 灏氭湭閰嶇疆", "GrpcServiceAddr.Aps")
+ }
+}
--
Gitblit v1.8.0