修改Deadlines

helper/helper.go

@@ -48,11 +48,3 @@ func Paginate(count, step, page int64) (int64, int64) {
 }
 
 
-func TimeOutCanceled(ctx context.Context) (err error) {
-	select {
-	case <-ctx.Done():
-		err = status.Error(codes.Canceled, "Client cancelled, abandoning.")
-		break
-	}
-	return
-}
\ No newline at end of file

sevice/im_chat_room/main.go

@@ -15,7 +15,10 @@ type ImChatRoomService struct {
 
 func (cr *ImChatRoomService) Add(ctx context.Context,
 	in *pb.ChatRoomAddRequest) (reply *pb.ChatRoomAddReply, err error) {
-
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
+		return
+	}
 	room_id, err := AddChatRoom(in)
 	if err != nil {
 		return
@@ -37,7 +40,10 @@ func (cr *ImChatRoomService) Update(ctx context.Context,
 
 func (cr *ImChatRoomService) Delete(ctx context.Context,
 	in *pb.ChatRoomDelRequest) (reply *pb.ChatRoomDelReply, err error) {
-
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
+		return
+	}
 	if err = DeleteChatRoom(in.RoomId); err != nil {
 		return
 	}
@@ -47,7 +53,10 @@ func (cr *ImChatRoomService) Delete(ctx context.Context,
 
 func (cr *ImChatRoomService) Info(ctx context.Context,
 	in *pb.ChatRoomInfoRequest) (reply *pb.ChatRoomInfoReply, err error) {
-
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
+		return
+	}
 	db_chat_room, err := ChatRoomInfo(in)
 	if err != nil {
 		return
@@ -71,6 +80,10 @@ func getchatroom(room db.ImChatRoom) *pb.ChatRoomInfoReply {
 
 func (cr *ImChatRoomService) All(ctx context.Context,
 	in *pb.ChatRoomAllRequest) (reply *pb.GetChatRoomsReply, err error) {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
+		return
+	}
 	results, err := GetChatRooms(in)
 	if err != nil {
 		err = status.Error(codes.Internal, err.Error())

sevice/im_configure/main.go

@@ -18,7 +18,8 @@ type ConfigureSevice struct {
 func (cs *ConfigureSevice) Add(ctx context.Context,
 	in *pb.ConfigureRequest) (reply *pb.ConfigureReply, err error) {
 	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
 	configure_add_struct := vs.NewConfigureAddStruct(in)
@@ -45,7 +46,8 @@ func (cs *ConfigureSevice) Add(ctx context.Context,
 func (cs *ConfigureSevice) Delete(ctx context.Context,
 	in *pb.ConfigureDelRequest) (reply *pb.ConfigureReply, err error) {
 	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
 	// 执行删除操作
@@ -59,7 +61,8 @@ func (cs *ConfigureSevice) Delete(ctx context.Context,
 func (cs *ConfigureSevice) Select(ctx context.Context,
 	in *pb.GetAllRequest) (reply *pb.GetAllReply, err error) {
 	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
 	reply = &pb.GetAllReply{}
@@ -87,7 +90,8 @@ func (cs *ConfigureSevice) Select(ctx context.Context,
 func (cs *ConfigureSevice) Update(ctx context.Context,
 	in *pb.UpdateRequest) (reply *pb.ConfigureReply, err error) {
 	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
 	configure_add_struct := vs.NewConfigureUpdateStruct(in)

sevice/im_friend_request/main.go

@@ -2,14 +2,13 @@ package im_friend_request
 
 import (
 	"context"
-	"im-microservice/helper"
-	"time"
 
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 	"im-microservice/pb"
 	"im-microservice/sevice/im_user"
 	"im-microservice/sevice/im_user_relationship"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 type ImFriendService struct {
@@ -18,7 +17,8 @@ type ImFriendService struct {
 
 func (fs *ImFriendService) All (ctx context.Context, in *pb.ImFriendListReq) (reply *pb.ImFriendListReply, err error) {
 	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
 	// 添加用户是否存在
@@ -46,7 +46,8 @@ func (fs *ImFriendService) All (ctx context.Context, in *pb.ImFriendListReq) (re
 
 func (fs *ImFriendService) Add (ctx context.Context,in *pb.ImFriendAddReq) (reply *pb.ImFriendEmptyReply, err error) {
 	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
 	// 添加用户是否存在
@@ -83,7 +84,8 @@ func (fs *ImFriendService) Add (ctx context.Context,in *pb.ImFriendAddReq) (repl
 
 func (fs *ImFriendService) Update(ctx context.Context, in *pb.ImFriendUpdateReq) (reply *pb.ImFriendEmptyReply, err error) {
 	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
 	if err = Update(in);  err != nil {

sevice/im_user_relationship/db.go

@@ -23,7 +23,7 @@ var (
 	db_field_updatetime = "updatetime"
 	db_field_createtime = "createtime"
 	open             = 2
-	close               = 1
+	db_close            = 1
 )
 
 // 是否是好友
@@ -35,7 +35,7 @@ func IsUserRelationship(accid, faccid string) bool {
 //是否是对方黑名单
 func IsBlack(accid, faccid string) bool {
 	return db.MysqlClient.QueryTable(db_tabel).Filter(db_field_accid, faccid).
-		Filter(db_field_faccid, accid).Filter(db_field_blacklist, close).Exist()
+		Filter(db_field_faccid, accid).Filter(db_field_blacklist, db_close).Exist()
 
 }
 
@@ -73,7 +73,6 @@ func AddUserRelationship(in *pb.UserRelationshipAddRequest) error {
 		}
 	}
 
-
 	if err != nil {
 		err = status.Error(codes.Internal, err.Error())
 	}
@@ -115,14 +114,14 @@ func SetSpecialRelationDb(in *pb.SetSpecialRelationReq) error {
 	if in.RelationType == 1 {
 		if in.Value == 1 {
 			//黑名单
-			orm_params["blacklist"] = close
+			orm_params["blacklist"] = db_close
 		} else {
 			orm_params["blacklist"] = open
 		}
 	} else {
 		if in.Value == 1 {
 			//禁音
-			orm_params["mute"] = close
+			orm_params["mute"] = db_close
 		} else {
 			orm_params["mute"] = open
 		}
@@ -141,10 +140,10 @@ func ListBlackAndMuteListDB(in *pb.ListBlackAndMuteListReq) (blacklist []db.ImUs
 	mutelist []db.ImUserRelationship, err error) {
 
 	query_db := db.MysqlClient.QueryTable(db_tabel).Filter(db_field_accid, in.Accid)
-	_, err = query_db.Filter(db_field_blacklist, close).All(&blacklist)
+	_, err = query_db.Filter(db_field_blacklist, db_close).All(&blacklist)
 	if err != nil {
 		return
 	}
-	_, err = query_db.Filter(db_field_mute, close).All(&mutelist)
+	_, err = query_db.Filter(db_field_mute, db_close).All(&mutelist)
 	return
 }

sevice/im_user_relationship/main.go

@@ -2,6 +2,7 @@ package im_user_relationship
 
 import (
 	"context"
+	"fmt"
 	
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -17,8 +18,8 @@ type UserRelationshipService struct {
 
 func (us *UserRelationshipService) Add(ctx context.Context,
 	in *pb.UserRelationshipAddRequest) (reply *pb.UserRelationshipAddReply, err error) {
-	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
 	//添加好友
@@ -40,7 +41,8 @@ func (us *UserRelationshipService) Add(ctx context.Context,
 func (us *UserRelationshipService) Delete(ctx context.Context,
 	in *pb.UserRelationshipDelRequest) (reply *pb.UserRelationshipAddReply, err error) {
 	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
 	// 删除好友
@@ -62,7 +64,8 @@ func (us *UserRelationshipService) Delete(ctx context.Context,
 func (us *UserRelationshipService) All(ctx context.Context,
 	in *pb.UserRelationshipListRequest) (reply *pb.UserRelationshipListReply, err error) {
 	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
 	results, err := DBAll(in)
@@ -83,7 +86,8 @@ func (us *UserRelationshipService) All(ctx context.Context,
 func (us *UserRelationshipService) SetSpecialRelation(ctx context.Context,
 	in *pb.SetSpecialRelationReq) (reply *pb.UserRelationshipAddReply, err error) {
 	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
 	if err = SetSpecialRelationDb(in); err != nil {
@@ -96,11 +100,12 @@ func (us *UserRelationshipService) SetSpecialRelation(ctx context.Context,
 
 func (us *UserRelationshipService) ListBlackAndMuteList(ctx context.Context,
 	in *pb.ListBlackAndMuteListReq) (reply *pb.ListBlackAndMuteListReply, err error) {
-
 	// 请求超时
-	if err = helper.TimeOutCanceled(ctx); err != nil {
+	if ctx.Err() == context.Canceled {
+		err = status.New(codes.Canceled, "Client cancelled, abandoning.").Err()
 		return
 	}
+
 	blacklist, mutelist, err := ListBlackAndMuteListDB(in)
 	if err != nil {
 		err = status.Error(codes.Internal, err.Error())
@@ -114,6 +119,8 @@ func (us *UserRelationshipService) ListBlackAndMuteList(ctx context.Context,
 				&pb.UserRelationshipInfo{Updatetime: v.Updatetime, Faccid: v.Faccid})
 		}
 	}
+	fmt.Println("123123")
+
 	if len(mutelist) > 0 {
 		for _, v := range mutelist {
 			reply.Mutelist = append(reply.Mutelist,