From ed3d45b189f102249eabd0cb5a0299bc66b0dea6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 18 十二月 2023 21:04:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
main.go | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/main.go b/main.go
index 68e32ad..1801bbf 100644
--- a/main.go
+++ b/main.go
@@ -11,14 +11,12 @@
"syscall"
"time"
"wms/conf"
- "wms/controllers"
"wms/models"
"wms/pkg/logx"
- "wms/proto/client"
+ "wms/proto/init_client"
"wms/proto/inventory_order"
"wms/proto/product_inventory"
"wms/proto/purchase_wms"
- "wms/proto/supplier"
"wms/router"
"wms/service"
)
@@ -49,11 +47,12 @@
}
go shutdown(server)
//鍚姩grpc瀹㈡埛绔�
- go controllers.InitInventoryOrderServiceConn()
- go controllers.InitProductInventoryServiceConn()
- go controllers.InitCodeServiceConn()
- go supplier.InitConn()
- go client.InitConn()
+ //go controllers.InitInventoryOrderServiceConn()
+ //go controllers.InitProductInventoryServiceConn()
+ //go controllers.InitCodeServiceConn()
+ //go supplier.InitConn()
+ //go client.InitConn()
+ go init_client.InitClient()
//鍚姩grpc鏈嶅姟
go func() {
ln, err := net.Listen("tcp", ":"+conf.WebConf.GrpcPort)
@@ -90,11 +89,12 @@
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
- controllers.CloseInventoryOrderServiceConn()
- controllers.CloseProductInventoryServiceConn()
- controllers.CloseCodeServiceConn()
- supplier.CloseConn()
- client.CloseConn()
+ //controllers.CloseInventoryOrderServiceConn()
+ //controllers.CloseProductInventoryServiceConn()
+ //controllers.CloseCodeServiceConn()
+ //supplier.CloseConn()
+ //client.CloseConn()
+ init_client.CloseClient()
// 鍏抽棴HTTP鏈嶅姟鍣�
if err := server.Shutdown(ctx); err != nil {
logx.Infof("鏈嶅姟浼橀泤閫�鍑哄け璐�: %v", err)
--
Gitblit v1.8.0