From 3288c6f7bbb3cc6cf101238a453479a9d9b8a795 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 21 三月 2024 14:31:19 +0800
Subject: [PATCH] fix
---
conf/config.go | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index 684b5f8..7526045 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -49,6 +49,7 @@
System struct {
Env string // 鐜鍊� develop test public
Port int // 绔彛
+ GrpcPort string //grpc绔彛
DbType string // 鏁版嵁搴撶被鍨�
UseMultipoint bool // 澶氱偣鐧诲綍鎷︽埅
UseRedis bool // 浣跨敤redis
@@ -61,6 +62,8 @@
GrpcServiceAddr struct {
Aps string // aps鏈嶅姟鍦板潃
Admin string // admin鏈嶅姟鍦板潃
+ WMS string //wms鏈嶅姟鍦板潃
+ SRM string //srm鏈嶅姟鍦板潃
}
config struct {
@@ -131,9 +134,20 @@
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(DBHost) > 0 {
- Conf.GrpcServiceAddr.Aps = "http://" + DBName + ":9091"
+ if len(Host) > 0 && len(ApsGrpc) > 0 {
+ Conf.GrpcServiceAddr.Aps = Host + ":" + ApsGrpc
+ //Conf.GrpcServiceAddr.Aps = DBUser + DBUser +
}
ShowConfig()
--
Gitblit v1.8.0