From 426ca2366cc521d88b7483f0cefd811f996e8a22 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 20 十一月 2023 14:53:50 +0800
Subject: [PATCH] merge
---
main.go | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/main.go b/main.go
index 3ee1279..acfe495 100644
--- a/main.go
+++ b/main.go
@@ -2,15 +2,22 @@
import (
"context"
+ "fmt"
+ "google.golang.org/grpc"
+ "net"
"net/http"
"os"
"os/signal"
"syscall"
"time"
"wms/conf"
+ "wms/controllers"
"wms/models"
"wms/pkg/logx"
+ "wms/proto/product_inventory"
+ "wms/proto/purchase_wms"
"wms/router"
+ "wms/service"
)
func main() {
@@ -38,6 +45,32 @@
WriteTimeout: 5 * time.Second,
}
go shutdown(server)
+ //鍚姩grpc瀹㈡埛绔�
+ go controllers.InitInventoryOrderServiceConn()
+ go controllers.InitProductInventoryServiceConn()
+ go controllers.InitCodeServiceConn()
+ //鍚姩grpc鏈嶅姟
+ go func() {
+ ln, err := net.Listen("tcp", ":"+conf.WebConf.GrpcPort)
+ if err != nil {
+ logx.Errorf("grpc server init error: %v", err.Error())
+ panic(fmt.Sprintf("grpc server init error: %v", err.Error()))
+ }
+ fmt.Println("-----------鐩戝惉绔彛: ", conf.WebConf.GrpcPort)
+ s := grpc.NewServer()
+ //todo 娣诲姞鍏蜂綋鏈嶅姟
+ product_inventory.RegisterProductInventoryServiceServer(s, &product_inventory.Server{})
+ purchase_wms.RegisterPurchaseServiceServer(s, &purchase_wms.Server{})
+ err = s.Serve(ln)
+ if err != nil {
+ logx.Errorf("grpc server init error: %v", err.Error())
+ panic(fmt.Sprintf("grpc server init error: %v", err.Error()))
+ }
+ }()
+
+ go service.InitLocationReportData()
+ go service.InitHistoryReportData()
+
logx.Error(server.ListenAndServe().Error())
}
@@ -51,6 +84,9 @@
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
+ controllers.CloseInventoryOrderServiceConn()
+ controllers.CloseProductInventoryServiceConn()
+ controllers.CloseCodeServiceConn()
// 鍏抽棴HTTP鏈嶅姟鍣�
if err := server.Shutdown(ctx); err != nil {
logx.Infof("鏈嶅姟浼橀泤閫�鍑哄け璐�: %v", err)
--
Gitblit v1.8.0