diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go
index 9bcef665..6eff448f 100644
--- a/server/imserver_new/guild/guildmgr.go
+++ b/server/imserver_new/guild/guildmgr.go
@@ -238,15 +238,14 @@ func (this *guildMgr) asyncCreateGuildTask(task *f5.AsyncTask,
 func (this *guildMgr) AsyncCreateGuild(accountId string, avatar int32, name string,
 	cb func(int32, string, int64)) {
 	guildId := q5.ToString(f5.GetApp().NewNodeUuid())
-	f5.GetApp().AsyncLock([][]string{
+	f5.NewLockAsyncTask([][]string{
 		{constant.MEMBER_LOCK_KEY, accountId},
 		{constant.GUILD_ID_LOCK_KEY, guildId},
 		{constant.GUILD_NAME_LOCK_KEY, name},
 		},
-		f5.NewAsyncTask(
-			func (task *f5.AsyncTask) {
-				this.asyncCreateGuildTask(task, guildId, accountId, avatar, name, cb)
-			}))
+		func (task *f5.LockAsyncTask) {
+			this.asyncCreateGuildTask(task, guildId, accountId, avatar, name, cb)
+		})
 }
 
 func (this *guildMgr) AsyncGetApplyList(lastIdx int64, accountId string,
@@ -370,15 +369,14 @@ func (this *guildMgr) AsyncAcceptApply(accountId string, targetId string, cb fun
 		cb(1, "")
 		return;
 	}
-	f5.GetApp().AsyncLock([][]string{
+	f5.NewLockAsyncTask([][]string{
 		{constant.MEMBER_LOCK_KEY, accountId},
 		{constant.MEMBER_LOCK_KEY, targetId},
 		{constant.GUILD_ID_LOCK_KEY, guild.guildId},
 		},
-		f5.NewAsyncTask(
-			func (task *f5.AsyncTask) {
-				this.asyncAcceptApplyTask(task, guild, accountId, targetId, cb)
-			}))
+		func (task *f5.AsyncTask) {
+			this.asyncAcceptApplyTask(task, guild, accountId, targetId, cb)
+		})
 }
 
 func (this *guildMgr) AsyncRejectApply(accountId string, targetId string,
diff --git a/third_party/f5 b/third_party/f5
index 178d811f..0e32fe03 160000
--- a/third_party/f5
+++ b/third_party/f5
@@ -1 +1 @@
-Subproject commit 178d811f9a45f33616901861e95f82e1d055bc83
+Subproject commit 0e32fe03276c95ac1c1076fd7f2ab2bf093b0ae7
diff --git a/third_party/q5 b/third_party/q5
index 61a612b5..a6abd190 160000
--- a/third_party/q5
+++ b/third_party/q5
@@ -1 +1 @@
-Subproject commit 61a612b59448e05acb8708ec51b8266627c8c739
+Subproject commit a6abd190f996d064ef2266a558f7c806df8ddb2d