冲突

sevice/im_chat_room/main.go

@@ -105,4 +105,4 @@ func (cr *ImChatRoomService) All(ctx context.Context,
 	reply.Paginate.TotalCount = results["total_count"].(int64)
 	reply.Paginate.TotalPage = results["total_page"].(int64)
 	return
-}
+}
\ No newline at end of file

sevice/im_configure/main.go

@@ -52,6 +52,7 @@ func (cs *ConfigureSevice) Select(ctx context.Context,
 	in *pb.GetAllRequest) (reply *pb.GetAllReply, err error) {
 
 	reply = &pb.GetAllReply{}
+
 	configs, err := GetConfigureAll()
 	if err != nil {
 		return
@@ -60,7 +61,6 @@ func (cs *ConfigureSevice) Select(ctx context.Context,
 		return
 	}
 	for _, v := range configs {
-
 		reply.GetAll = append(reply.GetAll, &pb.GetAllOneReply{
 			Reply: &pb.Public{
 				CompanyUserId:   v.CompanyUserId,

sevice/im_user/im_user.go

@@ -34,6 +34,7 @@ func (u *ImUserServer) ImUserRegister(ctx context.Context, in *pb.ImUserRequest)
 		Name:   in.GetName(),
 		Mobile: in.GetMobile(),
 		Code:   in.GetCode(),
+		Platfrom: in.GetPlatfrom(),
 	}
 
 	// 参数验证是否合法

sevice/im_user/im_user_db.go

 package im_user
 
 import (
+	"bytes"
 	"crypto/md5"
 	"encoding/hex"
 	"errors"
@@ -8,6 +9,8 @@ import (
 	"im-microservice/db"
 	"im-microservice/helper"
 	"im-microservice/pb"
+	"math/rand"
+	"time"
 
 	"github.com/astaxie/beego/orm"
 	"github.com/segmentio/ksuid"
@@ -17,10 +20,17 @@ const (
 	u_table_name = "im_user"
 )
 
+func CreateCaptcha() string {
+	return fmt.Sprintf("%04v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000))
+}
+
 func createAccid() string {
-	id := ksuid.New()
+	var buffer bytes.Buffer
+	kid := ksuid.New()
+	buffer.WriteString(kid.String())
+	buffer.WriteString(CreateCaptcha())
 	h := md5.New()
-	h.Write([]byte(id.String()))
+	h.Write([]byte(buffer.String()))
 	return hex.EncodeToString(h.Sum(nil))
 }