代码冲突

main.go

@@ -16,9 +16,9 @@ import (
 	"im-microservice/helper"
 	"im-microservice/pb"
 	"im-microservice/sevice/im_chat_room"
+	ic "im-microservice/sevice/im_configure"
 	"im-microservice/sevice/im_user"
 	iur "im-microservice/sevice/im_user_relationship"
-	ic "im-microservice/sevice/im_configure"
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
@@ -26,7 +26,6 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/reflection"
 	"google.golang.org/grpc/status"
-
 )
 
 
@@ -143,11 +142,15 @@ func main() {
 
 	var opts []grpc.ServerOption
 	opts = append(opts, grpc.UnaryInterceptor(auth))
+
+
 	s := grpc.NewServer(opts...)
 //	s := grpc.NewServer()
 	srv := NewServer()
 	pb.RegisterHealthServer(s, srv)
 
+
+
 	pb.RegisterConfigureSeviceServer(s, &ic.ConfigureSevice{})
 	pb.RegisterChatRoomServiceServer(s, &im_chat_room.ImChatRoomService{})
 	pb.RegisterImUserServer(s, &im_user.ImUserServer{})