From ea732fd78d69773a46d0b45a36d2845b0a907bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B7=E5=8B=87?= <shyinyong@outlook.com>
Date: Thu, 17 Aug 2023 11:52:28 +0800
Subject: [PATCH] Save

---
 database/frienddb.sql         | 4 ++--
 server/imserver/friendsmgr.go | 6 +++---
 server/imserver/go.mod        | 6 +++---
 server/imserver/ss/go.mod     | 6 ++++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/database/frienddb.sql b/database/frienddb.sql
index d1f509cf..8160fda3 100644
--- a/database/frienddb.sql
+++ b/database/frienddb.sql
@@ -23,8 +23,8 @@ UNIQUE KEY `friendship` (`account1_id`,`account2_id`)
 COMMENT "已经成为好友"
 ;
 
-drop table if exists `t_pending_friend_requests`;
-CREATE TABLE t_pending_friend_requests (
+drop table if exists `t_friend_pending_requests`;
+CREATE TABLE t_friend_pending_requests (
 `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id',
 sender_account_id varchar(60) NOT NULL DEFAULT '',
 receiver_account_id varchar(60) NOT NULL DEFAULT '',
diff --git a/server/imserver/friendsmgr.go b/server/imserver/friendsmgr.go
index 9055b8ea..1c4d0705 100644
--- a/server/imserver/friendsmgr.go
+++ b/server/imserver/friendsmgr.go
@@ -269,8 +269,8 @@ func (fm *FriendsMgr) listFriend(accountId string) []*User {
 }
 
 func (fm *FriendsMgr) acceptFriendRequestToDB(account1Id string, account2Id string) error {
-	// step1. UPDATE t_pending_friend_requests
-	_, err := friendDBStore.Exec("UPDATE t_pending_friend_requests SET flag=1 WHERE sender_account_id = ? AND receiver_account_id = ?", account1Id, account2Id)
+	// step1. UPDATE t_friend_pending_requests
+	_, err := friendDBStore.Exec("UPDATE t_friend_pending_requests SET flag=1 WHERE sender_account_id = ? AND receiver_account_id = ?", account1Id, account2Id)
 	if err != nil {
 		return err
 	}
@@ -334,7 +334,7 @@ func (fm *FriendsMgr) loadFriendshipsFromDB(conn *q5.Mysql) {
 }
 
 func (fm *FriendsMgr) loadPendingRequestsFromDB(conn *q5.Mysql) {
-	rows, err := conn.Query("select sender_account_id, receiver_account_id, flag from t_pending_friend_requests;")
+	rows, err := conn.Query("select sender_account_id, receiver_account_id, flag from t_friend_pending_requests;")
 	if err != nil {
 		f5.GetSysLog().Info("mysql error:%s\n", err)
 		return
diff --git a/server/imserver/go.mod b/server/imserver/go.mod
index 980ec275..a5b5f273 100644
--- a/server/imserver/go.mod
+++ b/server/imserver/go.mod
@@ -8,15 +8,15 @@ require f5 v1.0.0
 
 require mt v1.0.0
 
-require mtb v1.0.0
+require mtb v1.0.0 // indirect
 
 require cs v1.0.0
-
 require ss v1.0.0
 
+require github.com/golang/protobuf v1.4.2
+
 require (
 	github.com/go-sql-driver/mysql v1.5.0 // indirect
-	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/gomodule/redigo v1.8.3 // indirect
 	google.golang.org/protobuf v1.23.0 // indirect
 )
diff --git a/server/imserver/ss/go.mod b/server/imserver/ss/go.mod
index a11cf5e1..365d0fae 100644
--- a/server/imserver/ss/go.mod
+++ b/server/imserver/ss/go.mod
@@ -2,7 +2,13 @@ module ss
 
 go 1.20
 
+require q5 v1.0.0
+require f5 v1.0.0
+
 require (
 	github.com/golang/protobuf v1.4.2
 	google.golang.org/protobuf v1.23.0
 )
+
+replace q5 => ../../../third_party/q5
+replace f5 => ../../../third_party/f5
\ No newline at end of file