From 283a54070553e81a2e73d4b8b9ea1d717c2f512e Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 15 三月 2024 10:08:59 +0800
Subject: [PATCH] 补充
---
conf/config.go | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index a998029..7526045 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -8,6 +8,7 @@
"flag"
"github.com/spf13/viper"
"log"
+ "os"
)
var (
@@ -38,9 +39,17 @@
Issuer string // 绛惧彂鑰�
}
+ JWT2 struct {
+ SigningKey string // jwt绛惧悕
+ ExpiresTime string // 杩囨湡鏃堕棿
+ BufferTime string // 缂撳啿鏃堕棿
+ Issuer string // 绛惧彂鑰�
+ }
+
System struct {
Env string // 鐜鍊� develop test public
Port int // 绔彛
+ GrpcPort string //grpc绔彛
DbType string // 鏁版嵁搴撶被鍨�
UseMultipoint bool // 澶氱偣鐧诲綍鎷︽埅
UseRedis bool // 浣跨敤redis
@@ -48,6 +57,13 @@
LimitTimeIP int
RouterPrefix string // 璺敱鍓嶇紑
SudoPassword string // sudo瀵嗙爜
+ }
+
+ GrpcServiceAddr struct {
+ Aps string // aps鏈嶅姟鍦板潃
+ Admin string // admin鏈嶅姟鍦板潃
+ WMS string //wms鏈嶅姟鍦板潃
+ SRM string //srm鏈嶅姟鍦板潃
}
config struct {
@@ -68,6 +84,8 @@
// JWT閰嶇疆
JWT JWT
+
+ GrpcServiceAddr GrpcServiceAddr
}
)
@@ -98,7 +116,42 @@
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
+ }
+ GrpcPort := os.Getenv("WMS_GRPC")
+ if len(GrpcPort) > 0 {
+ Conf.GrpcServiceAddr.WMS = GrpcPort
+ }
+ srmPort := os.Getenv("SRM_GRPC")
+ if len(srmPort) > 0 {
+ Conf.GrpcServiceAddr.SRM = srmPort
+ }
+ 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 +170,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