diff --git a/server/adminserver/app/app.go b/server/adminserver/app/app.go index 950f49cf..5db02d3b 100644 --- a/server/adminserver/app/app.go +++ b/server/adminserver/app/app.go @@ -92,7 +92,7 @@ func (this *app) registerDataSources() { func (this *app) AddSession(accountId string) string { this.sessionLock.Lock() defer this.sessionLock.Unlock() - uuid := f5.GetApp().NewUuid() + uuid := f5.GetApp().NewGlobalUuid() str := fmt.Sprintf("%s%d%s%d", accountId, uuid, randStringBytes(12), time.Now().Unix()) md5New := md5.New() strByte := []byte(str) diff --git a/server/imserver_new/common/types.go b/server/imserver_new/common/types.go index fb9cccd1..c534a99f 100644 --- a/server/imserver_new/common/types.go +++ b/server/imserver_new/common/types.go @@ -89,7 +89,7 @@ type GuildMgr interface { GetRecommendGuilds(string) []Guild GetGuildRank() []Guild AsyncCreateGuild(string, string, int32, string, func(int32, string, string)) - AsyncGetApplyList(int64, string, func(int32, string, int64, []string)) + AsyncGetApplyList(int64, string, func(int32, string, int64, []string, []int32)) AsyncApplyJoin(string, string, func(int32, string)) AsyncAcceptApply(string, string, func(int32, string)) AsyncRejectApply(string, string, func(int32, string))