From 27be7a2c517404e4622470edf7b83b13129220ff Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 08 十二月 2023 11:14:04 +0800
Subject: [PATCH] merge conflicts
---
proto/supplier/client.go | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/proto/supplier/client.go b/proto/supplier/client.go
index be1c71f..d261344 100644
--- a/proto/supplier/client.go
+++ b/proto/supplier/client.go
@@ -1,27 +1,27 @@
package supplier
-import (
- "google.golang.org/grpc"
- "google.golang.org/grpc/credentials/insecure"
- "wms/conf"
- "wms/pkg/logx"
-)
-
-var (
- SupplierConn *grpc.ClientConn
-)
-
-func InitConn() {
- var err error
- SupplierConn, err = grpc.Dial(conf.GrpcServerConf.SrmAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
- if err != nil {
- logx.Errorf("grpc dial product service error: %v", err.Error())
- return
- }
-}
-
-func CloseConn() {
- if SupplierConn != nil {
- SupplierConn.Close()
- }
-}
+//import (
+// "google.golang.org/grpc"
+// "google.golang.org/grpc/credentials/insecure"
+// "wms/conf"
+// "wms/pkg/logx"
+//)
+//
+//var (
+// SupplierConn *grpc.ClientConn
+//)
+//
+//func InitConn() {
+// var err error
+// SupplierConn, err = grpc.Dial(conf.GrpcServerConf.SrmAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+// if err != nil {
+// logx.Errorf("grpc dial product service error: %v", err.Error())
+// return
+// }
+//}
+//
+//func CloseConn() {
+// if SupplierConn != nil {
+// SupplierConn.Close()
+// }
+//}
--
Gitblit v1.8.0