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] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=87=BD=E6=95=B0subType=20?=
 =?UTF-8?q?=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)
 	}