From 6943458a0dbf39aefacb44cf64b5bc8b2ebdea7f Mon Sep 17 00:00:00 2001
From: zhaocy <sh_zcy@qq.com>
Date: Thu, 16 Jun 2022 13:38:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/cmd.go           |  5 +++--
 cmd/robot/friend.go  |  2 +-
 cmd/robot/login.go   |  2 +-
 cmd/robot/options.go |  2 +-
 cmd/robot/robot.go   | 14 +++++++-------
 cmd/robot/user.go    |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/cmd/cmd.go b/cmd/cmd.go
index 87dcd8dd9..ef7798ed3 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -31,6 +31,7 @@ func init() {
 }
 
 var account = flag.String("account", "", "account")
+var sid = flag.Int32("sid", 0, "区服ID")
 var create = flag.Bool("create", false, "account") //false 不创建新账号
 
 func main() {
@@ -43,9 +44,9 @@ var runCmd = &cobra.Command{
 
 	Run: func(cmd *cobra.Command, args []string) {
 		opts := robot.DefaultOpts()
-		opts.Create = *create		
+		opts.Create = *create
 		opts.Account = *account
-
+		opts.ServerId = *sid
 		r := robot.NewRobot(opts)
 		r.Run()
 	},
diff --git a/cmd/robot/friend.go b/cmd/robot/friend.go
index e8e6038d9..5d2d6acc3 100644
--- a/cmd/robot/friend.go
+++ b/cmd/robot/friend.go
@@ -113,7 +113,7 @@ func (r *Robot) FriendAgree(friendIds []string) {
 	req := &pb.FriendAgreeReq{
 		FriendIds: friendIds,
 	}
-	head := &pb.UserMessage{MainType: string(comm.SM_FriendModule), SubType: friend.Friend_SubType_Apply}
+	head := &pb.UserMessage{MainType: string(comm.SM_FriendModule), SubType: friend.Friend_SubType_Agree}
 	defer traceFunc(head.MainType, head.SubType, r.user.GetUid(), req)
 	err := r.SendToClient(head, req)
 	if err != nil {
diff --git a/cmd/robot/login.go b/cmd/robot/login.go
index 97d7f79e3..40defba3a 100644
--- a/cmd/robot/login.go
+++ b/cmd/robot/login.go
@@ -13,7 +13,7 @@ import (
 
 type LoginParam struct {
 	Account   string `json:"account"`
-	ServerId  int    `json:"serverId"`
+	ServerId  int32  `json:"serverId"`
 	TimeStamp int64  `json:"timestamp"`
 }
 
diff --git a/cmd/robot/options.go b/cmd/robot/options.go
index 46aeb9aba..47ae39284 100644
--- a/cmd/robot/options.go
+++ b/cmd/robot/options.go
@@ -6,7 +6,7 @@ type Options struct {
 	Account   string //玩家账号
 	Create    bool
 	Secretkey string //秘钥串
-	ServerId  int
+	ServerId  int32  //区服ID
 }
 
 func DefaultOpts() *Options {
diff --git a/cmd/robot/robot.go b/cmd/robot/robot.go
index 3f916765e..e4cbe83d3 100644
--- a/cmd/robot/robot.go
+++ b/cmd/robot/robot.go
@@ -18,7 +18,7 @@ import (
 type Robot struct {
 	ws   *websocket.Conn
 	opts *Options
-	user *pb.Cache_UserData
+	user *pb.DB_UserData
 }
 
 func NewRobot(opts *Options) *Robot {
@@ -39,7 +39,7 @@ func (r *Robot) Run() {
 	log.Printf("websocket %s \n", r.opts.WsUrl)
 
 	if r.opts.Create { //创建新用户
-		r.AccountRegister(r.opts.Account)
+		r.AccountRegister(r.opts.Account, int32(r.opts.ServerId))
 	} else {
 		r.AccountLogin()
 	}
@@ -80,11 +80,11 @@ func (r *Robot) handleMsg(msg *pb.UserMessage) {
 //在这里添加玩家成功登录以后的测试方法
 func (r *Robot) onUserLoaded() {
 	//user
-	// r.CreateUser("乐谷4")
+	// r.CreateUser("乐谷616")
 
 	//friend
-	// r.FriendApply("629f147e3d276120561bfa18")
-	// r.FriendAgree([]string{})
+	// r.FriendApply("0_62aa9427e2979698b080ec78")
+	r.FriendAgree([]string{"0_62a9afd994fe03b7aaee6773"})
 	// r.FriendRefuse([]string{})
 	// r.FriendApplyList()
 	// r.FriendList()
@@ -107,12 +107,12 @@ func (r *Robot) SendToClient(msg *pb.UserMessage, rsp proto.Message) error {
 }
 
 //注册账号
-func (r *Robot) AccountRegister(account string) {
+func (r *Robot) AccountRegister(account string, sid int32) {
 	if account == "" {
 		log.Fatal("account value is empty")
 	}
 	//http
-	regReq := &pb.UserRegisterReq{Account: account}
+	regReq := &pb.UserRegisterReq{Account: account, Sid: sid}
 	jsonByte, _ := json.Marshal(regReq)
 	req, err := http.NewRequest("POST", r.opts.RegUrl, bytes.NewReader(jsonByte))
 	if err != nil {
diff --git a/cmd/robot/user.go b/cmd/robot/user.go
index 78fc46bb5..9f33c3db5 100644
--- a/cmd/robot/user.go
+++ b/cmd/robot/user.go
@@ -30,7 +30,7 @@ func (r *Robot) handleLogin(msg *pb.UserMessage) {
 		r.user = rsp.Data
 		r.onUserLoaded()
 	} else {
-		r.AccountRegister(r.opts.Account) //请求Http接口，模拟创建新账号
+		r.AccountRegister(r.opts.Account, int32(r.opts.ServerId)) //请求Http接口，模拟创建新账号
 	}
 }