From 29d3d3b9f32f9ed1a9eedcfcbe19424477656635 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 14 十一月 2023 14:01:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
conf/config.go | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index ccb00c6..df4cfba 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -23,12 +23,14 @@
type (
webConf struct {
- Host string // 鏈満ip鍦板潃
- Port string // 绔彛鍙�
- NodeId string // 涓昏处鎴风敤鎴峰悕
- OssType string // 瀵硅薄瀛樺偍绫诲瀷
- JWTSecret string
- GrpcPort string //grpc绔彛鍙�
+ Host string // 鏈満ip鍦板潃
+ Port string // 绔彛鍙�
+ NodeId string // 涓昏处鎴风敤鎴峰悕
+ OssType string // 瀵硅薄瀛樺偍绫诲瀷
+ JWTSecret string
+ FileServer string //鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
+ ServerId string //鏈嶅姟ID
+ GrpcPort string //grpc绔彛鍙�
}
localConf struct {
@@ -37,6 +39,7 @@
grpcServerConf struct {
ApsAddr string //aps鏈嶅姟grpc鍦板潃
+ CrmAddr string //crm鏈嶅姟grpc鍦板潃
}
)
@@ -65,6 +68,7 @@
host := os.Getenv("HOST") // 鏈満IP鍦板潃
GrpcPort := os.Getenv("WMS_GRPC") // 鍙澶栨彁渚沢rpc鏈嶅姟锛屾湰鏈嶅姟涓嶇敤
apsAddr := os.Getenv("APS_GRPC")
+ crmAddr := os.Getenv("CRM_GRPC")
if len(GrpcPort) > 0 {
WebConf.GrpcPort = GrpcPort
}
@@ -77,6 +81,9 @@
if len(apsAddr) > 0 {
GrpcServerConf.ApsAddr = apsAddr
}
+ if len(crmAddr) > 0 {
+ GrpcServerConf.CrmAddr = crmAddr
+ }
DBHost := os.Getenv("DB_HOST")
DBName := os.Getenv("DB_NAME")
--
Gitblit v1.8.0