去掉发消息时的from

Author: c-wind

client/client/client.go

@@ -218,20 +218,11 @@ func addFriend(c *candy.CandyClient, reader *bufio.Reader) {
 
 func newMessage(c *candy.CandyClient, reader *bufio.Reader) {
 	fmt.Println("================发送消息==================")
-	fmt.Println("请输入发送用户ID:")
-	data, _, _ := reader.ReadLine()
-	userID := string(data)
-
-	from, err := strconv.ParseInt(userID, 10, 64)
-	if err != nil {
-		e := candy.ErrorParse(err.Error())
-		log.Errorf("Parse int code:%v error:%v", e.Code, e.Msg)
-		return
-	}
+	id := int64(0)
 
 	fmt.Println("请输入接收用户ID:")
-	data, _, _ = reader.ReadLine()
-	userID = string(data)
+	data, _, _ := reader.ReadLine()
+	userID := string(data)
 
 	user, err := strconv.ParseInt(userID, 10, 64)
 	if err != nil {
@@ -244,14 +235,14 @@ func newMessage(c *candy.CandyClient, reader *bufio.Reader) {
 	data, _, _ = reader.ReadLine()
 	msg := string(data)
 
-	err = c.SendMessage(from, 0, user, msg)
+	id, err = c.SendMessage(0, user, msg)
 	if err != nil {
 		e := candy.ErrorParse(err.Error())
 		log.Errorf("send message code:%v error:%v", e.Code, e.Msg)
 		return
 	}
 
-	log.Debugf("send msg success, userID:%v", userID)
+	log.Debugf("send msg[%d] success, userID:%v", id, userID)
 	fmt.Println("==============================================")
 }
 

gate/store.go

@@ -193,15 +193,15 @@ func (s *store) downloadFile(userID int64, names []string) (map[string][]byte, e
 }
 
 func (s *store) newMessage(msg *meta.Message) error {
-	log.Debugf("store newMessage")
+	log.Debugf("store newMessage[%d]:%+v", msg.ID, msg)
 
 	req := &meta.StoreNewMessageRequest{Msg: msg}
 	resp, err := s.api.NewMessage(s.ctx, req)
 	if err != nil {
 		return errors.Trace(err)
 	}
 
-	log.Debugf("send message success, resp:%v", resp)
+	log.Debugf("send message[%d] success, resp:%v", msg.ID, resp)
 	return errors.Trace(resp.Header.Error())
 }