refactor: reorganize modules and add Linux build tooling

module/social/relation/internal/logic/common/const.go

@@ -0,0 +1,202 @@
+package common
+
+import (
+	"encoding/json"
+	"fmt"
+	"hash/crc64"
+	"sort"
+
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+var (
+	Filed string = "relation_identity as identity,nickname,avatar,sex,province,city,area,sign"
+)
+
+// 根据identity获取会员信息卡片
+func GetrelationInfoDetailCard(identity string) (card *pb.RelationItem, err error) {
+	err = impl.DBService.Table("relation_extend").Select(Filed).Where("relation_identity = ?", identity).First(&card).Error
+	return
+}
+
+// 根据id数组获取多条会员信息卡片
+func GetrelationInfoDetailCardById(ids []uint) (cards []*pb.RelationItem, err error) {
+	err = impl.DBService.Table("relation_extend").Select(Filed).Where("relation_id in ?", ids).Find(&cards).Error
+	return
+}
+
+// 实现将2个字符串，不论先后顺序输入，输出得到的唯一值都是一样的。
+func UniqueSessionID(s1, s2 string) string {
+	strs := []string{s1, s2}
+	sort.Strings(strs)
+	table := crc64.MakeTable(crc64.ECMA)
+	return fmt.Sprintf("%x", crc64.Checksum([]byte(strs[0]+strs[1]), table))
+}
+
+// 根据用户ID，找到用户的申请好友信息
+func CollectionFriendApply(id uint) (reply *pb.ApplyFetchReply, err error) {
+	var (
+		version      int64
+		ids          []uint
+		last_msg_ids []uint
+		maxSize      int = 50
+		applys           = make([]*models.FriendApply, 0)
+		replyItems       = make([]*pb.ApplyItem, 0)
+		mapCards         = make(map[string]*pb.RelationItem)
+
+		messages    = make([]*models.FriendApplyMessage, 0)
+		mapMessages = make(map[uint]*pb.MessageItem)
+	)
+	reply = &pb.ApplyFetchReply{}
+
+	err = impl.DBService.Where("to_id=? ", id).Order("id desc").Limit(maxSize).Find(&applys).Error
+	if err != nil {
+		return nil, err
+	}
+
+	for _, item := range applys {
+		ids = append(ids, item.FromID)
+		last_msg_ids = append(last_msg_ids, item.LastMessageID)
+	}
+
+	result, err := GetrelationInfoDetailCardById(ids)
+	if err != nil {
+		return nil, err
+	}
+	for _, item := range result {
+		mapCards[item.Identity] = item
+	}
+
+	err = impl.DBService.Where("id in ?", last_msg_ids).Find(&messages).Error
+	if err != nil {
+		return nil, err
+	}
+	for _, item := range messages {
+		mapMessages[item.ID] = &pb.MessageItem{
+			RelationIdentity: item.PassportIdentity,
+			Body:             item.Body,
+			CreatedAt:        item.CreatedAt.Local().Format("2006-01-02 15:04:05"),
+		}
+	}
+
+	for _, item := range applys {
+		var applyItem = &pb.ApplyItem{}
+		applyItem.Identity = item.Identity
+		applyItem.CreatedAt = item.CreatedAt.Local().Format("2006-01-02 15:04:05")
+		applyItem.Status = int32(item.Status)
+
+		if _, ok := mapCards[item.FromIdentity]; ok {
+			applyItem.From = mapCards[item.FromIdentity]
+		}
+
+		if _, ok := mapMessages[item.LastMessageID]; ok {
+			applyItem.Message = mapMessages[item.LastMessageID]
+		}
+
+		replyItems = append(replyItems, applyItem)
+		version = int64(item.ID)
+	}
+
+	reply.Applys = replyItems
+	reply.Version = version
+	return
+}
+
+// 根据用户ID，找到用户的好友信息和分组信息
+func CollectionFriendData(id uint) (reply *pb.FriendsReply, err error) {
+	var (
+		version int64
+		ids     []uint
+
+		relationFriend   = make([]models.RelationFriend, 0)
+		mapRelationFrend = make(map[uint]models.RelationFriend)
+
+		friendInTag    = make([]models.FriendInTag, 0)
+		mapFriendInTag = make(map[string][]string)
+	)
+	reply = &pb.FriendsReply{}
+	impl.DBService.Where("relation_id=?", id).Order("id desc").Find(&relationFriend)
+
+	for _, item := range relationFriend {
+		ids = append(ids, item.ID)
+		mapRelationFrend[item.ID] = item
+		version = int64(item.ID)
+	}
+
+	impl.DBService.Where("relation_id=?", id).Find(&friendInTag)
+
+	for _, item := range friendInTag {
+		mapFriendInTag[item.FriendIdentity] = append(mapFriendInTag[item.FriendIdentity], item.TagIdentity)
+	}
+
+	err = impl.DBService.Model(models.FriendTag{}).Where("relation_id=?", id).Order("id asc").Scan(&reply.Tags).Error
+	if err != nil {
+		return
+	}
+
+	reply.Friends, err = GetrelationInfoDetailCardById(ids)
+	for idx, item := range reply.Friends {
+		reply.Friends[idx].RemarkName = item.RemarkName
+		reply.Friends[idx].Popular = item.Popular
+		if _, ok := mapFriendInTag[item.Identity]; ok {
+			reply.Friends[idx].Tags = mapFriendInTag[item.Identity]
+		}
+	}
+
+	reply.Version = version
+
+	return
+}
+
+// 根据Match表获取多条会员信息卡片
+func GetrelationInfoDetailCardByMatch(relation_identity string, offset, limit int) (cards []*pb.RelationItem, err error) {
+	sql := `Select 
+			pe.relation_identity as identity, 
+			pe.name,
+			pe.avatar,
+			pe.birthday,
+			pe.sex,
+			pe.province,
+			pe.city,
+			pe.area,
+			pe.sign,
+			rm.status as foreign_status 
+			From relation_match as rm,relation_extend as pe 
+			Left join pe on pe.relation_identity=rm.recommend_identity
+			Where rm.relation_identity=?
+			Offset ?
+			Limit ?
+			Order by rm.id Desc`
+	err = impl.DBService.Raw(sql, relation_identity, offset, limit).Scan(&cards).Error
+	return
+}
+
+func SetCache(identity string, collectionName string, in interface{}) error {
+	key := "/RF/" + identity + "/" + collectionName
+	val, err := json.Marshal(in)
+	if err != nil {
+		return err
+	}
+	err = impl.RedisService.Client.Set(impl.RedisService.Ctx, key, string(val), 0).Err()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func GetCache(identity, collectionName string) (reply *pb.ApplyFetchReply, err error) {
+	key := "/RF/" + identity + "/" + collectionName
+	collection, err := impl.RedisService.Client.Get(impl.RedisService.Ctx, key).Result()
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal([]byte(collection), &reply)
+	if err != nil {
+		return
+	}
+
+	return
+}

module/social/relation/internal/logic/follow/do.go

@@ -0,0 +1,33 @@
+package follow
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/vars"
+	pb "bsm/full/module/social/relation/pb"
+	"time"
+)
+
+// 执行关注
+func Do(ctx context.Context, in *pb.IdentRequest) (reply *pb.StatusReply, err error) {
+	// parse authorization meta.
+	_, err = service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	// valildate request id,identity.
+	if in.Id == 0 && in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	// TODO: add your logic code & delete this line.
+
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/follow/doing.go

@@ -0,0 +1,45 @@
+package follow
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/utils"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 执行关注
+func Doing(ctx context.Context, in *pb.IdentRequest) (reply *pb.StatusReply, err error) {
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	data := &models.RelationFollow{
+		FromIdentity: auth.Identity,
+		ToIdentity:   in.Identity,
+	}
+	data.Identity = utils.UUID()
+
+	err = impl.DBService.Create(data).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/follow/fetch.go

@@ -0,0 +1,66 @@
+package follow
+
+import (
+	"context"
+	"strings"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"bsm/full/module/social/relation/internal/impl"
+	common "bsm/full/module/social/relation/internal/logic/common"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 获取关注列表
+func Fetch(ctx context.Context, in *pb.FetchRequest) (reply *pb.FetchRelationItemReply, err error) {
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	var (
+		total  int64
+		column string
+		ids    []uint
+		model  = impl.DBService.Model(&models.RelationFollow{})
+		cards  []*pb.RelationItem
+	)
+
+	switch strings.ToUpper(in.Params["direction"]) {
+	case "MY": // 我关注的
+		column = "to_identity"
+		model.Where("from_identity=?", auth.Identity)
+	case "WHO": // 关注我的
+		column = "from_identity"
+		model.Where("to_identity=?", auth.Identity)
+	default:
+		return &pb.FetchRelationItemReply{}, nil
+	}
+
+	//处理分页
+	if in.PageNo <= 1 {
+		in.PageNo = 1
+	}
+	if in.PageSize <= 1 {
+		in.PageSize = 20
+	}
+
+	err = model.Count(&total).Order("id desc").Offset(int(in.PageNo-1)*int(in.PageSize)).Limit(int(in.PageSize)).Pluck(column, &ids).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	//根据ids取得用户信息卡片
+	cards, err = common.GetrelationInfoDetailCardById(ids)
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	return &pb.FetchRelationItemReply{
+		Total: total,
+		Data:  cards,
+	}, nil
+}

module/social/relation/internal/logic/follow/state.go

@@ -0,0 +1,47 @@
+package follow
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+	"gorm.io/gorm"
+)
+
+// 关注状态
+func State(ctx context.Context, in *pb.IdentRequest) (reply *pb.StatusReply, err error) {
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	var data models.RelationFollow
+	err = impl.DBService.Where("from_identity=? and to_identity=?", auth.Identity, in.Identity).First(&data).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return &pb.StatusReply{
+				Data:    vars.OK,
+				Timeseq: time.Now().UnixMilli(),
+			}, nil
+		} else {
+			printer.Error(err.Error())
+			return nil, errcode.ErrDB
+		}
+	}
+
+	return &pb.StatusReply{
+		Data:    data.Identity,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/follow/undo.go

@@ -0,0 +1,36 @@
+package follow
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 撤销关注
+func Undo(ctx context.Context, in *pb.IdentRequest) (reply *pb.StatusReply, err error) {
+	_, err = service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	err = impl.DBService.Model(&models.RelationFollow{}).Delete("identity=?", in.Identity).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/friend/apply_do.go

@@ -0,0 +1,69 @@
+package friend
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/utils"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 好友申请
+func ApplyDo(ctx context.Context, in *pb.ApplyDoRequest) (reply *pb.StatusReply, err error) {
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.ToIdentity == "" || in.Body == "" || in.ToId == 0 {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	//创建申请
+	apply := models.FriendApply{
+		FromID:        uint(auth.ID),
+		FromIdentity:  auth.Identity,
+		ToID:          uint(in.ToId),
+		ToIdentity:    in.ToIdentity,
+		LastMessageID: 0,
+	}
+	apply.Identity = utils.UUID()
+	err = impl.DBService.Create(&apply).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	//创建留言
+	msg := models.FriendApplyMessage{
+		ApplyID: apply.ID,
+		Body:    in.Body,
+	}
+	msg.PassportID = auth.ID
+	msg.PassportIdentity = auth.Identity
+
+	err = impl.DBService.Create(&msg).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	//回写最后一次交流的消息ID
+	err = impl.DBService.Model(models.FriendApply{}).Where("id=?", apply.ID).UpdateColumn("last_message_id", msg.ID).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	//EventMQ：向mesh MQ中心发送报文，请求推送消息以及更新Cache.
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/friend/apply_do_message.go

@@ -0,0 +1,52 @@
+package friend
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 好友申请Do:留言
+func ApplyDoMessage(ctx context.Context, in *pb.ApplyMessageRequest) (reply *pb.StatusReply, err error) {
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Body == "" || in.ApplyId == 0 {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	msg := models.FriendApplyMessage{
+		ApplyID: uint(in.ApplyId),
+		Body:    in.Body,
+	}
+	msg.PassportID = auth.ID
+	msg.PassportIdentity = auth.Identity
+
+	err = impl.DBService.Create(&msg).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	//回写最后一次交流的消息ID
+	err = impl.DBService.Model(models.FriendApply{}).Where("id=?", msg.ApplyID).UpdateColumn("last_message_id", msg.ID).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	//EventMQ：向mesh MQ中心发送报文，请求推送消息以及更新Cache.
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/friend/apply_do_pass.go

@@ -0,0 +1,53 @@
+package friend
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/utils"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/logic/common"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 好友申请Do:确认
+func ApplyDoPass(ctx context.Context, in *pb.ApplyDoPassRequest) (reply *pb.StatusReply, err error) {
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.FriendRelationIdentity == "" || in.ApplyIdentity == "" || in.FriendRelationId == 0 {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	//写入好友表
+	friend := &models.RelationFriend{FriendrelationID: uint(in.FriendRelationId), FriendrelationIdentity: in.FriendRelationIdentity}
+	friend.Identity = utils.UUID()
+	friend.PassportID = auth.ID
+	friend.PassportIdentity = auth.Identity
+	friend.SessionID = common.UniqueSessionID(auth.Identity, in.FriendRelationIdentity)
+
+	err = impl.DBService.Create(&friend).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	//EventMQ：向mesh MQ中心发送报文，请求推送消息以及更新Cache.
+
+	err = impl.DBService.Model(models.FriendApply{}).Where("to_identity=? and identity=?", auth.Identity, in.ApplyIdentity).UpdateColumn("status", 1).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/friend/apply_do_reject.go

@@ -0,0 +1,38 @@
+package friend
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 好友申请Do:拒绝
+func ApplyDoReject(ctx context.Context, in *pb.IdentRequest) (reply *pb.StatusReply, err error) {
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	err = impl.DBService.Model(models.FriendApply{}).Where("to_identity=? and identity=?", auth.Identity, in.Identity).UpdateColumn("status", -1).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	//EventMQ：向mesh MQ中心发送报文，请求推送消息以及更新Cache.
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/friend/apply_fetch.go

@@ -0,0 +1,52 @@
+package friend
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"bsm/full/module/social/relation/internal/logic/common"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 好友申请列表
+func ApplyFetch(ctx context.Context, in *pb.VersionRequest) (reply *pb.ApplyFetchReply, err error) {
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var cacheErr error
+	if in.Version == 0 {
+		reply, err = common.CollectionFriendApply(auth.ID)
+		if err == nil {
+			cacheErr = common.SetCache(auth.Identity, "apply", reply)
+		}
+
+	}
+
+	cache, err := common.GetCache(auth.Identity, "apply")
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrRedis
+	}
+
+	if in.Version != cache.Version {
+		reply, err = common.CollectionFriendApply(auth.ID)
+		if err == nil {
+			cacheErr = common.SetCache(auth.Identity, "apply", reply)
+		}
+	}
+
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	if cacheErr != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrRedis
+	}
+	return reply, nil
+}

module/social/relation/internal/logic/friend/apply_get.go

@@ -0,0 +1,44 @@
+package friend
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/logic/common"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 好友申请详情
+func ApplyGet(ctx context.Context, in *pb.IdentRequest) (reply *pb.FriendApplyGetReply, err error) {
+	_, err = service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	var apply models.FriendApply
+	err = impl.DBService.Where("identity=?", in.Identity).First(&apply).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	reply.Data, err = common.GetrelationInfoDetailCard(apply.FromIdentity)
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	err = impl.DBService.Where("apply_id=?", apply.ID).Order("id asc").Find(&reply.Message).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+	return
+}

module/social/relation/internal/logic/friend/delete.go

@@ -0,0 +1,38 @@
+package friend
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 删除好友
+func Delete(ctx context.Context, in *pb.IdentRequest) (reply *pb.StatusReply, err error) {
+	// parse authorization meta.
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	err = impl.DBService.Model(models.RelationFriend{}).Delete("relation_id=? and identity=?", auth.ID, in.Identity).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/friend/do_popular.go

@@ -0,0 +1,38 @@
+package friend
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 受你欢迎的,置顶
+func DoPopular(ctx context.Context, in *pb.IdentRequest) (reply *pb.StatusReply, err error) {
+	// parse authorization meta.
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	err = impl.DBService.Model(models.RelationFriend{}).Where("relation_id=? and identity=?", auth.ID, in.Identity).UpdateColumn("popular", 1).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/friend/fetch.go

@@ -0,0 +1,52 @@
+package friend
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"bsm/full/module/social/relation/internal/logic/common"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 获取好友列表
+func Fetch(ctx context.Context, in *pb.VersionRequest) (reply *pb.FriendsReply, err error) {
+	// parse authorization meta.
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	var cacheErr error
+	if in.Version == 0 {
+		reply, err = common.CollectionFriendData(auth.ID)
+		if err == nil {
+			cacheErr = common.SetCache(auth.Identity, "friends", reply)
+		}
+
+	}
+
+	cache, err := common.GetCache(auth.Identity, "friends")
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrRedis
+	}
+
+	if in.Version != cache.Version {
+		reply, err = common.CollectionFriendData(auth.ID)
+		if err == nil {
+			cacheErr = common.SetCache(auth.Identity, "friends", reply)
+		}
+	}
+
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	if cacheErr != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrRedis
+	}
+	return reply, nil
+}

module/social/relation/internal/logic/friend/get.go

@@ -0,0 +1,30 @@
+package friend
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"bsm/full/module/social/relation/internal/logic/common"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 获取用户信息卡片
+func Get(ctx context.Context, in *pb.IdentRequest) (reply *pb.RelationItem, err error) {
+	_, err = service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	reply, err = common.GetrelationInfoDetailCard(in.Identity)
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	return reply, nil
+}

module/social/relation/internal/logic/friend/modify_nickname.go

@@ -0,0 +1,37 @@
+package friend
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 修改好友备注名称,如果要清除备注,直接nickname传空值
+func ModifyNickname(ctx context.Context, in *pb.ModifyNicknameRequest) (reply *pb.StatusReply, err error) {
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Nickname == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	err = impl.DBService.Model(models.RelationFriend{}).Where("relation_id=? and identity=?", auth.ID, in.Identity).UpdateColumn("nickname", in.Nickname).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/friend/search.go

@@ -0,0 +1,22 @@
+package friend
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/service"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 搜索
+func Search(ctx context.Context, in *pb.SearchRequest) (reply *pb.PartFriendReply, err error) {
+	// parse authorization meta.
+	_, err = service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Keyword == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+	return &pb.PartFriendReply{}, nil
+}

module/social/relation/internal/logic/friend/tag_do_create.go

@@ -0,0 +1,62 @@
+package friend
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/utils"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 创建标签
+func TagDoCreate(ctx context.Context, in *pb.TagDoCreateRequest) (reply *pb.StatusReply, err error) {
+	// parse authorization meta.
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if in.TagName == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	data := &models.FriendTag{Name: in.TagName}
+	data.Identity = utils.UUID()
+	data.PassportID = auth.ID
+	data.PassportIdentity = auth.Identity
+
+	err = impl.DBService.Create(data).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	batchs := make([]*models.FriendInTag, 0)
+	for _, identity := range in.FriendIdentity {
+		temp := &models.FriendInTag{
+			FriendIdentity: identity,
+			TagIdentity:    data.Identity,
+		}
+		temp.PassportID = auth.ID
+		temp.PassportIdentity = auth.Identity
+
+		batchs = append(batchs, temp)
+	}
+
+	err = impl.DBService.Create(&batchs).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/friend/tag_do_update.go

@@ -0,0 +1,52 @@
+package friend
+
+import (
+	"context"
+	"strings"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 更新标签成员
+func TagDoUpdate(ctx context.Context, in *pb.TagDoUpdateRequest) (reply *pb.StatusReply, err error) {
+	// parse authorization meta.
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.TagIdentity == "" || in.FriendIdentity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	switch strings.ToUpper(in.Direction) {
+	case "ADD":
+		data := models.FriendInTag{
+			FriendIdentity: in.FriendIdentity,
+			TagIdentity:    in.TagIdentity,
+		}
+		data.PassportID = auth.ID
+		data.PassportIdentity = auth.Identity
+
+		err = impl.DBService.Create(&data).Error
+	case "DEL":
+		err = impl.DBService.Model(models.FriendInTag{}).Delete("friend_identity=? and tag_identity=?", in.FriendIdentity, in.TagIdentity).Error
+	default:
+		return nil, errcode.ErrInvalidArgument
+	}
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/friend/tag_fetch.go

@@ -0,0 +1,28 @@
+package friend
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 获取标签列表
+func TagFetch(ctx context.Context, in *pb.Empty) (reply *pb.FriendTagsReply, err error) {
+	// parse authorization meta.
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	err = impl.DBService.Model(models.FriendTag{}).Where("relation_id=?", auth.ID).Count(&reply.Total).Order("id asc").Scan(&reply.Data).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+	return reply, nil
+}

module/social/relation/internal/logic/friend/tag_member_fetch.go

@@ -0,0 +1,42 @@
+package friend
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/logic/common"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 获取标签成员
+func TagMemberFetch(ctx context.Context, in *pb.IdentRequest) (reply *pb.PartFriendReply, err error) {
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	var ids []uint
+	err = impl.DBService.Model(models.RelationFriend{}).Where("relation_id=? and group_identity=?", auth.ID, in.Identity).Pluck("relation_id", ids).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	data, err := common.GetrelationInfoDetailCardById(ids)
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+	return &pb.PartFriendReply{
+		Total:   int32(len(data)),
+		Friends: data,
+	}, nil
+}

module/social/relation/internal/logic/friend/undo_popular.go

@@ -0,0 +1,38 @@
+package friend
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 取消受欢迎的，取消置顶
+func UndoPopular(ctx context.Context, in *pb.IdentRequest) (reply *pb.StatusReply, err error) {
+	// parse authorization meta.
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	err = impl.DBService.Model(models.RelationFriend{}).Where("relation_id=? and identity=?", auth.ID, in.Identity).UpdateColumn("popular", 0).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/match/do_ignore.go

@@ -0,0 +1,37 @@
+package match
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 执行忽略
+func DoIgnore(ctx context.Context, in *pb.IdentRequest) (reply *pb.StatusReply, err error) {
+	// parse authorization meta.
+	_, err = service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	err = impl.DBService.Model(new(models.RelationFollow)).Delete("identity=?", in.Identity).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/match/do_join.go

@@ -0,0 +1,45 @@
+package match
+
+import (
+	"context"
+	"time"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"git.apinb.com/bsm-sdk/core/utils"
+	"git.apinb.com/bsm-sdk/core/vars"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 执行通过，加为好友
+func DoJoin(ctx context.Context, in *pb.IdentRequest) (reply *pb.StatusReply, err error) {
+	// parse authorization meta.
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	data := &models.RelationFollow{
+		FromIdentity: auth.Identity,
+		ToIdentity:   in.Identity,
+	}
+	data.Identity = utils.UUID()
+
+	err = impl.DBService.Create(data).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+	return &pb.StatusReply{
+		Data:    vars.OK,
+		Timeseq: time.Now().UnixMilli(),
+	}, nil
+
+}

module/social/relation/internal/logic/match/fetch.go

@@ -0,0 +1,52 @@
+package match
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"bsm/full/module/social/relation/internal/impl"
+	"bsm/full/module/social/relation/internal/logic/common"
+	"bsm/full/module/social/relation/internal/models"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 获取匹配列表
+func Fetch(ctx context.Context, in *pb.FetchRequest) (reply *pb.FetchRelationItemReply, err error) {
+	// parse authorization meta.
+	auth, err := service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	// 处理分页
+	if in.PageNo <= 1 {
+		in.PageNo = 1
+	}
+	if in.PageSize <= 1 {
+		in.PageSize = 20
+	}
+
+	var (
+		total int64
+	)
+
+	err = impl.DBService.Model(&models.RelationMatch{}).Where("relation_identity=?", auth.Identity).Count(&total).Error
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	// 取得用户信息卡片
+	data, err := common.GetrelationInfoDetailCardByMatch(auth.Identity, int(in.PageNo-1)*int(in.PageSize), int(in.PageSize))
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+
+	reply = &pb.FetchRelationItemReply{
+		Total: total,
+		Data:  data,
+	}
+	return reply, nil
+}

module/social/relation/internal/logic/match/get.go

@@ -0,0 +1,30 @@
+package match
+
+import (
+	"context"
+
+	"git.apinb.com/bsm-sdk/core/errcode"
+	"git.apinb.com/bsm-sdk/core/printer"
+	"git.apinb.com/bsm-sdk/core/service"
+	"bsm/full/module/social/relation/internal/logic/common"
+	pb "bsm/full/module/social/relation/pb"
+)
+
+// 获取匹配详情
+func Get(ctx context.Context, in *pb.IdentRequest) (reply *pb.RelationItem, err error) {
+	// parse authorization meta.
+	_, err = service.ParseMetaCtx(ctx, nil)
+	if err != nil {
+		return nil, err
+	}
+	if in.Identity == "" {
+		return nil, errcode.ErrInvalidArgument
+	}
+
+	reply, err = common.GetrelationInfoDetailCard(in.Identity)
+	if err != nil {
+		printer.Error(err.Error())
+		return nil, errcode.ErrDB
+	}
+	return reply, nil
+}