From d20acf38c36c11ee4428c3e74a17f5870dc61b51 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 09:51:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
main.go | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/main.go b/main.go
index 266e282..fe6d232 100644
--- a/main.go
+++ b/main.go
@@ -1,8 +1,13 @@
package main
import (
+ "fmt"
"go.uber.org/zap"
+ "google.golang.org/grpc"
+ "net"
"srm/api/v1/test"
+ "srm/proto/purchase_wms"
+ "srm/proto/qualityinspect"
"srm/core"
"srm/global"
@@ -23,11 +28,9 @@
// @BasePath /
func main() {
global.GVA_VP = core.Viper() // 鍒濆鍖朧iper
- initialize.OtherInit()
- global.GVA_LOG = core.Zap() // 鍒濆鍖杬ap鏃ュ織搴�
+ global.GVA_LOG = core.Zap() // 鍒濆鍖杬ap鏃ュ織搴�
zap.ReplaceGlobals(global.GVA_LOG)
global.GVA_DB = initialize.Gorm() // gorm杩炴帴鏁版嵁搴�
- initialize.Timer()
initialize.DBList()
if global.GVA_DB != nil {
initialize.RegisterTables() // 鍒濆鍖栬〃
@@ -35,8 +38,39 @@
db, _ := global.GVA_DB.DB()
defer db.Close()
}
+ //鍚姩grpc鏈嶅姟
+ go func() {
+ ln, err := net.Listen("tcp", ":"+global.GVA_CONFIG.System.GrpcPort)
+ if err != nil {
+ global.GVA_LOG.Error("grpc server init error: %v", zap.Error(err))
+ panic(fmt.Sprintf("grpc server init error: %v", err.Error()))
+ }
+ s := grpc.NewServer()
+ //todo 娣诲姞鍏蜂綋鏈嶅姟
+ purchase_wms.RegisterPurchaseServiceServer(s, &purchase_wms.Server{})
+ err = s.Serve(ln)
+ if err != nil {
+ global.GVA_LOG.Error("grpc server init error: %v", zap.Error(err))
+ panic(fmt.Sprintf("grpc server init error: %v", err.Error()))
+ }
+ }()
- go test.InitProductServiceConn()
+ go initGrpcClient()
+ defer closeGrpcClient()
core.RunWindowsServer()
}
+
+func initGrpcClient() {
+ test.InitProductServiceConn()
+ qualityinspect.InitConn()
+ purchase_wms.InitPurchaseConn()
+ test.InitProductServiceConn()
+}
+
+func closeGrpcClient() {
+ test.CloseProductServiceConn()
+ qualityinspect.CloseConn()
+ purchase_wms.ClosePurchaseConn()
+ test.CloseProductServiceConn()
+}
--
Gitblit v1.8.0