diff --git a/server/imserver_new/friend/friendmgr.go b/server/imserver_new/friend/friendmgr.go index abc398b6..95b16ccf 100644 --- a/server/imserver_new/friend/friendmgr.go +++ b/server/imserver_new/friend/friendmgr.go @@ -5,6 +5,7 @@ import ( "f5" "fmt" "main/constant" + "main/model" ) type friendMgr struct { @@ -208,26 +209,7 @@ func (this *friendMgr) AsyncApplyFriend(senderId string, targetId string, cb fun cb(0, "") return } - nowTime := f5.GetApp().GetNowSeconds() - f5.GetJsStyleDb().Upsert( - constant.FRIEND_DB, - "t_friend_apply", - [][]string{ - {"sender_id", senderId}, - {"target_id", targetId}, - }, - [][]string{ - {"status", q5.ToString(constant.FRIEND_APPLY_STATUS_NONE)}, - {"last_apply_time", q5.ToString(nowTime)}, - }, - [][]string{ - {"sender_id", senderId}, - {"target_id", targetId}, - {"status", q5.ToString(constant.FRIEND_APPLY_STATUS_NONE)}, - {"last_apply_time", q5.ToString(nowTime)}, - {"createtime", q5.ToString(nowTime)}, - {"modifytime", q5.ToString(nowTime)}, - }, + model.FriendApply.Force(senderId, targetId, func (err error, lastInsertId int64, rowsAffected int64) { if err != nil { cb(1, "") diff --git a/server/imserver_new/model/friend.go b/server/imserver_new/model/friend.go new file mode 100644 index 00000000..438ed498 --- /dev/null +++ b/server/imserver_new/model/friend.go @@ -0,0 +1,14 @@ +package model + +/* +import ( + "q5" + "f5" + "main/constant" + )*/ + +type friend struct { + +} + +var Friend = new (friend) diff --git a/server/imserver_new/model/friend_apply.go b/server/imserver_new/model/friend_apply.go new file mode 100644 index 00000000..81a4a760 --- /dev/null +++ b/server/imserver_new/model/friend_apply.go @@ -0,0 +1,38 @@ +package model + +import ( + "q5" + "f5" + "main/constant" +) + +type friendApply struct { + +} + +var FriendApply = new (friendApply) + +func (this *friendApply) Force(senderId string, targetId string, + cb func (error, int64, int64)) { + nowTime := f5.GetApp().GetNowSeconds() + f5.GetJsStyleDb().Upsert( + constant.FRIEND_DB, + "t_friend_apply", + [][]string{ + {"sender_id", senderId}, + {"target_id", targetId}, + }, + [][]string{ + {"status", q5.ToString(constant.FRIEND_APPLY_STATUS_NONE)}, + {"last_apply_time", q5.ToString(nowTime)}, + }, + [][]string{ + {"sender_id", senderId}, + {"target_id", targetId}, + {"status", q5.ToString(constant.FRIEND_APPLY_STATUS_NONE)}, + {"last_apply_time", q5.ToString(nowTime)}, + {"createtime", q5.ToString(nowTime)}, + {"modifytime", q5.ToString(nowTime)}, + }, + cb) +}