From e60d7eec581a369a52065ab9ebb349da85cf1405 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 9 Apr 2024 21:16:54 +0800
Subject: [PATCH] 1

---
 server/imserver_new/guild/guildmgr.go | 6 +++---
 third_party/f5                        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go
index 1061cc88..93eb6fe3 100644
--- a/server/imserver_new/guild/guildmgr.go
+++ b/server/imserver_new/guild/guildmgr.go
@@ -171,7 +171,7 @@ func (this *guildMgr) isValidGuildJob(guildJob int32) bool {
 		guildJob == constant.GuildMemberLevelDefault
 }
 
-func (this *guildMgr) asyncCreateGuildTask(task *f5.AsyncTask,
+func (this *guildMgr) asyncCreateGuildTask(task *f5.LockAsyncTask,
 	guildId string,	accountId string, avatar int32, name string,
 	cb func(int32, string, string)) {
 	if this.internalGetGuildByAccountId(accountId) != nil {
@@ -395,7 +395,7 @@ func (this *guildMgr) AsyncApplyJoin(accountId string, guildId string, cb func(i
 		})
 }
 
-func (this *guildMgr) asyncAcceptApplyTask(task *f5.AsyncTask, guild *guild,
+func (this *guildMgr) asyncAcceptApplyTask(task *f5.LockAsyncTask, guild *guild,
 	accountId string, targetId string, cb func(int32, string)) {
 	if !guild.isOwner(accountId) {
 		task.SetFail()
@@ -467,7 +467,7 @@ func (this *guildMgr) AsyncAcceptApply(accountId string, targetId string, cb fun
 		{constant.MEMBER_LOCK_KEY, targetId},
 		{constant.GUILD_ID_LOCK_KEY, guild.guildId},
 		},
-		func (task *f5.AsyncTask) {
+		func (task *f5.LockAsyncTask) {
 			this.asyncAcceptApplyTask(task, guild, accountId, targetId, cb)
 		})
 }
diff --git a/third_party/f5 b/third_party/f5
index d785be5e..c1fe4f0c 160000
--- a/third_party/f5
+++ b/third_party/f5
@@ -1 +1 @@
-Subproject commit d785be5e3718354db6b9f2a7ca710d3cff65be5c
+Subproject commit c1fe4f0cb152185fd022522a67267b317acb51a7