From df45562de4bea0340542878b72f455f6cdae4123 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Mon, 31 Oct 2022 18:26:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_msgdistrib.json | 6 + cmd/v2/ui/views/sociaty_list.go | 3 - cmd/v2/ui/views/sociaty_mine.go | 145 ++++++++++-- comm/const.go | 2 + modules/sociaty/api.go | 1 + modules/sociaty/api_cross_assign.go | 11 + modules/sociaty/api_cross_discharge.go | 15 ++ modules/sociaty/api_cross_dismiss.go | 9 +- modules/sociaty/api_cross_log.go | 38 ++++ modules/sociaty/api_cross_quit.go | 6 +- modules/sociaty/model_sociaty.go | 120 +--------- modules/sociaty/model_sociatylog.go | 169 ++++++++++++++ modules/sociaty/model_sociatytask.go | 2 +- modules/sociaty/module.go | 2 + pb/sociaty_db.pb.go | 223 ++++++++++++------- pb/sociaty_msg.pb.go | 296 +++++++++++++++++-------- 16 files changed, 742 insertions(+), 306 deletions(-) create mode 100644 modules/sociaty/api_cross_log.go create mode 100644 modules/sociaty/model_sociatylog.go diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json index c146be551..8964c17b0 100644 --- a/bin/json/game_msgdistrib.json +++ b/bin/json/game_msgdistrib.json @@ -304,5 +304,11 @@ "open": true, "routrules": "~/worker", "describe": "公会任务列表" + }, + { + "msgid": "sociaty.log", + "open": true, + "routrules": "~/worker", + "describe": "公会日志列表" } ] \ No newline at end of file diff --git a/cmd/v2/ui/views/sociaty_list.go b/cmd/v2/ui/views/sociaty_list.go index eebf25b45..727f1617b 100644 --- a/cmd/v2/ui/views/sociaty_list.go +++ b/cmd/v2/ui/views/sociaty_list.go @@ -47,9 +47,6 @@ func (this *SociatyListView) CreateView(t *model.TestCase) fyne.CanvasObject { // 申请 applyBtn := widget.NewButton("申请", func() { - defer func() { - common.ShowTip("已申请") - }() selId := this.itemList.SelItemId if selId == "" { common.ShowTip("请选择项目") diff --git a/cmd/v2/ui/views/sociaty_mine.go b/cmd/v2/ui/views/sociaty_mine.go index 2a3dd24f3..c409b4ca6 100644 --- a/cmd/v2/ui/views/sociaty_mine.go +++ b/cmd/v2/ui/views/sociaty_mine.go @@ -25,16 +25,18 @@ import ( type SociatyMineView struct { BaseformView loadSociaty func() - flag bool + flag_mine bool itemList *common.ItemList //申请列表 memberList *common.ItemList //成员列表 - flag2 bool + logList *common.ItemList //日志列表 + flag_apply bool applyListFun func() memberListFun func() sociaty *pb.DBSociaty // 公会 job pb.SociatyJob // 职位 uid string - flag3 bool + flag_memeber bool + flag_log bool } type entryItem struct { @@ -126,19 +128,20 @@ func (this *SociatyMineView) CreateView(t *model.TestCase) fyne.CanvasObject { }, this.w) }) - // 转让 - zhuanrangBtn := widget.NewButton("转让", nil) //申请列表 applyListBtn := widget.NewButton("申请审批", this.showSociatyApplyListWin) // 任务列表 taskListBtn := widget.NewButton("任务列表", this.showTaskListWin) + // 日志 + logBtn := widget.NewButton("日志", this.showLogWin) + defer func() { this.loadSociaty() time.Sleep(time.Millisecond * 30) //必须要延迟，否则职位获取不到 if this.sociaty == nil { - dialog.ShowInformation("提示", "还没有加入任何公会", this.w) + // dialog.ShowInformation("提示", "还没有加入任何公会", this.w) return } if this.job == pb.SociatyJob_ADMIN || @@ -149,13 +152,12 @@ func (this *SociatyMineView) CreateView(t *model.TestCase) fyne.CanvasObject { //会长 if this.job == pb.SociatyJob_PRESIDENT { btns.Add(applyListBtn) - btns.Add(zhuanrangBtn) btns.Add(jiesanBtn) } else { btns.Add(quitBtn) } btns.Add(taskListBtn) - + btns.Add(logBtn) this.sociatyRender(item) this.form.Refresh() }() @@ -208,7 +210,7 @@ func (this *SociatyMineView) sociatyRender(item *entryItem) { } func (this *SociatyMineView) dataListener(item *entryItem) { - if this.flag { + if this.flag_mine { return } this.obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{ @@ -227,6 +229,8 @@ func (this *SociatyMineView) dataListener(item *entryItem) { if rsp.Sociaty == nil { logrus.Debug("公会信息 nil") + // item = &entryItem{} + dialog.ShowInformation("提示", "未加入公会", this.w) return } @@ -251,7 +255,7 @@ func (this *SociatyMineView) dataListener(item *entryItem) { this.form.Refresh() }, }) - this.flag = true + this.flag_mine = true } // 申请列表windows @@ -339,7 +343,7 @@ func (this *SociatyMineView) showSociatyApplyListWin() { } func (this *SociatyMineView) applyListen() { - if this.flag2 { + if this.flag_apply { return } this.obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{ @@ -364,7 +368,7 @@ func (this *SociatyMineView) applyListen() { } }, }) - this.flag2 = true + this.flag_apply = true } // 成员列表windows @@ -395,22 +399,68 @@ func (this *SociatyMineView) showSociatyMemberWin() { //弹劾 tanheBtn := widget.NewButton("弹劾", nil) - // 日志 - logBtn := widget.NewButton("日志", nil) + // 退出 quitBtn := widget.NewButton("退出", nil) + // 转让 + zhuanrangBtn := widget.NewButton("转让", func() { + selId := this.memberList.SelItemId + if selId == "" { + common.ShowTip("请选择项目") + return + } + dialog.ShowConfirm("提示", "确定转让公会?", func(b bool) { + if !b { + return + } + + if err := service.GetPttService().SendToClient( + string(comm.ModuleSociaty), + sociaty.SociatySubTypeAssign, + &pb.SociatyAssignReq{ + TargetId: selId, + }, + ); err != nil { + logrus.Error(err) + return + } + + dialog.ShowInformation("提示", "转让后请重新登录", this.w) + + }, this.w) + }) + // 踢人 + tirenBtn := widget.NewButton("踢人", func() { + selId := this.memberList.SelItemId + if selId == "" { + common.ShowTip("请选择一个成员") + return + } + if err := service.GetPttService().SendToClient( + string(comm.ModuleSociaty), + sociaty.SociatySubTypeDischarge, + &pb.SociatyDischargeReq{ + TargetId: selId, + }); err != nil { + logrus.Error(err) + return + } + // this.memberList.DeleteItem(selId) + }) + btns := container.NewHBox(refreshBtn) // 会长 if this.job == pb.SociatyJob_PRESIDENT { - + btns.Add(tirenBtn) + btns.Add(zhuanrangBtn) } // 副会长或管理员 if this.job == pb.SociatyJob_VICEPRESIDENT || this.job == pb.SociatyJob_ADMIN { + btns.Add(tirenBtn) btns.Add(tanheBtn) - btns.Add(logBtn) btns.Add(quitBtn) } // 成员 @@ -426,7 +476,7 @@ func (this *SociatyMineView) showSociatyMemberWin() { } func (this *SociatyMineView) memberListen() { - if this.flag3 { + if this.flag_memeber { return } this.obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{ @@ -452,7 +502,7 @@ func (this *SociatyMineView) memberListen() { } }, }) - this.flag3 = true + this.flag_memeber = true } // 签到 @@ -516,3 +566,62 @@ func (this *SociatyMineView) taskList() { }, }) } + +// 日志列表 +func (this *SociatyMineView) showLogWin() { + this.logList = common.NewItemList() + this.logList.ItemList = this.logList.CreateList() + + logList := func() { + if err := service.GetPttService().SendToClient( + string(comm.ModuleSociaty), + sociaty.SociatySubTypeLog, + &pb.SociatyLogReq{}); err != nil { + logrus.Error(err) + } + } + refreshBtn := widget.NewButtonWithIcon("", theme.ViewRefreshIcon(), func() { + this.logList.Reset() + logList() + }) + defer logList() + + btns := container.NewHBox(refreshBtn) + c := container.NewBorder(btns, nil, nil, nil, this.logList.ItemList) + dconf := dialog.NewCustom("日志", "关闭", c, this.w) + dconf.Resize(fyne.NewSize(800, 500)) + dconf.Show() + this.logListListen() +} + +func (this *SociatyMineView) logListListen() { + if this.flag_log { + return + } + this.obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{ + OnNotify: func(d interface{}, args ...interface{}) { + data := d.(*pb.UserMessage) + if !(data.MainType == string(comm.ModuleSociaty) && + data.SubType == sociaty.SociatySubTypeLog) { + return + } + rsp := &pb.SociatyLogResp{} + + if !comm.ProtoUnmarshal(data, rsp) { + logrus.Error("unmarshal err") + return + } + + for i, v := range rsp.Log.List { + t := time.Unix(v.Ctime, 10) + ft := t.Format(time.RFC3339) + item := common.Item{ + Id: "", + Text: fmt.Sprintf("%d - %-50s %v", i+1, v.Content, ft), + } + this.logList.AddItem(item) + } + }, + }) + this.flag_log = true +} diff --git a/comm/const.go b/comm/const.go index b60b119e9..88aef1875 100644 --- a/comm/const.go +++ b/comm/const.go @@ -174,6 +174,8 @@ const ( TableSociaty = "sociaty" // 公会任务 TableSociatyTask = "sociatytask" + // 公会日志 + TableSociatyLog = "sociatylog" ) //RPC服务接口定义处 diff --git a/modules/sociaty/api.go b/modules/sociaty/api.go index b5fa2e753..a976181e5 100644 --- a/modules/sociaty/api.go +++ b/modules/sociaty/api.go @@ -29,6 +29,7 @@ const ( SociatySubTypeActivityReceive = "activityreceive" SociatySubTypeRank = "rank" SociatySubTypeTasklist = "tasklist" + SociatySubTypeLog = "log" ) type apiComp struct { diff --git a/modules/sociaty/api_cross_assign.go b/modules/sociaty/api_cross_assign.go index 4233af14d..1295b13b4 100644 --- a/modules/sociaty/api_cross_assign.go +++ b/modules/sociaty/api_cross_assign.go @@ -21,6 +21,12 @@ func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) } uid := session.GetUserId() + if uid == req.TargetId { + code = pb.ErrorCode_ReqParameterError + this.module.Errorf("不能转让给自己 uid:%s", uid) + return + } + sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty.Id == "" { code = pb.ErrorCode_SociatyNoFound @@ -39,6 +45,11 @@ func (this *apiComp) Assign(session comm.IUserSession, req *pb.SociatyAssignReq) return } + if err := this.module.modelSociatyLog.addLog(Log_Job, sociaty.Id, + uid, req.TargetId, pb.SociatyJob_PRESIDENT.String()); err != nil { + this.module.Errorf("转让日志 err:%v", err) + } + rsp := &pb.SociatyAssignResp{ TargetId: req.TargetId, SociatyId: sociaty.Id, diff --git a/modules/sociaty/api_cross_discharge.go b/modules/sociaty/api_cross_discharge.go index 4fe1d3341..681f471c7 100644 --- a/modules/sociaty/api_cross_discharge.go +++ b/modules/sociaty/api_cross_discharge.go @@ -35,12 +35,27 @@ func (this *apiComp) Discharge(session comm.IUserSession, req *pb.SociatyDischar return } + // 踢人 if err := this.module.modelSociaty.discharge(req.TargetId, sociaty); err != nil { code = pb.ErrorCode_SociatyDischarge this.module.Errorf("踢出公会失败:%v", err) return } + //清除玩家sociatyId + update := map[string]interface{}{ + "sociatyId": "", //公会ID置空 + } + if err := this.module.ModuleUser.ChangeRemoteUserExpand(req.TargetId, update); err != nil { + code = pb.ErrorCode_DBError + this.module.Errorf("更新玩家公会ID err:%v", err) + return + } + + if err := this.module.modelSociatyLog.addLog(Log_Discharge, sociaty.Id, uid, req.TargetId); err != nil { + this.module.Errorf("踢出公会日志 err:%v", err) + } + rsp := &pb.SociatyDischargeResp{ TargetId: req.TargetId, SociatyId: sociaty.Id, diff --git a/modules/sociaty/api_cross_dismiss.go b/modules/sociaty/api_cross_dismiss.go index e66dbcc6a..74f018232 100644 --- a/modules/sociaty/api_cross_dismiss.go +++ b/modules/sociaty/api_cross_dismiss.go @@ -30,7 +30,9 @@ func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissRe for _, m := range sociaty.Members { //清除成员任务 - this.module.modelSociatyTask.deleTask(sociaty.Id, m.Uid) + if err := this.module.modelSociatyTask.deleTask(sociaty.Id, m.Uid); err != nil { + this.module.Errorf("删除玩家 uid:%s 公会 sociatyId:%s err:%v", m.Uid, sociaty.Id, err) + } //清除玩家sociatyId update := map[string]interface{}{ @@ -41,6 +43,11 @@ func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissRe this.module.Errorf("更新玩家公会ID err:%v", err) return } + + //清除公会日志 + if err := this.module.modelSociatyLog.logDelete(sociaty.Id); err != nil { + this.module.Errorf("删除公会日志 sociatyId:%s err:%v", sociaty.Id, err) + } } // 删除公会 diff --git a/modules/sociaty/api_cross_log.go b/modules/sociaty/api_cross_log.go new file mode 100644 index 000000000..7d8453995 --- /dev/null +++ b/modules/sociaty/api_cross_log.go @@ -0,0 +1,38 @@ +package sociaty + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +// 公会日志 + +func (this *apiComp) LogCheck(session comm.IUserSession, req *pb.SociatyLogReq) (code pb.ErrorCode) { + return +} + +func (this *apiComp) Log(session comm.IUserSession, req *pb.SociatyLogReq) (code pb.ErrorCode, data proto.Message) { + uid := session.GetUserId() + sociaty := this.module.modelSociaty.getUserSociaty(uid) + if sociaty.Id == "" { + code = pb.ErrorCode_SociatyNoFound + this.module.Errorf("uid:%s not in sociaty", uid) + return + } + + sl := this.module.modelSociatyLog.logList(sociaty.Id) + + rsp := &pb.SociatyLogResp{ + Log: &pb.DBSociatyLog{ + SociatyId: sociaty.Id, + List: sl, + }, + } + + if err := session.SendMsg(string(this.module.GetType()), SociatySubTypeLog, rsp); err != nil { + code = pb.ErrorCode_SystemError + } + return +} diff --git a/modules/sociaty/api_cross_quit.go b/modules/sociaty/api_cross_quit.go index bff3458f8..06c9c1c6b 100644 --- a/modules/sociaty/api_cross_quit.go +++ b/modules/sociaty/api_cross_quit.go @@ -30,7 +30,7 @@ func (this *apiComp) Quit(session comm.IUserSession, req *pb.SociatyQuitReq) (co //更新玩家sociatyId update := map[string]interface{}{ - "sociatyId": "", + "sociatyId": "", //玩家公会ID置空 } if err := this.module.ModuleUser.ChangeRemoteUserExpand(uid, update); err != nil { @@ -39,6 +39,10 @@ func (this *apiComp) Quit(session comm.IUserSession, req *pb.SociatyQuitReq) (co return } + if err := this.module.modelSociatyLog.addLog(Log_Quit, sociaty.Id, uid); err != nil { + this.module.Errorf("退出公会日志 err:%v", err) + } + rsp := &pb.SociatyQuitResp{ Uid: uid, SociatyId: sociaty.Id, diff --git a/modules/sociaty/model_sociaty.go b/modules/sociaty/model_sociaty.go index 8f84381f3..d0dbed355 100644 --- a/modules/sociaty/model_sociaty.go +++ b/modules/sociaty/model_sociaty.go @@ -13,7 +13,6 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" "sort" - "strings" "time" "go.mongodb.org/mongo-driver/bson" @@ -24,11 +23,11 @@ import ( type Tag string const ( - Log_Job Tag = `%s玩家已将%s玩家设为了%s` //职位变动 - Log_Quit Tag = "log_quit" //退出 - Log_Add Tag = `%s玩家加入了公会` //加入 - Log_Upgrade Tag = "log_upgrade" //升级 - Log_Discharge Tag = "log_discharge" //踢出 + Log_Job Tag = `%s玩家已经将%s玩家设为了%s` //职位变动 + Log_Quit Tag = "%s玩家已经退出了公会" //退出 + Log_Add Tag = `%s玩家加入了公会` //加入 + Log_Upgrade Tag = "公会已经升为%s级" //升级 + Log_Discharge Tag = "%s玩家已经将%s玩家逐出了公会" //踢出 ) type ModelSociaty struct { @@ -312,7 +311,7 @@ func (this *ModelSociaty) delFromApplyRecord(uid string, sociaty *pb.DBSociaty) //添加成员 func (this *ModelSociaty) addMember(uid string, sociaty *pb.DBSociaty) error { - defer this.addLog(Log_Add, sociaty.Id, uid) + defer this.moduleSociaty.modelSociatyLog.addLog(Log_Add, sociaty.Id, uid) sociaty.Members = append(sociaty.Members, &pb.SociatyMember{ Uid: uid, Job: pb.SociatyJob_MEMBER, @@ -379,110 +378,6 @@ func (this *ModelSociaty) refuse(uid string, sociaty *pb.DBSociaty) error { return this.delFromApplyRecord(uid, sociaty) } -// 记录日志 -// tag 日志模板 sociatyId公会ID params 占位参数 -func (this *ModelSociaty) addLog(tag Tag, sociatyId string, params ...string) error { - var content string - //日志 template - switch tag { - case Log_Add: - content = string(Log_Add) - count := strings.Count(content, "%s") - if count != len(params) { - return fmt.Errorf("参数和模板参数不匹配 期望:%d 实际%d", count, len(params)) - } - for i := 0; i < len(params); i++ { - user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i]) - if err == nil && user.Uid != "" { - content = strings.Replace(content, "%s", user.Name, 1) - } - } - case Log_Quit: - content = string(Log_Quit) - count := strings.Count(content, "%s") - if count != len(params) { - return fmt.Errorf("参数和模板参数不匹配 期望:%d 实际%d", count, len(params)) - } - for i := 0; i < len(params); i++ { - user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i]) - if err == nil && user.Uid != "" { - content = strings.Replace(content, "%s", user.Name, 1) - } - } - case Log_Job: - content = string(Log_Job) - count := strings.Count(content, "%s") - if count != len(params) { - return fmt.Errorf("参数和模板参数不匹配 期望:%d 实际%d", count, len(params)) - } - for i := 0; i < len(params); i++ { - if i == 2 { - var job string - switch params[i] { - case pb.SociatyJob_PRESIDENT.String(): - job = "会长" - case pb.SociatyJob_VICEPRESIDENT.String(): - job = "副会长" - case pb.SociatyJob_ADMIN.String(): - job = "管理员" - case pb.SociatyJob_MEMBER.String(): - job = "成员" - } - content = strings.Replace(content, "%s", job, 1) - } else { - user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i]) - if err == nil && user.Uid != "" { - content = strings.Replace(content, "%s", user.Name, 1) - } - } - } - case Log_Discharge: - content = string(Log_Job) - count := strings.Count(content, "%s") - if count != len(params) { - return fmt.Errorf("参数和模板参数不匹配 期望:%d 实际%d", count, len(params)) - } - for i := 0; i < len(params); i++ { - user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i]) - if err == nil && user.Uid != "" { - content = strings.Replace(content, "%s", params[i], 1) - } - } - case Log_Upgrade: - content = string(Log_Job) - count := strings.Count(content, "%s") - if count != len(params) { - return fmt.Errorf("参数和模板参数不匹配 期望:%d 实际%d", count, len(params)) - } - for i := 0; i < len(params); i++ { - content = strings.Replace(content, "%s", params[i], 1) - } - } - if content != "" { - update := map[string]interface{}{ - "content": content, - "ctime": time.Now().Unix(), - } - return this.updateSociaty(sociatyId, update) - } - return nil -} - -// 查询日志 -func (this *ModelSociaty) logList(sociaty *pb.DBSociaty) (slist []*pb.SociatyLog) { - for _, l := range sociaty.Logs { - slist = append(slist, &pb.SociatyLog{ - Content: l.Content, - Ctime: l.Ctime, - }) - } - - sort.SliceStable(slist, func(i, j int) bool { - return slist[i].Ctime > slist[j].Ctime - }) - return -} - // 转让公会 // targetId 目标玩家ID // srcId 玩家ID 会长 @@ -494,8 +389,7 @@ func (this *ModelSociaty) assign(srcId, targetId string, sociaty *pb.DBSociaty) for _, m := range sociaty.Members { if m.Uid == srcId { m.Uid = targetId - } - if m.Uid == targetId { + } else if m.Uid == targetId { m.Uid = srcId } } diff --git a/modules/sociaty/model_sociatylog.go b/modules/sociaty/model_sociatylog.go new file mode 100644 index 000000000..e762dfaca --- /dev/null +++ b/modules/sociaty/model_sociatylog.go @@ -0,0 +1,169 @@ +package sociaty + +import ( + "fmt" + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + "sort" + "strings" + "time" + + "go.mongodb.org/mongo-driver/mongo" +) + +type ModelSociatyLog struct { + modules.MCompModel + moduleSociaty *Sociaty + service core.IService +} + +func (this *ModelSociatyLog) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.TableName = comm.TableSociatyLog + err = this.MCompModel.Init(service, module, comp, options) + this.moduleSociaty = module.(*Sociaty) + this.service = service + return +} + +// 记录日志 +// tag 日志模板 sociatyId公会ID params 占位参数 +func (this *ModelSociatyLog) addLog(tag Tag, sociatyId string, params ...string) error { + var content string + //日志 template + switch tag { + case Log_Add: + content = string(Log_Add) + count := strings.Count(content, "%s") + if count != len(params) { + return fmt.Errorf("参数和模板参数不匹配 期望:%d 实际%d", count, len(params)) + } + for i := 0; i < len(params); i++ { + user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i]) + if err == nil && user.Uid != "" { + content = strings.Replace(content, "%s", user.Name, 1) + } + } + case Log_Quit: + content = string(Log_Quit) + count := strings.Count(content, "%s") + if count != len(params) { + return fmt.Errorf("参数和模板参数不匹配 期望:%d 实际%d", count, len(params)) + } + for i := 0; i < len(params); i++ { + user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i]) + if err == nil && user.Uid != "" { + content = strings.Replace(content, "%s", user.Name, 1) + } + } + case Log_Job: + content = string(Log_Job) + count := strings.Count(content, "%s") + if count != len(params) { + return fmt.Errorf("参数和模板参数不匹配 期望:%d 实际%d", count, len(params)) + } + for i := 0; i < len(params); i++ { + if i == 2 { + var job string + switch params[i] { + case pb.SociatyJob_PRESIDENT.String(): + job = "会长" + case pb.SociatyJob_VICEPRESIDENT.String(): + job = "副会长" + case pb.SociatyJob_ADMIN.String(): + job = "管理员" + case pb.SociatyJob_MEMBER.String(): + job = "成员" + } + content = strings.Replace(content, "%s", job, 1) + } else { + user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i]) + if err == nil && user.Uid != "" { + content = strings.Replace(content, "%s", user.Name, 1) + } + } + } + case Log_Discharge: + content = string(Log_Job) + count := strings.Count(content, "%s") + if count != len(params) { + return fmt.Errorf("参数和模板参数不匹配 期望:%d 实际%d", count, len(params)) + } + for i := 0; i < len(params); i++ { + user, err := this.moduleSociaty.ModuleUser.GetRemoteUser(params[i]) + if err == nil && user.Uid != "" { + content = strings.Replace(content, "%s", params[i], 1) + } + } + case Log_Upgrade: + content = string(Log_Job) + count := strings.Count(content, "%s") + if count != len(params) { + return fmt.Errorf("参数和模板参数不匹配 期望:%d 实际%d", count, len(params)) + } + for i := 0; i < len(params); i++ { + content = strings.Replace(content, "%s", params[i], 1) + } + } + + if content != "" { + log := &pb.DBSociatyLog{} + if err := this.Get(sociatyId, log); err != nil { + if err == mongo.ErrNoDocuments { + var list []*pb.SociatyLog + list = append(list, &pb.SociatyLog{ + Content: content, + Ctime: time.Now().Unix(), + }) + err = this.Add(sociatyId, &pb.DBSociatyLog{ + SociatyId: sociatyId, + List: list, + }) + if err != nil { + return err + } + return nil + } + return err + } + //update + if log.List == nil { + log.List = []*pb.SociatyLog{} + } + log.List = append(log.List, &pb.SociatyLog{ + Content: content, + Ctime: time.Now().Unix(), + }) + update := map[string]interface{}{ + "sociatyId": sociatyId, + "list": log.List, + } + return this.Change(sociatyId, update) + } + return nil +} + +// 查询日志 +func (this *ModelSociatyLog) logList(sociatyId string) (slist []*pb.SociatyLog) { + log := &pb.DBSociatyLog{} + if err := this.Get(sociatyId, log); err != nil { + return nil + } + + for _, l := range log.List { + slist = append(slist, &pb.SociatyLog{ + Content: l.Content, + Ctime: l.Ctime, + }) + } + sort.SliceStable(slist, func(i, j int) bool { + return slist[i].Ctime > slist[j].Ctime + }) + return +} + +// 删除日志 +func (this *ModelSociatyLog) logDelete(sociatyId string) error { + return this.Del(sociatyId) +} diff --git a/modules/sociaty/model_sociatytask.go b/modules/sociaty/model_sociatytask.go index 6d3e6219c..fd9f41be3 100644 --- a/modules/sociaty/model_sociatytask.go +++ b/modules/sociaty/model_sociatytask.go @@ -16,7 +16,7 @@ type ModelSociatyTask struct { } func (this *ModelSociatyTask) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { - this.TableName = comm.TableSociaty + this.TableName = comm.TableSociatyTask err = this.MCompModel.Init(service, module, comp, options) this.moduleSociaty = module.(*Sociaty) this.service = service diff --git a/modules/sociaty/module.go b/modules/sociaty/module.go index f6e1f9d43..08e5158ce 100644 --- a/modules/sociaty/module.go +++ b/modules/sociaty/module.go @@ -17,6 +17,7 @@ type Sociaty struct { service base.IRPCXService modelSociaty *ModelSociaty modelSociatyTask *ModelSociatyTask + modelSociatyLog *ModelSociatyLog configure *configureComp } @@ -38,6 +39,7 @@ func (this *Sociaty) OnInstallComp() { this.api = this.RegisterComp(new(apiComp)).(*apiComp) this.modelSociaty = this.RegisterComp(new(ModelSociaty)).(*ModelSociaty) this.modelSociatyTask = this.RegisterComp(new(ModelSociatyTask)).(*ModelSociatyTask) + this.modelSociatyLog = this.RegisterComp(new(ModelSociatyLog)).(*ModelSociatyLog) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } diff --git a/pb/sociaty_db.pb.go b/pb/sociaty_db.pb.go index 090da4d73..cfda5257e 100644 --- a/pb/sociaty_db.pb.go +++ b/pb/sociaty_db.pb.go @@ -94,10 +94,9 @@ type DBSociaty struct { ApplyRecord []*ApplyRecord `protobuf:"bytes,11,rep,name=applyRecord,proto3" json:"applyRecord" bson:"applyRecord"` //收到的玩家入会申请 Members []*SociatyMember `protobuf:"bytes,12,rep,name=members,proto3" json:"members"` //@go_tags(`bson:"members"`） 公会成员 Activity int32 `protobuf:"varint,13,opt,name=activity,proto3" json:"activity" bson:"activity"` //活跃度 - Logs []*SociatyLog `protobuf:"bytes,14,rep,name=logs,proto3" json:"logs" bson:"logs"` //日志 - AccuseTime int64 `protobuf:"varint,15,opt,name=accuseTime,proto3" json:"accuseTime" bson:"accuseTime"` //会长弹劾时间 - LastSignCount int32 `protobuf:"varint,16,opt,name=lastSignCount,proto3" json:"lastSignCount" bson:"lastSignCount"` //昨日签到的人数 - SignIds []string `protobuf:"bytes,17,rep,name=signIds,proto3" json:"signIds" bson:"signIds"` // 今日签到的玩家IDs + AccuseTime int64 `protobuf:"varint,14,opt,name=accuseTime,proto3" json:"accuseTime" bson:"accuseTime"` //会长弹劾时间 + LastSignCount int32 `protobuf:"varint,15,opt,name=lastSignCount,proto3" json:"lastSignCount" bson:"lastSignCount"` //昨日签到的人数 + SignIds []string `protobuf:"bytes,16,rep,name=signIds,proto3" json:"signIds" bson:"signIds"` // 今日签到的玩家IDs } func (x *DBSociaty) Reset() { @@ -223,13 +222,6 @@ func (x *DBSociaty) GetActivity() int32 { return 0 } -func (x *DBSociaty) GetLogs() []*SociatyLog { - if x != nil { - return x.Logs - } - return nil -} - func (x *DBSociaty) GetAccuseTime() int64 { if x != nil { return x.AccuseTime @@ -435,6 +427,61 @@ func (x *SociatyLog) GetCtime() int64 { return 0 } +type DBSociatyLog struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + SociatyId string `protobuf:"bytes,1,opt,name=sociatyId,proto3" json:"sociatyId"` //@go_tags(`bson:"sociatyId") 公会ID + List []*SociatyLog `protobuf:"bytes,2,rep,name=list,proto3" json:"list" bson:"list"` //日志 +} + +func (x *DBSociatyLog) Reset() { + *x = DBSociatyLog{} + if protoimpl.UnsafeEnabled { + mi := &file_sociaty_sociaty_db_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBSociatyLog) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBSociatyLog) ProtoMessage() {} + +func (x *DBSociatyLog) ProtoReflect() protoreflect.Message { + mi := &file_sociaty_sociaty_db_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DBSociatyLog.ProtoReflect.Descriptor instead. +func (*DBSociatyLog) Descriptor() ([]byte, []int) { + return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{4} +} + +func (x *DBSociatyLog) GetSociatyId() string { + if x != nil { + return x.SociatyId + } + return "" +} + +func (x *DBSociatyLog) GetList() []*SociatyLog { + if x != nil { + return x.List + } + return nil +} + // 公会成员任务 type DBSociatyTask struct { state protoimpl.MessageState @@ -449,7 +496,7 @@ type DBSociatyTask struct { func (x *DBSociatyTask) Reset() { *x = DBSociatyTask{} if protoimpl.UnsafeEnabled { - mi := &file_sociaty_sociaty_db_proto_msgTypes[4] + mi := &file_sociaty_sociaty_db_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -462,7 +509,7 @@ func (x *DBSociatyTask) String() string { func (*DBSociatyTask) ProtoMessage() {} func (x *DBSociatyTask) ProtoReflect() protoreflect.Message { - mi := &file_sociaty_sociaty_db_proto_msgTypes[4] + mi := &file_sociaty_sociaty_db_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -475,7 +522,7 @@ func (x *DBSociatyTask) ProtoReflect() protoreflect.Message { // Deprecated: Use DBSociatyTask.ProtoReflect.Descriptor instead. func (*DBSociatyTask) Descriptor() ([]byte, []int) { - return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{4} + return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{5} } func (x *DBSociatyTask) GetSociatyId() string { @@ -511,7 +558,7 @@ type SociatyTask struct { func (x *SociatyTask) Reset() { *x = SociatyTask{} if protoimpl.UnsafeEnabled { - mi := &file_sociaty_sociaty_db_proto_msgTypes[5] + mi := &file_sociaty_sociaty_db_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -524,7 +571,7 @@ func (x *SociatyTask) String() string { func (*SociatyTask) ProtoMessage() {} func (x *SociatyTask) ProtoReflect() protoreflect.Message { - mi := &file_sociaty_sociaty_db_proto_msgTypes[5] + mi := &file_sociaty_sociaty_db_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -537,7 +584,7 @@ func (x *SociatyTask) ProtoReflect() protoreflect.Message { // Deprecated: Use SociatyTask.ProtoReflect.Descriptor instead. func (*SociatyTask) Descriptor() ([]byte, []int) { - return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{5} + return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{6} } func (x *SociatyTask) GetTaskId() int32 { @@ -570,7 +617,7 @@ type DBSociatyRank struct { func (x *DBSociatyRank) Reset() { *x = DBSociatyRank{} if protoimpl.UnsafeEnabled { - mi := &file_sociaty_sociaty_db_proto_msgTypes[6] + mi := &file_sociaty_sociaty_db_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -583,7 +630,7 @@ func (x *DBSociatyRank) String() string { func (*DBSociatyRank) ProtoMessage() {} func (x *DBSociatyRank) ProtoReflect() protoreflect.Message { - mi := &file_sociaty_sociaty_db_proto_msgTypes[6] + mi := &file_sociaty_sociaty_db_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -596,7 +643,7 @@ func (x *DBSociatyRank) ProtoReflect() protoreflect.Message { // Deprecated: Use DBSociatyRank.ProtoReflect.Descriptor instead. func (*DBSociatyRank) Descriptor() ([]byte, []int) { - return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{6} + return file_sociaty_sociaty_db_proto_rawDescGZIP(), []int{7} } func (x *DBSociatyRank) GetSociatyId() string { @@ -638,7 +685,7 @@ var File_sociaty_sociaty_db_proto protoreflect.FileDescriptor var file_sociaty_sociaty_db_proto_rawDesc = []byte{ 0x0a, 0x18, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x2f, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe2, 0x03, 0x0a, 0x09, 0x44, + 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc1, 0x03, 0x0a, 0x09, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, @@ -660,55 +707,58 @@ var file_sociaty_sociaty_db_proto_rawDesc = []byte{ 0x65, 0x72, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x0d, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x1f, - 0x0a, 0x04, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x6f, 0x67, 0x73, 0x12, - 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x75, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0f, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x75, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, - 0x24, 0x0a, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x69, 0x67, 0x6e, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x69, 0x67, 0x6e, 0x49, 0x64, 0x73, - 0x18, 0x11, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x73, 0x69, 0x67, 0x6e, 0x49, 0x64, 0x73, 0x22, - 0x35, 0x0a, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, - 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, - 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x7a, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x03, 0x6a, 0x6f, 0x62, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x4a, 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, - 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x22, - 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3c, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, - 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, - 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, - 0x22, 0x61, 0x0a, 0x0d, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, - 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, - 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, - 0x64, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0c, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, - 0x69, 0x73, 0x74, 0x22, 0x3d, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, - 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, - 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, - 0x75, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x52, 0x61, 0x6e, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, - 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, - 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x2a, 0x50, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x4a, 0x6f, 0x62, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x4f, 0x4a, 0x4f, 0x42, 0x10, - 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a, - 0x05, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x56, 0x49, 0x43, 0x45, - 0x50, 0x52, 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x50, - 0x52, 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x1e, + 0x0a, 0x0a, 0x61, 0x63, 0x63, 0x75, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x75, 0x73, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x24, + 0x0a, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x69, 0x67, 0x6e, 0x49, 0x64, 0x73, 0x18, + 0x10, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x73, 0x69, 0x67, 0x6e, 0x49, 0x64, 0x73, 0x22, 0x35, + 0x0a, 0x0b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x7a, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x03, 0x6a, 0x6f, 0x62, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4a, + 0x6f, 0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x22, 0x0a, + 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3c, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x12, + 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, + 0x4d, 0x0a, 0x0c, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x12, + 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x1f, 0x0a, + 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x61, + 0x0a, 0x0d, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x12, + 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, + 0x74, 0x22, 0x3d, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, + 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, + 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x22, 0x83, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, + 0x6e, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, + 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x02, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, + 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x2a, 0x50, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x4a, 0x6f, 0x62, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x4f, 0x4a, 0x4f, 0x42, 0x10, 0x00, 0x12, + 0x0a, 0x0a, 0x06, 0x4d, 0x45, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x41, + 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x56, 0x49, 0x43, 0x45, 0x50, 0x52, + 0x45, 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x03, 0x12, 0x0d, 0x0a, 0x09, 0x50, 0x52, 0x45, + 0x53, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -724,23 +774,24 @@ func file_sociaty_sociaty_db_proto_rawDescGZIP() []byte { } var file_sociaty_sociaty_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_sociaty_sociaty_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_sociaty_sociaty_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_sociaty_sociaty_db_proto_goTypes = []interface{}{ (SociatyJob)(0), // 0: SociatyJob (*DBSociaty)(nil), // 1: DBSociaty (*ApplyRecord)(nil), // 2: ApplyRecord (*SociatyMember)(nil), // 3: SociatyMember (*SociatyLog)(nil), // 4: SociatyLog - (*DBSociatyTask)(nil), // 5: DBSociatyTask - (*SociatyTask)(nil), // 6: SociatyTask - (*DBSociatyRank)(nil), // 7: DBSociatyRank + (*DBSociatyLog)(nil), // 5: DBSociatyLog + (*DBSociatyTask)(nil), // 6: DBSociatyTask + (*SociatyTask)(nil), // 7: SociatyTask + (*DBSociatyRank)(nil), // 8: DBSociatyRank } var file_sociaty_sociaty_db_proto_depIdxs = []int32{ 2, // 0: DBSociaty.applyRecord:type_name -> ApplyRecord 3, // 1: DBSociaty.members:type_name -> SociatyMember - 4, // 2: DBSociaty.logs:type_name -> SociatyLog - 0, // 3: SociatyMember.job:type_name -> SociatyJob - 6, // 4: DBSociatyTask.list:type_name -> SociatyTask + 0, // 2: SociatyMember.job:type_name -> SociatyJob + 4, // 3: DBSociatyLog.list:type_name -> SociatyLog + 7, // 4: DBSociatyTask.list:type_name -> SociatyTask 5, // [5:5] is the sub-list for method output_type 5, // [5:5] is the sub-list for method input_type 5, // [5:5] is the sub-list for extension type_name @@ -803,7 +854,7 @@ func file_sociaty_sociaty_db_proto_init() { } } file_sociaty_sociaty_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBSociatyTask); i { + switch v := v.(*DBSociatyLog); i { case 0: return &v.state case 1: @@ -815,7 +866,7 @@ func file_sociaty_sociaty_db_proto_init() { } } file_sociaty_sociaty_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SociatyTask); i { + switch v := v.(*DBSociatyTask); i { case 0: return &v.state case 1: @@ -827,6 +878,18 @@ func file_sociaty_sociaty_db_proto_init() { } } file_sociaty_sociaty_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SociatyTask); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_sociaty_sociaty_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBSociatyRank); i { case 0: return &v.state @@ -845,7 +908,7 @@ func file_sociaty_sociaty_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_sociaty_sociaty_db_proto_rawDesc, NumEnums: 1, - NumMessages: 7, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/sociaty_msg.pb.go b/pb/sociaty_msg.pb.go index cf3209145..0f2da5046 100644 --- a/pb/sociaty_msg.pb.go +++ b/pb/sociaty_msg.pb.go @@ -2070,6 +2070,92 @@ func (x *SociatySignResp) GetSociatyId() string { return "" } +//日志列表 +type SociatyLogReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *SociatyLogReq) Reset() { + *x = SociatyLogReq{} + if protoimpl.UnsafeEnabled { + mi := &file_sociaty_sociaty_msg_proto_msgTypes[39] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SociatyLogReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SociatyLogReq) ProtoMessage() {} + +func (x *SociatyLogReq) ProtoReflect() protoreflect.Message { + mi := &file_sociaty_sociaty_msg_proto_msgTypes[39] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SociatyLogReq.ProtoReflect.Descriptor instead. +func (*SociatyLogReq) Descriptor() ([]byte, []int) { + return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{39} +} + +type SociatyLogResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Log *DBSociatyLog `protobuf:"bytes,1,opt,name=log,proto3" json:"log"` +} + +func (x *SociatyLogResp) Reset() { + *x = SociatyLogResp{} + if protoimpl.UnsafeEnabled { + mi := &file_sociaty_sociaty_msg_proto_msgTypes[40] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SociatyLogResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SociatyLogResp) ProtoMessage() {} + +func (x *SociatyLogResp) ProtoReflect() protoreflect.Message { + mi := &file_sociaty_sociaty_msg_proto_msgTypes[40] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SociatyLogResp.ProtoReflect.Descriptor instead. +func (*SociatyLogResp) Descriptor() ([]byte, []int) { + return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{40} +} + +func (x *SociatyLogResp) GetLog() *DBSociatyLog { + if x != nil { + return x.Log + } + return nil +} + // 任务列表 type SociatyTaskListReq struct { state protoimpl.MessageState @@ -2080,7 +2166,7 @@ type SociatyTaskListReq struct { func (x *SociatyTaskListReq) Reset() { *x = SociatyTaskListReq{} if protoimpl.UnsafeEnabled { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[39] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[41] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2093,7 +2179,7 @@ func (x *SociatyTaskListReq) String() string { func (*SociatyTaskListReq) ProtoMessage() {} func (x *SociatyTaskListReq) ProtoReflect() protoreflect.Message { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[39] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[41] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2106,7 +2192,7 @@ func (x *SociatyTaskListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SociatyTaskListReq.ProtoReflect.Descriptor instead. func (*SociatyTaskListReq) Descriptor() ([]byte, []int) { - return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{39} + return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{41} } type SociatyTaskListResp struct { @@ -2120,7 +2206,7 @@ type SociatyTaskListResp struct { func (x *SociatyTaskListResp) Reset() { *x = SociatyTaskListResp{} if protoimpl.UnsafeEnabled { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[40] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[42] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2133,7 +2219,7 @@ func (x *SociatyTaskListResp) String() string { func (*SociatyTaskListResp) ProtoMessage() {} func (x *SociatyTaskListResp) ProtoReflect() protoreflect.Message { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[40] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[42] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2146,7 +2232,7 @@ func (x *SociatyTaskListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SociatyTaskListResp.ProtoReflect.Descriptor instead. func (*SociatyTaskListResp) Descriptor() ([]byte, []int) { - return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{40} + return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{42} } func (x *SociatyTaskListResp) GetList() []*SociatyTask { @@ -2168,7 +2254,7 @@ type SociatyReceiveReq struct { func (x *SociatyReceiveReq) Reset() { *x = SociatyReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[41] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[43] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2181,7 +2267,7 @@ func (x *SociatyReceiveReq) String() string { func (*SociatyReceiveReq) ProtoMessage() {} func (x *SociatyReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[41] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[43] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2194,7 +2280,7 @@ func (x *SociatyReceiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SociatyReceiveReq.ProtoReflect.Descriptor instead. func (*SociatyReceiveReq) Descriptor() ([]byte, []int) { - return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{41} + return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{43} } func (x *SociatyReceiveReq) GetTaskId() int32 { @@ -2216,7 +2302,7 @@ type SociatyReceiveResp struct { func (x *SociatyReceiveResp) Reset() { *x = SociatyReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[42] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[44] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2229,7 +2315,7 @@ func (x *SociatyReceiveResp) String() string { func (*SociatyReceiveResp) ProtoMessage() {} func (x *SociatyReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[42] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[44] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2242,7 +2328,7 @@ func (x *SociatyReceiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SociatyReceiveResp.ProtoReflect.Descriptor instead. func (*SociatyReceiveResp) Descriptor() ([]byte, []int) { - return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{42} + return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{44} } func (x *SociatyReceiveResp) GetTaskId() int32 { @@ -2271,7 +2357,7 @@ type SociatyActivityReceiveReq struct { func (x *SociatyActivityReceiveReq) Reset() { *x = SociatyActivityReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[43] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[45] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2284,7 +2370,7 @@ func (x *SociatyActivityReceiveReq) String() string { func (*SociatyActivityReceiveReq) ProtoMessage() {} func (x *SociatyActivityReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[43] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[45] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2297,7 +2383,7 @@ func (x *SociatyActivityReceiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SociatyActivityReceiveReq.ProtoReflect.Descriptor instead. func (*SociatyActivityReceiveReq) Descriptor() ([]byte, []int) { - return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{43} + return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{45} } func (x *SociatyActivityReceiveReq) GetId() int32 { @@ -2319,7 +2405,7 @@ type SociatyActivityReceiveResp struct { func (x *SociatyActivityReceiveResp) Reset() { *x = SociatyActivityReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[44] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[46] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2332,7 +2418,7 @@ func (x *SociatyActivityReceiveResp) String() string { func (*SociatyActivityReceiveResp) ProtoMessage() {} func (x *SociatyActivityReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[44] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[46] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2345,7 +2431,7 @@ func (x *SociatyActivityReceiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SociatyActivityReceiveResp.ProtoReflect.Descriptor instead. func (*SociatyActivityReceiveResp) Descriptor() ([]byte, []int) { - return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{44} + return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{46} } func (x *SociatyActivityReceiveResp) GetId() int32 { @@ -2372,7 +2458,7 @@ type SociatyRankReq struct { func (x *SociatyRankReq) Reset() { *x = SociatyRankReq{} if protoimpl.UnsafeEnabled { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[45] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[47] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2385,7 +2471,7 @@ func (x *SociatyRankReq) String() string { func (*SociatyRankReq) ProtoMessage() {} func (x *SociatyRankReq) ProtoReflect() protoreflect.Message { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[45] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[47] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2398,7 +2484,7 @@ func (x *SociatyRankReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SociatyRankReq.ProtoReflect.Descriptor instead. func (*SociatyRankReq) Descriptor() ([]byte, []int) { - return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{45} + return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{47} } type SociatyRankResp struct { @@ -2412,7 +2498,7 @@ type SociatyRankResp struct { func (x *SociatyRankResp) Reset() { *x = SociatyRankResp{} if protoimpl.UnsafeEnabled { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[46] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[48] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2425,7 +2511,7 @@ func (x *SociatyRankResp) String() string { func (*SociatyRankResp) ProtoMessage() {} func (x *SociatyRankResp) ProtoReflect() protoreflect.Message { - mi := &file_sociaty_sociaty_msg_proto_msgTypes[46] + mi := &file_sociaty_sociaty_msg_proto_msgTypes[48] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2438,7 +2524,7 @@ func (x *SociatyRankResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SociatyRankResp.ProtoReflect.Descriptor instead. func (*SociatyRankResp) Descriptor() ([]byte, []int) { - return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{46} + return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{48} } func (x *SociatyRankResp) GetRank() []*DBSociatyRank { @@ -2603,37 +2689,41 @@ var file_sociaty_sociaty_msg_proto_rawDesc = []byte{ 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, - 0x71, 0x22, 0x37, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, - 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2b, 0x0a, 0x11, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, - 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x4a, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, - 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, - 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, - 0x22, 0x4a, 0x0a, 0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, - 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, - 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x10, 0x0a, 0x0e, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x35, - 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x22, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0e, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, - 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x2a, 0x42, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, - 0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x4e, 0x44, 0x49, 0x10, 0x01, 0x12, 0x0b, - 0x0a, 0x07, 0x4e, 0x4f, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x41, - 0x50, 0x50, 0x4c, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x0f, 0x0a, 0x0d, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x0e, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, + 0x0a, 0x03, 0x6c, 0x6f, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x22, + 0x14, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, + 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2b, + 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x4a, 0x0a, 0x12, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x19, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x1a, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, + 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, + 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, + 0x22, 0x10, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, + 0x65, 0x71, 0x22, 0x35, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, + 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, + 0x61, 0x6e, 0x6b, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x2a, 0x42, 0x0a, 0x11, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x07, + 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x4e, 0x44, 0x49, + 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x4f, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x10, 0x02, 0x12, + 0x0c, 0x0a, 0x08, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2649,7 +2739,7 @@ func file_sociaty_sociaty_msg_proto_rawDescGZIP() []byte { } var file_sociaty_sociaty_msg_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_sociaty_sociaty_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 47) +var file_sociaty_sociaty_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 49) var file_sociaty_sociaty_msg_proto_goTypes = []interface{}{ (SociatyListFilter)(0), // 0: SociatyListFilter (*SociatyCreateReq)(nil), // 1: SociatyCreateReq @@ -2691,37 +2781,41 @@ var file_sociaty_sociaty_msg_proto_goTypes = []interface{}{ (*SociatyAccuseResp)(nil), // 37: SociatyAccuseResp (*SociatySignReq)(nil), // 38: SociatySignReq (*SociatySignResp)(nil), // 39: SociatySignResp - (*SociatyTaskListReq)(nil), // 40: SociatyTaskListReq - (*SociatyTaskListResp)(nil), // 41: SociatyTaskListResp - (*SociatyReceiveReq)(nil), // 42: SociatyReceiveReq - (*SociatyReceiveResp)(nil), // 43: SociatyReceiveResp - (*SociatyActivityReceiveReq)(nil), // 44: SociatyActivityReceiveReq - (*SociatyActivityReceiveResp)(nil), // 45: SociatyActivityReceiveResp - (*SociatyRankReq)(nil), // 46: SociatyRankReq - (*SociatyRankResp)(nil), // 47: SociatyRankResp - (*DBSociaty)(nil), // 48: DBSociaty - (SociatyJob)(0), // 49: SociatyJob - (*SociatyTask)(nil), // 50: SociatyTask - (*DBSociatyRank)(nil), // 51: DBSociatyRank + (*SociatyLogReq)(nil), // 40: SociatyLogReq + (*SociatyLogResp)(nil), // 41: SociatyLogResp + (*SociatyTaskListReq)(nil), // 42: SociatyTaskListReq + (*SociatyTaskListResp)(nil), // 43: SociatyTaskListResp + (*SociatyReceiveReq)(nil), // 44: SociatyReceiveReq + (*SociatyReceiveResp)(nil), // 45: SociatyReceiveResp + (*SociatyActivityReceiveReq)(nil), // 46: SociatyActivityReceiveReq + (*SociatyActivityReceiveResp)(nil), // 47: SociatyActivityReceiveResp + (*SociatyRankReq)(nil), // 48: SociatyRankReq + (*SociatyRankResp)(nil), // 49: SociatyRankResp + (*DBSociaty)(nil), // 50: DBSociaty + (SociatyJob)(0), // 51: SociatyJob + (*DBSociatyLog)(nil), // 52: DBSociatyLog + (*SociatyTask)(nil), // 53: SociatyTask + (*DBSociatyRank)(nil), // 54: DBSociatyRank } var file_sociaty_sociaty_msg_proto_depIdxs = []int32{ 0, // 0: SociatyListReq.filter:type_name -> SociatyListFilter - 48, // 1: SociatyListResp.list:type_name -> DBSociaty - 48, // 2: SociatySearchResp.list:type_name -> DBSociaty - 48, // 3: SociatyMineResp.sociaty:type_name -> DBSociaty + 50, // 1: SociatyListResp.list:type_name -> DBSociaty + 50, // 2: SociatySearchResp.list:type_name -> DBSociaty + 50, // 3: SociatyMineResp.sociaty:type_name -> DBSociaty 11, // 4: SociatyMineResp.master:type_name -> SociatyMemberInfo - 49, // 5: SociatyMemberInfo.job:type_name -> SociatyJob + 51, // 5: SociatyMemberInfo.job:type_name -> SociatyJob 11, // 6: SociatyApplyListResp.list:type_name -> SociatyMemberInfo 11, // 7: SociatyMembersResp.list:type_name -> SociatyMemberInfo - 49, // 8: SociatySettingJobReq.job:type_name -> SociatyJob - 49, // 9: SociatySettingJobResp.job:type_name -> SociatyJob - 50, // 10: SociatyTaskListResp.list:type_name -> SociatyTask - 51, // 11: SociatyRankResp.rank:type_name -> DBSociatyRank - 12, // [12:12] is the sub-list for method output_type - 12, // [12:12] is the sub-list for method input_type - 12, // [12:12] is the sub-list for extension type_name - 12, // [12:12] is the sub-list for extension extendee - 0, // [0:12] is the sub-list for field type_name + 51, // 8: SociatySettingJobReq.job:type_name -> SociatyJob + 51, // 9: SociatySettingJobResp.job:type_name -> SociatyJob + 52, // 10: SociatyLogResp.log:type_name -> DBSociatyLog + 53, // 11: SociatyTaskListResp.list:type_name -> SociatyTask + 54, // 12: SociatyRankResp.rank:type_name -> DBSociatyRank + 13, // [13:13] is the sub-list for method output_type + 13, // [13:13] is the sub-list for method input_type + 13, // [13:13] is the sub-list for extension type_name + 13, // [13:13] is the sub-list for extension extendee + 0, // [0:13] is the sub-list for field type_name } func init() { file_sociaty_sociaty_msg_proto_init() } @@ -3200,7 +3294,7 @@ func file_sociaty_sociaty_msg_proto_init() { } } file_sociaty_sociaty_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SociatyTaskListReq); i { + switch v := v.(*SociatyLogReq); i { case 0: return &v.state case 1: @@ -3212,7 +3306,7 @@ func file_sociaty_sociaty_msg_proto_init() { } } file_sociaty_sociaty_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SociatyTaskListResp); i { + switch v := v.(*SociatyLogResp); i { case 0: return &v.state case 1: @@ -3224,7 +3318,7 @@ func file_sociaty_sociaty_msg_proto_init() { } } file_sociaty_sociaty_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SociatyReceiveReq); i { + switch v := v.(*SociatyTaskListReq); i { case 0: return &v.state case 1: @@ -3236,7 +3330,7 @@ func file_sociaty_sociaty_msg_proto_init() { } } file_sociaty_sociaty_msg_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SociatyReceiveResp); i { + switch v := v.(*SociatyTaskListResp); i { case 0: return &v.state case 1: @@ -3248,7 +3342,7 @@ func file_sociaty_sociaty_msg_proto_init() { } } file_sociaty_sociaty_msg_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SociatyActivityReceiveReq); i { + switch v := v.(*SociatyReceiveReq); i { case 0: return &v.state case 1: @@ -3260,7 +3354,7 @@ func file_sociaty_sociaty_msg_proto_init() { } } file_sociaty_sociaty_msg_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SociatyActivityReceiveResp); i { + switch v := v.(*SociatyReceiveResp); i { case 0: return &v.state case 1: @@ -3272,7 +3366,7 @@ func file_sociaty_sociaty_msg_proto_init() { } } file_sociaty_sociaty_msg_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SociatyRankReq); i { + switch v := v.(*SociatyActivityReceiveReq); i { case 0: return &v.state case 1: @@ -3284,6 +3378,30 @@ func file_sociaty_sociaty_msg_proto_init() { } } file_sociaty_sociaty_msg_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SociatyActivityReceiveResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_sociaty_sociaty_msg_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SociatyRankReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_sociaty_sociaty_msg_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SociatyRankResp); i { case 0: return &v.state @@ -3302,7 +3420,7 @@ func file_sociaty_sociaty_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_sociaty_sociaty_msg_proto_rawDesc, NumEnums: 1, - NumMessages: 47, + NumMessages: 49, NumExtensions: 0, NumServices: 0, },