From 77af56e2dca9fe2410d54c4bb54b38dcd595e8ed Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期一, 21 八月 2023 11:51:04 +0800 Subject: [PATCH] fix --- model/saleChance.go | 2 +- conf/config.go | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/conf/config.go b/conf/config.go index b8cbcd4..54544a4 100644 --- a/conf/config.go +++ b/conf/config.go @@ -132,8 +132,11 @@ Conf.GrpcServiceAddr.Admin = AdminGrpc } - if len(DBUser) > 0 { - Conf.GrpcServiceAddr.Aps = "http://" + DBUser + ":9091" + 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 + } diff --git a/model/saleChance.go b/model/saleChance.go index ee9d86b..99df3df 100644 --- a/model/saleChance.go +++ b/model/saleChance.go @@ -157,7 +157,7 @@ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize) } - err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").Preload("Member").Preload("SaleStage").Preload("Possibility").Preload("CollectionProjections").Preload("Client").Preload("Contact").Order("id desc").Find(&records).Error + err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").Preload("Member").Preload("SaleStage").Preload("Possibility").Preload("CollectionProjections").Preload("Client").Preload("Contact.Province").Preload("Contact.City").Order("id desc").Find(&records).Error return records, total, err } -- Gitblit v1.8.0