merge conflicts

jiangshuai

2023-12-08 27be7a2c517404e4622470edf7b83b13129220ff

 main.go

@@ -11,13 +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"
)
@@ -48,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)
@@ -65,6 +65,7 @@
      //todo 添加具体服务
      product_inventory.RegisterProductInventoryServiceServer(s, &product_inventory.Server{})
      purchase_wms.RegisterPurchaseServiceServer(s, &purchase_wms.Server{})
      inventory_order.RegisterInventoryOrderServiceServer(s, &inventory_order.Server{})
      err = s.Serve(ln)
      if err != nil {
         logx.Errorf("grpc server init error: %v", err.Error())
@@ -88,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)