Commit 4b226442 by 李洪

代码冲突

parent 0a75f2bf
...@@ -3,8 +3,9 @@ package main ...@@ -3,8 +3,9 @@ package main
import ( import (
"net" "net"
beeLogger "github.com/beego/bee/logger"
initialize "im-microservice/initialization" initialize "im-microservice/initialization"
beeLogger "github.com/beego/bee/logger"
) )
const ( const (
...@@ -21,6 +22,7 @@ func main() { ...@@ -21,6 +22,7 @@ func main() {
beeLogger.Log.Success("gRPC server is running on " + port + " port.") beeLogger.Log.Success("gRPC server is running on " + port + " port.")
if err := initialize.RpcServer.Serve(lis); err != nil { if err := initialize.RpcServer.Serve(lis); err != nil {
beeLogger.Log.Fatalf("failed to serve: %v", err) beeLogger.Log.Fatalf("failed to serve: %v", err)
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment