From 1ef8ec4073945f8009ceb4779c677299ed2f4645 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 12 Jul 2022 11:06:07 +0800 Subject: [PATCH 1/7] =?UTF-8?q?uid=20=E5=88=9B=E5=BB=BA=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/model_hero.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index f184a2c72..be52221c1 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -11,6 +11,8 @@ import ( mengine "github.com/dengsgo/math-engine/engine" "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" ) type ModelHero struct { @@ -22,6 +24,10 @@ func (this *ModelHero) Init(service core.IService, module core.IModule, comp cor err = this.MCompModel.Init(service, module, comp, options) this.moduleHero = module.(*Hero) this.TableName = "hero" + // 通过uid创建索引 + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) return } From 640a8c346c814b848f579863130095cfb0369533 Mon Sep 17 00:00:00 2001 From: zhaocy Date: Tue, 12 Jul 2022 18:03:20 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E6=98=B5=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/robot/login.go | 17 +++++++++++++++++ go.mod | 2 +- go.sum | 4 ++-- test/module_test.go | 2 -- 4 files changed, 20 insertions(+), 5 deletions(-) delete mode 100644 test/module_test.go diff --git a/cmd/robot/login.go b/cmd/robot/login.go index 63494f0b2..9d6a98ea5 100644 --- a/cmd/robot/login.go +++ b/cmd/robot/login.go @@ -9,8 +9,10 @@ import ( "log" "time" + "github.com/Pallinder/go-randomdata" jsoniter "github.com/json-iterator/go" "github.com/nacos-group/nacos-sdk-go/util" + "google.golang.org/protobuf/proto" ) type LoginParam struct { @@ -45,6 +47,21 @@ func (r *Robot) AccountLogin() { }, rsp: &pb.UserLoginResp{}, enabled: true, + next: func(rsp proto.Message, handle func(nextCase *TestCase)) { + if _, ok := rsp.(*pb.UserLoginResp); ok { + nick := randomdata.RandStringRunes(5) + handle(&TestCase{ + desc: "创角", + mainType: string(comm.ModuleUser), + subType: user.UserSubTypeCreate, + req: &pb.UserCreateReq{ //设置请求参数 + NickName: "乐谷" + nick, + }, + rsp: &pb.UserCreateResp{}, + enabled: true, + }) + } + }, }, } r.addBuilders(builders) diff --git a/go.mod b/go.mod index 6deb63a2d..dcf8ab70c 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.18 require ( bright v0.0.0 + github.com/Pallinder/go-randomdata v1.2.0 github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 github.com/dengsgo/math-engine v0.0.0-20220213125415-0351c3c75eca github.com/go-playground/validator/v10 v10.10.1 @@ -74,7 +75,6 @@ require ( github.com/hashicorp/serf v0.9.7 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect - github.com/jinzhu/now v1.1.5 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/juju/ratelimit v1.0.1 // indirect github.com/julienschmidt/httprouter v1.3.0 // indirect diff --git a/go.sum b/go.sum index 222a87f5b..96d3f1cd2 100644 --- a/go.sum +++ b/go.sum @@ -49,6 +49,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChimeraCoder/gojson v1.1.0/go.mod h1:nYbTQlu6hv8PETM15J927yM0zGj3njIldp72UT1MqSw= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/Pallinder/go-randomdata v1.2.0 h1:DZ41wBchNRb/0GfsePLiSwb0PHZmT67XY00lCDlaYPg= +github.com/Pallinder/go-randomdata v1.2.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y= github.com/akutz/memconn v0.1.0 h1:NawI0TORU4hcOMsMr11g7vwlCdkYeLKXBcxWu2W/P8A= github.com/akutz/memconn v0.1.0/go.mod h1:Jo8rI7m0NieZyLI5e2CDlRdRqRRB4S7Xp77ukDjH+Fw= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -367,8 +369,6 @@ github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c/go.mod github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uczJe5YQdrYB16oTJlGSC/OyZDqUk9xX4= github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= -github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= -github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= diff --git a/test/module_test.go b/test/module_test.go deleted file mode 100644 index a6bea40cf..000000000 --- a/test/module_test.go +++ /dev/null @@ -1,2 +0,0 @@ -package test - From a7ad82c7768f4c8ce6217c659e2cab1d7403592c Mon Sep 17 00:00:00 2001 From: zhaocy Date: Tue, 12 Jul 2022 18:10:01 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E6=98=B5=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/robot/login.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/robot/login.go b/cmd/robot/login.go index 9d6a98ea5..99f167605 100644 --- a/cmd/robot/login.go +++ b/cmd/robot/login.go @@ -49,13 +49,13 @@ func (r *Robot) AccountLogin() { enabled: true, next: func(rsp proto.Message, handle func(nextCase *TestCase)) { if _, ok := rsp.(*pb.UserLoginResp); ok { - nick := randomdata.RandStringRunes(5) + nick := randomdata.SillyName() handle(&TestCase{ desc: "创角", mainType: string(comm.ModuleUser), subType: user.UserSubTypeCreate, req: &pb.UserCreateReq{ //设置请求参数 - NickName: "乐谷" + nick, + NickName: nick, }, rsp: &pb.UserCreateResp{}, enabled: true, From bce9accc29468ada72a83e9e6f0b17fad953accf Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 13 Jul 2022 09:23:43 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=B8=BB=E7=BA=BF=E5=85=B3=E5=8D=A1?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/robot/robot.go | 3 +++ cmd/robot/story.go | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 cmd/robot/story.go diff --git a/cmd/robot/robot.go b/cmd/robot/robot.go index 211274578..b6c410f2c 100644 --- a/cmd/robot/robot.go +++ b/cmd/robot/robot.go @@ -189,6 +189,9 @@ func (r *Robot) onUserLoaded() { //task r.RunTask() + + // story + r.RunStory() } //注册账号 diff --git a/cmd/robot/story.go b/cmd/robot/story.go new file mode 100644 index 000000000..6ed86e1f2 --- /dev/null +++ b/cmd/robot/story.go @@ -0,0 +1,45 @@ +package robot + +import ( + "fmt" + "go_dreamfactory/comm" + "go_dreamfactory/modules/story" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +var ( + storyBuilders = []*TestCase{ + { + desc: "主线数据", + mainType: string(comm.ModuleStory), + subType: story.StoryGetListResp, + req: &pb.StoryGetListReq{}, + rsp: &pb.StoryGetListResp{}, + print: func(rsp proto.Message) { + out := rsp.(*pb.StoryGetListResp) + for i, v := range out.Data { + fmt.Printf("%d- %v\n", (i + 1), v) + } + }, + enabled: true, + }, { + desc: "主线详情", + mainType: string(comm.ModuleStory), + subType: story.StoryChallengeResp, + req: &pb.StoryChallengeReq{ + ChapterId: 1, + StoryId: 1, + }, + rsp: &pb.StoryChallengeResp{}, + // enabled: true, + }, + } +) + +//声明加入到构建器并发起请求 +func (r *Robot) RunStory() { + r.addBuilders(storyBuilders) + r.batchHandleReq() +} From cfc9a018f0df123f397bad89d78399ead0783139 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 13 Jul 2022 09:35:32 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=89=93=E5=8D=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mail/api_delmail.go | 2 +- modules/mail/api_readmail.go | 2 +- services/comp_gateroute.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mail/api_delmail.go b/modules/mail/api_delmail.go index 3c5efcbc5..40682f2ce 100644 --- a/modules/mail/api_delmail.go +++ b/modules/mail/api_delmail.go @@ -11,7 +11,7 @@ import ( //参数校验 func (this *apiComp) DelMailCheck(session comm.IUserSession, req *pb.MailDelMailReq) (code pb.ErrorCode) { if session.GetUserId() == "" || req.ObjID == "" { - code = pb.ErrorCode_NoLogin + code = pb.ErrorCode_ReqParameterError return } return diff --git a/modules/mail/api_readmail.go b/modules/mail/api_readmail.go index 81d222aca..81c4da955 100644 --- a/modules/mail/api_readmail.go +++ b/modules/mail/api_readmail.go @@ -9,7 +9,7 @@ import ( func (this *apiComp) ReadMailCheck(session comm.IUserSession, req *pb.MailReadMailReq) (code pb.ErrorCode) { if session.GetUserId() == "" || req.ObjID == "" { - code = pb.ErrorCode_NoLogin + code = pb.ErrorCode_ReqParameterError return } return diff --git a/services/comp_gateroute.go b/services/comp_gateroute.go index 0529b7e9e..1cd6df7a9 100644 --- a/services/comp_gateroute.go +++ b/services/comp_gateroute.go @@ -74,7 +74,7 @@ func (this *SCompGateRoute) Start() (err error) { //业务模块注册用户消息处理路由 func (this *SCompGateRoute) RegisterRoute(methodName string, comp reflect.Value, msg reflect.Type, handele reflect.Method) { - log.Debugf("注册用户路由【%s】", methodName) + //log.Debugf("注册用户路由【%s】", methodName) this.mrlock.RLock() _, ok := this.msghandles[methodName] this.mrlock.RUnlock() From e40621b335f77a2e2164a9fe46750516c7427496 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 13 Jul 2022 11:32:06 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/robot/story.go | 6 +++--- lego/core/cbase/servicebase.go | 4 +++- modules/story/api_challenge.go | 30 ++++++++++++++++++++++++------ modules/story/model_story.go | 11 +++++++++++ modules/user/api_res.go | 2 +- 5 files changed, 42 insertions(+), 11 deletions(-) diff --git a/cmd/robot/story.go b/cmd/robot/story.go index 6ed86e1f2..e56c5afa9 100644 --- a/cmd/robot/story.go +++ b/cmd/robot/story.go @@ -23,7 +23,7 @@ var ( fmt.Printf("%d- %v\n", (i + 1), v) } }, - enabled: true, + //enabled: true, }, { desc: "主线详情", mainType: string(comm.ModuleStory), @@ -32,8 +32,8 @@ var ( ChapterId: 1, StoryId: 1, }, - rsp: &pb.StoryChallengeResp{}, - // enabled: true, + rsp: &pb.StoryChallengeResp{}, + enabled: true, }, } ) diff --git a/lego/core/cbase/servicebase.go b/lego/core/cbase/servicebase.go index da2c3b38f..fe7972353 100644 --- a/lego/core/cbase/servicebase.go +++ b/lego/core/cbase/servicebase.go @@ -99,13 +99,15 @@ func (this *ServiceBase) Run(mod ...core.IModule) { mi: v, closeSig: make(chan bool, 1), } + + log.Warnf("注册模块【%s】 对应的配置信息", v.GetType()) } else { this.modules[v.GetType()] = &defaultModule{ seetring: make(map[string]interface{}), mi: v, closeSig: make(chan bool, 1), } - log.Warnf("注册模块【%s】 没有对应的配置信息", v.GetType()) + //log.Warnf("注册模块【%s】 没有对应的配置信息", v.GetType()) } } for _, v := range this.modules { //序列化每一个模块的参数对象 完成模块的初始化 过程 diff --git a/modules/story/api_challenge.go b/modules/story/api_challenge.go index 18ba35b79..eaaf4783e 100644 --- a/modules/story/api_challenge.go +++ b/modules/story/api_challenge.go @@ -5,6 +5,7 @@ import ( "go_dreamfactory/pb" "sort" + "go.mongodb.org/mongo-driver/bson/primitive" "google.golang.org/protobuf/proto" ) @@ -39,20 +40,35 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.StoryChallenge if len(list) > 0 { curChapter = list[0] // 取第一条(第一条肯定是最新的) } - if curChapter == nil { - code = pb.ErrorCode_StoryNotFindChapter // 没有找到主线关卡信息 - return - } + // 先校验是不是分支 chaptConfig := this.module.configure.GetStoryChapter(int32(req.ChapterId)) // 根据配置文件找 if chaptConfig == nil { code = pb.ErrorCode_ConfigNoFound return } + if curChapter == nil { + if len(chaptConfig.Fubendata) <= 0 { + code = pb.ErrorCode_ConfigNoFound + return + } + if int32(req.ChapterId) != 1 { + code = pb.ErrorCode_ReqParameterError + return + } + _data := &pb.DBStory{} + _data.Id = primitive.NewObjectID().Hex() + _data.ChapterId = int32(req.ChapterId) + _map := make(map[string]*pb.DBStory) + _map[_data.Id] = _data + //this.module.modelStory.addNewChapter(session.GetUserId(), _map) + curChapter = _data + //curChapter.StoryId = chaptConfig.Fubendata[0] // 第一次挑战 + } // 根据难度找对应的配置文件 - if chaptConfig.Intensity == "1" { // 这里安临时配置读取 后面会修改 + if chaptConfig.Intensity == "1" { // 这里按临时配置读取 后面会修改 con := this.module.configure.GetStoryEasyChapter(int32(req.StoryId)) // 根据配置文件找 - if con != nil { + if con == nil { code = pb.ErrorCode_ConfigNoFound return } @@ -66,6 +82,8 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.StoryChallenge } } // TODO 调用战斗逻辑 + // 挑战成功 + curChapter.StoryId += 1 // 临时数据 后面配置表完善查找 if bBranch { curChapter.BranchID = append(curChapter.BranchID, int32(req.ChapterId)) // 记录分支关卡 } diff --git a/modules/story/model_story.go b/modules/story/model_story.go index 057297d7b..8a5132fe9 100644 --- a/modules/story/model_story.go +++ b/modules/story/model_story.go @@ -2,6 +2,7 @@ package story import ( "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" "go_dreamfactory/pb" ) @@ -33,3 +34,13 @@ func (this *ModelStory) getStoryList(uid string) (storys []*pb.DBStory, err erro func (this *ModelStory) modifyStoryData(uid string, objid string, data map[string]interface{}) error { return this.moduleStory.modelStory.ChangeList(uid, objid, data) } + +// 增加新的章节数据 +func (this *ModelStory) addNewChapter(uId string, data map[string]interface{}) (err error) { + + if err = this.AddLists(uId, data); err != nil { + log.Errorf("err:%v", err) + return + } + return nil +} diff --git a/modules/user/api_res.go b/modules/user/api_res.go index f11d64639..817abd5c8 100644 --- a/modules/user/api_res.go +++ b/modules/user/api_res.go @@ -9,7 +9,7 @@ import ( ) func (this *apiComp) AddResCheck(session comm.IUserSession, req *pb.UserAddResReq) (code pb.ErrorCode) { - if req.Res.A == "" || req.Res.T == "" || req.Res.N > 0 { + if req.Res.A == "" || req.Res.T == "" || req.Res.N <= 0 { code = pb.ErrorCode_ReqParameterError } return From 8b8595a7de886b1a9bc3666a7f4a4283a3468860 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 13 Jul 2022 14:32:01 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=87=BD=E6=95=B0subType?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/mail/api.go | 8 -------- modules/mail/api_delmail.go | 2 +- modules/mail/api_getAttachment.go | 2 +- modules/mail/api_getmail.go | 2 +- modules/mail/api_readmail.go | 2 +- modules/mail/module.go | 2 +- modules/story/api_challenge.go | 11 ++++++----- 7 files changed, 11 insertions(+), 18 deletions(-) diff --git a/modules/mail/api.go b/modules/mail/api.go index ad063b9a9..0e0aa3aca 100644 --- a/modules/mail/api.go +++ b/modules/mail/api.go @@ -6,14 +6,6 @@ import ( "go_dreamfactory/lego/core" ) -const ( - QueryUserMailResp = "queryusermailresp" - ReadUserMailResp = "readusermailresp" - GetUserMailAttachmentResp = "getusermailattachmentresp" - DelUserMailResp = "delusermailresp" - GetNewEMailResp = "getnewEmailresp" -) - type apiComp struct { modules.MCompGate service core.IService diff --git a/modules/mail/api_delmail.go b/modules/mail/api_delmail.go index 40682f2ce..504c55350 100644 --- a/modules/mail/api_delmail.go +++ b/modules/mail/api_delmail.go @@ -23,7 +23,7 @@ func (this *apiComp) DelMail(session comm.IUserSession, req *pb.MailDelMailReq) var err error mailinfo := make([]*pb.DBMailData, 0) defer func() { - session.SendMsg(string(this.module.GetType()), DelUserMailResp, &pb.MailDelMailResp{Mail: mailinfo}) + session.SendMsg(string(this.module.GetType()), "delmail", &pb.MailDelMailResp{Mail: mailinfo}) }() code = this.DelMailCheck(session, req) // check if code != pb.ErrorCode_Success { diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index 72c733ac7..5773360f7 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -22,7 +22,7 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma mail *pb.DBMailData ) defer func() { - session.SendMsg(string(this.module.GetType()), GetUserMailAttachmentResp, &pb.MailGetUserMailAttachmentResp{Mail: mail}) + session.SendMsg(string(this.module.GetType()), "getusermailattachment", &pb.MailGetUserMailAttachmentResp{Mail: mail}) }() code = this.GetUserMailAttachmentCheck(session, req) // check diff --git a/modules/mail/api_getmail.go b/modules/mail/api_getmail.go index 56af62a0f..cf610060a 100644 --- a/modules/mail/api_getmail.go +++ b/modules/mail/api_getmail.go @@ -18,7 +18,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.MailGetListReq) var err error mailinfo := make([]*pb.DBMailData, 0) defer func() { - session.SendMsg(string(this.module.GetType()), QueryUserMailResp, &pb.MailGetListResp{Mails: mailinfo}) + session.SendMsg(string(this.module.GetType()), "getlist", &pb.MailGetListResp{Mails: mailinfo}) }() code = this.GetListCheck(session, req) // check if code != pb.ErrorCode_Success { diff --git a/modules/mail/api_readmail.go b/modules/mail/api_readmail.go index 81c4da955..0e4c4be7b 100644 --- a/modules/mail/api_readmail.go +++ b/modules/mail/api_readmail.go @@ -22,7 +22,7 @@ func (this *apiComp) ReadMail(session comm.IUserSession, req *pb.MailReadMailReq mail *pb.DBMailData ) defer func() { - session.SendMsg(string(this.module.GetType()), ReadUserMailResp, &pb.MailReadMailResp{Mail: mail}) + session.SendMsg(string(this.module.GetType()), "readmail", &pb.MailReadMailResp{Mail: mail}) }() code = this.ReadMailCheck(session, req) // check if code != pb.ErrorCode_Success { diff --git a/modules/mail/module.go b/modules/mail/module.go index 088a57d01..c652bc61a 100644 --- a/modules/mail/module.go +++ b/modules/mail/module.go @@ -62,6 +62,6 @@ func (this *Mail) CreateNewMail(uId string, mail *pb.DBMailData) bool { return false } - this.SendMsgToUser(string(this.GetType()), GetNewEMailResp, mail, _cache) + this.SendMsgToUser(string(this.GetType()), "newmail", mail, _cache) return true } diff --git a/modules/story/api_challenge.go b/modules/story/api_challenge.go index eaaf4783e..9af8faae7 100644 --- a/modules/story/api_challenge.go +++ b/modules/story/api_challenge.go @@ -59,9 +59,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.StoryChallenge _data := &pb.DBStory{} _data.Id = primitive.NewObjectID().Hex() _data.ChapterId = int32(req.ChapterId) - _map := make(map[string]*pb.DBStory) - _map[_data.Id] = _data - //this.module.modelStory.addNewChapter(session.GetUserId(), _map) + _mData := make(map[string]interface{}, 0) + _mData[_data.Id] = _data + this.module.modelStory.addNewChapter(session.GetUserId(), _mData) curChapter = _data //curChapter.StoryId = chaptConfig.Fubendata[0] // 第一次挑战 } @@ -89,8 +89,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.StoryChallenge } if curChapter.ChapterId == int32(req.ChapterId) && curChapter.StoryId == int32(req.StoryId) { update := map[string]interface{}{ - "storyId": req.StoryId, - "branchID": curChapter.BranchID, + "storyId": req.StoryId, + "ChapterId": req.ChapterId, + "branchID": curChapter.BranchID, } err = this.module.modelStory.modifyStoryData(session.GetUserId(), curChapter.Id, update) }