上传错误返回信息优化

modules/academy/api_challenge.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -15,7 +13,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.AcademyCh
 }
 
 ///挑战
-func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallengeReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Challenge(session comm.IUserSession, req *pb.AcademyChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		level  *cfg.GameTeachingData
 		record *pb.DBBattleRecord

modules/academy/api_info.go

@@ -3,8 +3,6 @@ package academy
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -14,7 +12,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.AcademyInfoReq
 }
 
 ///获取自己的排行榜信息
-func (this *apiComp) Info(session comm.IUserSession, req *pb.AcademyInfoReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Info(session comm.IUserSession, req *pb.AcademyInfoReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		info *pb.DBAcademy
 		err  error

modules/academy/api_receive.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -15,7 +13,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.AcademyRece
 }
 
 ///奖励领取
-func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Receive(session comm.IUserSession, req *pb.AcademyReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		iswin bool
 		level *cfg.GameTeachingData

modules/academy/api_teaching.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -15,7 +13,7 @@ func (this *apiComp) TeachingCheck(session comm.IUserSession, req *pb.AcademyTea
 }
 
 ///挑战
-func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeachingReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Teaching(session comm.IUserSession, req *pb.AcademyTeachingReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		level  *cfg.GameHeroStrategyData
 		record *pb.DBBattleRecord

modules/academy/api_teachingreceive.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -15,7 +13,7 @@ func (this *apiComp) TeachingReceiveCheck(session comm.IUserSession, req *pb.Aca
 }
 
 ///奖励领取
-func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) TeachingReceive(session comm.IUserSession, req *pb.AcademyTeachingReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		iswin bool
 		level *cfg.GameHeroStrategyData

modules/arena/api_buy.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -18,7 +16,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ArenaBuyReq) (c
 }
 
 ///获取自己的排行榜信息
-func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Buy(session comm.IUserSession, req *pb.ArenaBuyReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		// global    *cfg.GameGlobalData
 		info           *pb.DBArenaUser

modules/arena/api_challenge.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +15,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.ArenaChal
 }
 
 ///挑战
-func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallengeReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Challenge(session comm.IUserSession, req *pb.ArenaChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		red    *pb.DBArenaUser
 		bule   *pb.ArenaPlayer

modules/arena/api_challengereward.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/pb"
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -16,7 +14,7 @@ func (this *apiComp) ChallengeRewardCheck(session comm.IUserSession, req *pb.Are
 }
 
 ///挑战奖励领取
-func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaChallengeRewardReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		reward    *cfg.GameArenaActiveRewardData
 		info      *pb.DBArenaUser

modules/arena/api_delreward.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +15,7 @@ func (this *apiComp) DelRewardCheck(session comm.IUserSession, req *pb.ArenaDelR
 }
 
 ///删除战斗记录
-func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelRewardReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) DelReward(session comm.IUserSession, req *pb.ArenaDelRewardReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		info *pb.DBArenaUser
 		err  error

modules/arena/api_info.go

@@ -7,8 +7,6 @@ import (
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/sys/db"
 	"time"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -18,7 +16,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.ArenaInfoReq)
 }
 
 ///获取自己的排行榜信息
-func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		global *cfg.GameGlobalData
 		info   *pb.DBArenaUser

modules/arena/api_matche.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -16,7 +14,7 @@ func (this *apiComp) MatcheCheck(session comm.IUserSession, req *pb.ArenaMatcheR
 }
 
 ///匹配
-func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Matche(session comm.IUserSession, req *pb.ArenaMatcheReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		info    *pb.DBArenaUser
 		active  *cfg.GameArenaActiveRewardData

modules/arena/api_otherinfo.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/mgo"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +15,7 @@ func (this *apiComp) OtherInfoCheck(session comm.IUserSession, req *pb.ArenaOthe
 }
 
 ///获取自己的排行榜信息
-func (this *apiComp) OtherInfo(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) OtherInfo(session comm.IUserSession, req *pb.ArenaOtherInfoReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		info *pb.DBArenaUser
 		err  error

modules/arena/api_plot.go

@@ -6,8 +6,6 @@ import (
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"time"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +15,7 @@ func (this *apiComp) PlotCheck(session comm.IUserSession, req *pb.ArenaPlotReq)
 }
 
 ///获取自己的排行榜信息
-func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Plot(session comm.IUserSession, req *pb.ArenaPlotReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		npc    *cfg.GameArenaChallengeNpcData
 		info   *pb.DBArenaUser

modules/arena/api_plotreward.go

@@ -6,8 +6,6 @@ import (
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"time"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -19,7 +17,7 @@ func (this *apiComp) PlotRewardCheck(session comm.IUserSession, req *pb.ArenaPlo
 }
 
 ///领取战斗奖励
-func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) PlotReward(session comm.IUserSession, req *pb.ArenaPlotRewardReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		npc   *cfg.GameArenaChallengeNpcData
 		info  *pb.DBArenaUser

modules/arena/api_rank.go

@@ -3,8 +3,6 @@ package arena
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -14,7 +12,7 @@ func (this *apiComp) RankCheck(session comm.IUserSession, req *pb.ArenaRankReq)
 }
 
 ///排行榜获取
-func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		info    *pb.DBArenaUser
 		uids    []string

modules/arena/api_setdattformt.go

@@ -3,8 +3,6 @@ package arena
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -14,7 +12,7 @@ func (this *apiComp) SetAttFormtCheck(session comm.IUserSession, req *pb.ArenaSe
 }
 
 ///设置防守阵型
-func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) SetAttFormt(session comm.IUserSession, req *pb.ArenaSetAttFormtReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		info  *pb.DBArenaUser
 		heros []*pb.DBHero

modules/arena/api_setdefformt.go

@@ -3,8 +3,6 @@ package arena
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -14,7 +12,7 @@ func (this *apiComp) SetDefFormtCheck(session comm.IUserSession, req *pb.ArenaSe
 }
 
 ///设置防守阵型
-func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		info  *pb.DBArenaUser
 		heros []*pb.DBHero

modules/atlas/api_atlasactivate.go

@@ -3,8 +3,6 @@ package atlas
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -16,7 +14,7 @@ func (this *apiComp) ActivateCheck(session comm.IUserSession, req *pb.AtlasActiv
 }
 
 // 激活图鉴信息
-func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Activate(session comm.IUserSession, req *pb.AtlasActivateReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.ActivateCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/atlas/api_atlasaward.go

@@ -1,12 +1,10 @@
 package atlas
 
 import (
-	"fmt"
 	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/utils/codec/json"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -16,7 +14,7 @@ func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.AtlasAwardReq
 }
 
 // 一键领取所有可以领取的奖励
-func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		res     []*cfg.Gameatn
 		respRes []*pb.UserAssets
@@ -38,7 +36,8 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.AtlasAwardReq) (co
 		return
 	}
 	if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success {
-		data = &pb.ErrorData{Pstring: fmt.Sprintf("%v", res)}
+		buff, _ := json.Marshal(res)
+		data = &pb.ErrorData{Title: "图鉴奖励领取失败!", Datastring: string(buff)}
 		return
 	}
 

modules/atlas/api_getatlas.go

@@ -3,8 +3,6 @@ package atlas
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -14,7 +12,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.AtlasGetLis
 }
 
 // 获取铁匠铺图鉴信息
-func (this *apiComp) GetList(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) GetList(session comm.IUserSession, req *pb.AtlasGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 
 	list, err := this.module.modelPandaAtlas.getPandaAtlasList(session.GetUserId())
 	if err != nil {

modules/autoBattle/api_autochallenge.go

@@ -5,7 +5,6 @@ import (
 	"go_dreamfactory/pb"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +16,7 @@ func (this *apiComp) AutoChallengeCheck(session comm.IUserSession, req *pb.AutoB
 	return
 }
 
-func (this *apiComp) AutoChallenge(session comm.IUserSession, req *pb.AutoBattleChallengeReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) AutoChallenge(session comm.IUserSession, req *pb.AutoBattleChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		battleInfo *pb.BattleInfo
 	)

modules/autoBattle/api_autoover.go

@@ -3,8 +3,6 @@ package autoBattle
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -20,7 +18,7 @@ func (this *apiComp) AutoOverCheck(session comm.IUserSession, req *pb.AutoBattle
 	return
 }
 
-func (this *apiComp) AutoOver(session comm.IUserSession, req *pb.AutoBattleOverReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) AutoOver(session comm.IUserSession, req *pb.AutoBattleOverReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		autoBattle *pb.DBAutoBattle
 		atno       []*pb.UserAtno

modules/autoBattle/api_autostop.go

@@ -3,8 +3,6 @@ package autoBattle
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +15,7 @@ func (this *apiComp) AutoStopCheck(session comm.IUserSession, req *pb.AutoBattle
 	return
 }
 
-func (this *apiComp) AutoStop(session comm.IUserSession, req *pb.AutoBattleStopReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) AutoStop(session comm.IUserSession, req *pb.AutoBattleStopReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		autoBattle *pb.DBAutoBattle
 	)

modules/chat/api_chanagechannel.go

@@ -3,8 +3,6 @@ package chat
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -16,7 +14,7 @@ func (this *apiComp) ChanageChannelCheck(session comm.IUserSession, req *pb.Chat
 }
 
 ///改变跨服聊天频道
-func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChanageChannelReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) ChanageChannel(session comm.IUserSession, req *pb.ChatChanageChannelReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err error
 		ok  bool

modules/chat/api_crosschannel.go

@@ -3,8 +3,6 @@ package chat
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -14,7 +12,7 @@ func (this *apiComp) CrossChannelCheck(session comm.IUserSession, req *pb.ChatCr
 }
 
 ///请求跨服聊天频道
-func (this *apiComp) CrossChannel(session comm.IUserSession, req *pb.ChatCrossChannelReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) CrossChannel(session comm.IUserSession, req *pb.ChatCrossChannelReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		channel int32
 		err     error

modules/chat/api_getlist.go

@@ -3,8 +3,6 @@ package chat
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -16,7 +14,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetList
 }
 
 ///获取本服聊天消息记录
-func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err    error
 		result *pb.DBUserExpand

modules/chat/api_send.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -20,7 +19,7 @@ func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.ChatSendReq) (
 }
 
 ///消息发送请求
-func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err        error
 		msg        *pb.DBChat

modules/combat/api_challenge.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -15,7 +13,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.CombatCha
 }
 
 ///挑战
-func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChallengeReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Challenge(session comm.IUserSession, req *pb.CombatChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		manster *cfg.GameCombatMansterData
 		record  *pb.DBBattleRecord

modules/combat/api_challengereceive.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -15,7 +13,7 @@ func (this *apiComp) ChallengeReceiveCheck(session comm.IUserSession, req *pb.Co
 }
 
 ///奖励领取
-func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) ChallengeReceive(session comm.IUserSession, req *pb.CombatChallengeReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		iswin   bool
 		info    *pb.DBCombatUser

modules/combat/api_drop.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -15,7 +13,7 @@ func (this *apiComp) DropCheck(session comm.IUserSession, req *pb.CombatDropReq)
 }
 
 ///奖励领取
-func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Drop(session comm.IUserSession, req *pb.CombatDropReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		info  *pb.DBCombatUser
 		lv    *pb.DBCombatLevel

modules/combat/api_in.go

@@ -3,8 +3,6 @@ package combat
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -14,7 +12,7 @@ func (this *apiComp) InCheck(session comm.IUserSession, req *pb.CombatInReq) (co
 }
 
 ///获取自己的排行榜信息
-func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) In(session comm.IUserSession, req *pb.CombatInReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		info  *pb.DBCombatUser
 		level *pb.DBCombatLevel

modules/combat/api_updatelevel.go

@@ -3,8 +3,6 @@ package combat
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -14,7 +12,7 @@ func (this *apiComp) UpdateLevelCheck(session comm.IUserSession, req *pb.CombatU
 }
 
 ///获取自己的排行榜信息
-func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) UpdateLevel(session comm.IUserSession, req *pb.CombatUpdateLevelReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		info  *pb.DBCombatUser
 		level *pb.DBCombatLevel

modules/comp_gate.go

@@ -25,6 +25,7 @@ import (
 var typeOfSession = reflect.TypeOf((*comm.IUserSession)(nil)).Elem()
 var typeOfMessage = reflect.TypeOf((*proto.Message)(nil)).Elem()
 var typeOfErrorCode = reflect.TypeOf((*pb.ErrorCode)(nil)).Elem()
+var typeOfErrorData = reflect.TypeOf((*pb.ErrorData)(nil))
 var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
 
 /*
@@ -110,7 +111,7 @@ func (this *MCompGate) reflectionRouteHandle(typ reflect.Type, method reflect.Me
 		return
 	}
 	returnDataType := mtype.Out(1)
-	if !returnDataType.Implements(typeOfMessage) {
+	if returnDataType != typeOfErrorData {
 		log.Panicf("反射注册用户处理函数错误 [%s-%s] Api接口格式错误", this.module.GetType(), mname)
 		return
 	}

modules/dispatch/api_autoreceive.go

@@ -4,15 +4,13 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 func (a *apiComp) AutoreceiveCheck(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (code pb.ErrorCode) {
 	return
 }
 
-func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (code pb.ErrorCode, data proto.Message) {
+func (a *apiComp) Autoreceive(session comm.IUserSession, req *pb.DispatchAutoReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	rsp := &pb.DispatchAutoReceiveResp{}
 	d := a.module.modelDispatch.getDBDispatch(session.GetUserId())
 	if d == nil {

modules/dispatch/api_do.go

@@ -6,8 +6,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 派遣
@@ -27,7 +25,7 @@ func (a *apiComp) DoCheck(session comm.IUserSession, req *pb.DispatchDoReq) (cod
 	return
 }
 
-func (a *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (code pb.ErrorCode, data proto.Message) {
+func (a *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = a.DoCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/dispatch/api_notice.go

@@ -6,8 +6,6 @@ import (
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 公告板信息
@@ -16,7 +14,7 @@ func (a *apiComp) NoticeCheck(session comm.IUserSession, req *pb.DispatchNoticeR
 	return
 }
 
-func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (code pb.ErrorCode, data proto.Message) {
+func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	d := a.module.modelDispatch.getDBDispatch(session.GetUserId())
 	if d == nil {
 		code = pb.ErrorCode_DataNotFound

modules/dispatch/api_receive.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 领取派遣奖励
@@ -17,7 +15,7 @@ func (a *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.DispatchReceiv
 	return
 }
 
-func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) (code pb.ErrorCode, data proto.Message) {
+func (a *apiComp) Receive(session comm.IUserSession, req *pb.DispatchReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = a.ReceiveCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/dispatch/api_refresh.go

@@ -6,8 +6,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 刷新
@@ -15,7 +13,7 @@ func (a *apiComp) RefreshCheck(session comm.IUserSession, req *pb.DispatchRefres
 	return
 }
 
-func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) (code pb.ErrorCode, data proto.Message) {
+func (a *apiComp) Refresh(session comm.IUserSession, req *pb.DispatchRefreshReq) (code pb.ErrorCode, data *pb.ErrorData) {
 
 	d := a.module.modelDispatch.getDBDispatch(session.GetUserId())
 	if d == nil {

modules/dispatch/api_week.go

@@ -3,8 +3,6 @@ package dispatch
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (code pb.ErrorCode) {
@@ -14,7 +12,7 @@ func (a *apiComp) WeekreciveCheck(session comm.IUserSession, req *pb.DispatchWee
 	return
 }
 
-func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (code pb.ErrorCode, data proto.Message) {
+func (a *apiComp) Weekrecive(session comm.IUserSession, req *pb.DispatchWeekReciveReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = a.WeekreciveCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/enchant/api_buy.go

@@ -3,8 +3,6 @@ package enchant
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +15,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.EnchantBuyReq)
 }
 
 // 协议废除 走通用购买逻辑
-func (this *apiComp) Buy(session comm.IUserSession, req *pb.EnchantBuyReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Buy(session comm.IUserSession, req *pb.EnchantBuyReq) (code pb.ErrorCode, data *pb.ErrorData) {
 
 	session.SendMsg(string(this.module.GetType()), EnchantBuyResp, &pb.EnchantBuyResp{})
 	return

modules/enchant/api_challenge.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -18,7 +16,7 @@ func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.EnchantCh
 }
 
 ///挑战主线关卡
-func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallengeReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Challenge(session comm.IUserSession, req *pb.EnchantChallengeReq) (code pb.ErrorCode, data *pb.ErrorData) {
 
 	code = this.ChallengeCheck(session, req)
 	if code != pb.ErrorCode_Success {

modules/enchant/api_challengeover.go

@@ -3,8 +3,6 @@ package enchant
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +15,7 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Encha
 }
 
 ///挑战主线关卡
-func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.EnchantChallengeOverReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		mapData map[string]interface{}
 		bWin    bool  // 战斗是否胜利

modules/enchant/api_getlist.go

@@ -6,7 +6,6 @@ import (
 	"go_dreamfactory/pb"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -15,7 +14,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.EnchantGetL
 	return
 }
 
-func (this *apiComp) GetList(session comm.IUserSession, req *pb.EnchantGetListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) GetList(session comm.IUserSession, req *pb.EnchantGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 
 	// 刷新挑战卷
 	if code = this.module.ModuleItems.RecoverTicket(session); code != pb.ErrorCode_Success {

modules/enchant/api_ranklist.go

@@ -9,7 +9,6 @@ import (
 	"strconv"
 
 	"github.com/go-redis/redis/v8"
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -18,7 +17,7 @@ func (this *apiComp) RankListCheck(session comm.IUserSession, req *pb.EnchantRan
 	return
 }
 
-func (this *apiComp) RankList(session comm.IUserSession, req *pb.EnchantRankListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) RankList(session comm.IUserSession, req *pb.EnchantRankListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		szRank []*pb.DBEnchantRank
 		rd     *redis.StringSliceCmd

modules/equipment/api_ench.go

@@ -6,8 +6,6 @@ import (
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"math/rand"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -19,7 +17,7 @@ func (this *apiComp) EnchCheck(session comm.IUserSession, req *pb.EquipmentEnchR
 }
 
 //附魔
-func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Ench(session comm.IUserSession, req *pb.EquipmentEnchReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		equip      *pb.DB_Equipment
 		conf       *cfg.GameEquipEnchantingData

modules/equipment/api_equip.go

@@ -6,8 +6,6 @@ import (
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
 	"math"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -19,7 +17,7 @@ func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEqui
 }
 
 ///英雄挂在装备 code 错误码信息 data 错误附加数据
-func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err                                      error
 		confs                                    []*cfg.GameEquipData

modules/equipment/api_forg.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +15,7 @@ func (this *apiComp) ForgCheck(session comm.IUserSession, req *pb.EquipmentForgR
 }
 
 //锻造
-func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		conf   *cfg.GameEquipSComposeData
 		need   []*cfg.Gameatn

modules/equipment/api_getlist.go

@@ -3,8 +3,6 @@ package equipment
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -14,7 +12,7 @@ func (this *apiComp) GetlistCheck(session comm.IUserSession, req *pb.EquipmentGe
 }
 
 ///获取用户装备列表
-func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Getlist(session comm.IUserSession, req *pb.EquipmentGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err   error
 		items []*pb.DB_Equipment

modules/equipment/api_lock.go

@@ -3,8 +3,6 @@ package equipment
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -16,7 +14,7 @@ func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.EquipmentLockR
 }
 
 ///获取用户装备列表
-func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Lock(session comm.IUserSession, req *pb.EquipmentLockReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err       error
 		equipment *pb.DB_Equipment

modules/equipment/api_sellI.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"math"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -18,7 +16,7 @@ func (this *apiComp) SellCheck(session comm.IUserSession, req *pb.EquipmentSellR
 }
 
 //出售
-func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Sell(session comm.IUserSession, req *pb.EquipmentSellReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err        error
 		equipments []*pb.DB_Equipment

modules/equipment/api_upgrade.go

@@ -10,7 +10,6 @@ import (
 	"math/big"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -23,7 +22,7 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUp
 }
 
 ///英雄挂在装备
-func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err                error
 		conf               *cfg.GameEquipData

modules/equipment/api_wash.go

@@ -6,8 +6,6 @@ import (
 	"go_dreamfactory/sys/configure"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"math/rand"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -19,7 +17,7 @@ func (this *apiComp) WashCheck(session comm.IUserSession, req *pb.EquipmentWashR
 }
 
 //锻造
-func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		equip        *pb.DB_Equipment
 		conf         *cfg.GameEquipData

modules/equipment/api_washconfirm.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -18,7 +16,7 @@ func (this *apiComp) WashConfirmCheck(session comm.IUserSession, req *pb.Equipme
 }
 
 //锻造
-func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		equip       *pb.DB_Equipment
 		attrlibrary *cfg.GameEquipAttrlibraryData

modules/forum/api_getlist.go

@@ -3,8 +3,6 @@ package forum
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -16,7 +14,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ForumGetLis
 }
 
 ///获取本服聊天消息记录
-func (this *apiComp) GetList(session comm.IUserSession, req *pb.ForumGetListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) GetList(session comm.IUserSession, req *pb.ForumGetListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err  error
 		list []*pb.DBComment

modules/forum/api_like.go

@@ -3,8 +3,6 @@ package forum
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -16,7 +14,7 @@ func (this *apiComp) LikeCheck(session comm.IUserSession, req *pb.ForumLikeReq)
 }
 
 ///获取本服聊天消息记录
-func (this *apiComp) Like(session comm.IUserSession, req *pb.ForumLikeReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Like(session comm.IUserSession, req *pb.ForumLikeReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err error
 	)

modules/forum/api_releasecomment.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -18,7 +17,7 @@ func (this *apiComp) ReleaseCommentCheck(session comm.IUserSession, req *pb.Foru
 }
 
 ///发布评论
-func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) ReleaseComment(session comm.IUserSession, req *pb.ForumReleaseCommentReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err     error
 		comment *pb.DBComment

modules/forum/api_watchhero.go

@@ -3,8 +3,6 @@ package forum
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -16,7 +14,7 @@ func (this *apiComp) WatchHeroCheck(session comm.IUserSession, req *pb.ForumWatc
 }
 
 ///获取本服聊天消息记录
-func (this *apiComp) WatchHero(session comm.IUserSession, req *pb.ForumWatchHeroReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) WatchHero(session comm.IUserSession, req *pb.ForumWatchHeroReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		hero  *pb.DBHero
 		err   error

modules/friend/api_cross_accept.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/sys/configure"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //接受切磋
@@ -18,7 +16,7 @@ func (this *apiComp) AcceptCheck(session comm.IUserSession, req *pb.FriendAccept
 	return
 }
 
-func (this *apiComp) Accept(session comm.IUserSession, req *pb.FriendAcceptReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Accept(session comm.IUserSession, req *pb.FriendAcceptReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.AcceptCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_addblack.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //加入黑名单
@@ -19,7 +17,7 @@ func (this *apiComp) AddblackCheck(session comm.IUserSession, req *pb.FriendAddB
 	return
 }
 
-func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Addblack(session comm.IUserSession, req *pb.FriendAddBlackReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.AddblackCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_agree.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //单个/批量同意
@@ -20,7 +18,7 @@ func (this *apiComp) AgreeCheck(session comm.IUserSession, req *pb.FriendAgreeRe
 	return
 }
 
-func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.AgreeCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_apply.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //好友申请
@@ -19,7 +17,7 @@ func (this *apiComp) ApplyCheck(session comm.IUserSession, req *pb.FriendApplyRe
 	return
 }
 
-func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Apply(session comm.IUserSession, req *pb.FriendApplyReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.ApplyCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_applylist.go

@@ -3,8 +3,6 @@ package friend
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //申请列表
@@ -13,7 +11,7 @@ func (this *apiComp) ApplyListCheck(session comm.IUserSession, req *pb.FriendApp
 	return
 }
 
-func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) ApplyList(session comm.IUserSession, req *pb.FriendApplyListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		self *pb.DBFriend
 		list []*pb.FriendBase

modules/friend/api_cross_assisthero.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 设置助战英雄
@@ -19,7 +17,7 @@ func (this *apiComp) AssistheroCheck(session comm.IUserSession, req *pb.FriendAs
 	return
 }
 
-func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssistheroReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Assisthero(session comm.IUserSession, req *pb.FriendAssistheroReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.AssistheroCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_assistherolist.go

@@ -3,8 +3,6 @@ package friend
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 好友助战英雄列表
@@ -13,7 +11,7 @@ func (this *apiComp) AssistHeroListCheck(session comm.IUserSession, req *pb.Frie
 	return
 }
 
-func (this *apiComp) AssistHeroList(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) AssistHeroList(session comm.IUserSession, req *pb.FriendAssistHeroListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 
 	//获取玩家自己好友数据
 	self := this.moduleFriend.modelFriend.GetFriend(session.GetUserId())

modules/friend/api_cross_assistlist.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
 	"sort"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 助战列表
@@ -15,7 +13,7 @@ func (this *apiComp) AssistlistCheck(session comm.IUserSession, req *pb.FriendAs
 	return
 }
 
-func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistlistReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Assistlist(session comm.IUserSession, req *pb.FriendAssistlistReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var list []*pb.FriendBase
 	//获取玩家自己好友数据
 	self := this.moduleFriend.modelFriend.GetFriend(session.GetUserId())

modules/friend/api_cross_blacklist.go

@@ -3,8 +3,6 @@ package friend
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //黑名单列表
@@ -12,7 +10,7 @@ func (this *apiComp) BlacklistCheck(session comm.IUserSession, req *pb.FriendBla
 	return
 }
 
-func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Blacklist(session comm.IUserSession, req *pb.FriendBlackListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		self *pb.DBFriend
 		list []*pb.FriendBase

modules/friend/api_cross_del.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //删除好友
@@ -18,7 +16,7 @@ func (this *apiComp) DelCheck(session comm.IUserSession, req *pb.FriendDelReq) (
 	return
 }
 
-func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.DelCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_delblack.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //删除黑名单
@@ -18,7 +16,7 @@ func (this *apiComp) DelblackCheck(session comm.IUserSession, req *pb.FriendDelB
 	return
 }
 
-func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Delblack(session comm.IUserSession, req *pb.FriendDelBlackReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.DelblackCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_getrelation.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 获取好友关系
@@ -18,7 +16,7 @@ func (this *apiComp) GetRelationCheck(session comm.IUserSession, req *pb.FriendG
 	return
 }
 
-func (this *apiComp) GetRelation(session comm.IUserSession, req *pb.FriendGetRelationReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) GetRelation(session comm.IUserSession, req *pb.FriendGetRelationReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.GetRelationCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_getreward.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 领取奖励
@@ -13,7 +11,7 @@ func (this *apiComp) GetrewardCheck(session comm.IUserSession, req *pb.FriendGet
 	return
 }
 
-func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewardReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Getreward(session comm.IUserSession, req *pb.FriendGetrewardReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	uid := session.GetUserId()
 	//获取玩家自己好友数据
 	self := this.moduleFriend.modelFriend.GetFriend(uid)

modules/friend/api_cross_list.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //好友列表
@@ -14,7 +12,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.FriendListReq)
 	return
 }
 
-func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		self *pb.DBFriend
 		list []*pb.FriendBase

modules/friend/api_cross_qiecuo.go

@@ -4,8 +4,6 @@ import (
 	"errors"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 踢馆(熊猫武馆)
@@ -16,7 +14,7 @@ func (this *apiComp) QiecuoCheck(session comm.IUserSession, req *pb.FriendQiecuo
 	return
 }
 
-func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.FriendQiecuoReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.QiecuoCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_randlist.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 好友推荐
@@ -15,7 +13,7 @@ func (this *apiComp) RandlistCheck(session comm.IUserSession, req *pb.FriendRand
 	return
 }
 
-func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistReq) (code pb.ErrorCode, data *pb.ErrorData) {
 
 	// 当前玩家好友数据
 	self := this.moduleFriend.modelFriend.GetFriend(session.GetUserId())

modules/friend/api_cross_refuse.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 好友审核-拒绝
@@ -20,7 +18,7 @@ func (this *apiComp) RefuseCheck(session comm.IUserSession, req *pb.FriendRefuse
 }
 
 //单个/批量拒绝
-func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Refuse(session comm.IUserSession, req *pb.FriendRefuseReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.RefuseCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_search.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //搜索
@@ -19,7 +17,7 @@ func (this *apiComp) SearchCheck(session comm.IUserSession, req *pb.FriendSearch
 	return
 }
 
-func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.SearchCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_stop.go

@@ -3,8 +3,6 @@ package friend
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 切磋终止
@@ -12,7 +10,7 @@ func (this *apiComp) StopCheck(session comm.IUserSession, req *pb.FriendStopReq)
 	return
 }
 
-func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Stop(session comm.IUserSession, req *pb.FriendStopReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.StopCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_zan.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 点赞
@@ -18,7 +16,7 @@ func (this *apiComp) ZanCheck(session comm.IUserSession, req *pb.FriendZanReq) (
 	return
 }
 
-func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Zan(session comm.IUserSession, req *pb.FriendZanReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.ZanCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_zanlist.go

@@ -3,8 +3,6 @@ package friend
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 点赞列表
@@ -13,7 +11,7 @@ func (this *apiComp) ZanlistCheck(session comm.IUserSession, req *pb.FriendZanli
 }
 
 // Deprecated:
-func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Zanlist(session comm.IUserSession, req *pb.FriendZanlistReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.ZanlistCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/friend/api_cross_zanreceive.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 领取点赞奖励
@@ -19,7 +17,7 @@ func (this *apiComp) ZanreceiveCheck(session comm.IUserSession, req *pb.FriendZa
 	return
 }
 
-func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanreceiveReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanreceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.ZanreceiveCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/gateway/agent.go

@@ -103,7 +103,7 @@ locp:
 						ReqSubType:  msg.SubType,
 						Arg:         msg.Data,
 						Code:        pb.ErrorCode_GatewayException,
-						Message:     err.Error(),
+						Err:         &pb.ErrorData{Title: "用户消息处理失败!", Datastring: err.Error()},
 					})
 					err = this.WriteMsg(&pb.UserMessage{
 						MainType: comm.MainTypeNotify,
@@ -116,7 +116,7 @@ locp:
 
 			} else {
 				this.gateway.Errorf("agent:%s uId:%s 密钥无效 err:%v", this.sessionId, this.uId, err)
-				data, _ := anypb.New(&pb.NotifyErrorNotifyPush{ReqMainType: msg.MainType, ReqSubType: msg.SubType, Code: code, Message: err.Error()})
+				data, _ := anypb.New(&pb.NotifyErrorNotifyPush{ReqMainType: msg.MainType, ReqSubType: msg.SubType, Code: code, Err: &pb.ErrorData{Title: "用户消息验证失败!", Datastring: err.Error()}})
 				if err = this.WriteMsg(&pb.UserMessage{
 					MainType: comm.MainTypeNotify,
 					SubType:  comm.SubTypeErrorNotify,
@@ -366,8 +366,8 @@ func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) {
 			ReqMainType: msg.MainType,
 			ReqSubType:  msg.SubType,
 			Arg:         msg.Data,
-			Data:        reply.ErrorData,
+			Code:        pb.ErrorCode(reply.Code.Number()),
-			Code:        pb.ErrorCode(reply.Code.Number())})
+			Err:         reply.ErrorData})
 		err = this.WriteMsg(&pb.UserMessage{
 			MainType: comm.MainTypeNotify,
 			SubType:  comm.SubTypeErrorNotify,

modules/gm/api_cmd.go

@@ -3,8 +3,6 @@ package gm
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 /* GM 在控制台输入的字符串类型
@@ -49,7 +47,7 @@ func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (code
 }
 
 ///解析GM 指令
-func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.CmdCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/gourmet/api_activateatlas.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +15,7 @@ func (this *apiComp) ActivateAtlasCheck(session comm.IUserSession, req *pb.Gourm
 	return
 }
 
-func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) ActivateAtlas(session comm.IUserSession, req *pb.GourmetActivateAtlasReq) (code pb.ErrorCode, data *pb.ErrorData) {
 
 	code = this.ActivateAtlasCheck(session, req)
 	if code != pb.ErrorCode_Success {

modules/gourmet/api_createfood.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +15,7 @@ func (this *apiComp) CreateFoodCheck(session comm.IUserSession, req *pb.GourmetC
 }
 
 ///获取美食城基本信息
-func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) CreateFood(session comm.IUserSession, req *pb.GourmetCreateFoodReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		res     []*cfg.Gameatn
 		curFood string // 做出来的食物ID

modules/gourmet/api_getatlas.go

@@ -3,8 +3,6 @@ package gourmet
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -14,7 +12,7 @@ func (this *apiComp) AtlasCheck(session comm.IUserSession, req *pb.GourmetAtlasR
 }
 
 ///获取美食城基本信息
-func (this *apiComp) Atlas(session comm.IUserSession, req *pb.GourmetAtlasReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Atlas(session comm.IUserSession, req *pb.GourmetAtlasReq) (code pb.ErrorCode, data *pb.ErrorData) {
 
 	code = this.AtlasCheck(session, req)
 	if code != pb.ErrorCode_Success {

modules/gourmet/api_getranduser.go

@@ -11,7 +11,6 @@ import (
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo/options"
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -24,7 +23,7 @@ func (this *apiComp) GetRandUserCheck(session comm.IUserSession, req *pb.Gourmet
 }
 
 /// 获取一些玩家数据
-func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRandUserReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRandUserReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		szDbUser []*pb.DBUser
 		mapUser  map[string]struct{}

modules/growtask/api_advreceive.go

@@ -3,8 +3,6 @@ package growtask
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //进阶奖励领取
@@ -16,7 +14,7 @@ func (this *apiComp) AdvreceiveCheck(session comm.IUserSession, req *pb.Growtask
 	return
 }
 
-func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvReceiveReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.AdvreceiveCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/growtask/api_receive.go

@@ -3,8 +3,6 @@ package growtask
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 子任务奖励领取
@@ -16,7 +14,7 @@ func (this *apiComp) ReceiveCheck(session comm.IUserSession, req *pb.GrowtaskRec
 	return
 }
 
-func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	if code = this.ReceiveCheck(session, req); code != pb.ErrorCode_Success {
 		return
 	}

modules/growtask/api_tasklist.go

@@ -3,8 +3,6 @@ package growtask
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 // 成长任务列表
@@ -16,7 +14,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.GrowtaskListRe
 	return
 }
 
-func (this *apiComp) List(session comm.IUserSession, req *pb.GrowtaskListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) List(session comm.IUserSession, req *pb.GrowtaskListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	uid := session.GetUserId()
 
 	gt, err := this.module.modelGrowtask.getUserGrowtask(uid)

modules/hero/api_awaken.go

@@ -6,8 +6,6 @@ import (
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
 	"strconv"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -21,7 +19,7 @@ func (this *apiComp) AwakenCheck(session comm.IUserSession, req *pb.HeroAwakenRe
 }
 
 /// 英雄觉醒
-func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		awakenData *cfg.GameHeroAwakenData
 		_hero      *pb.DBHero

modules/hero/api_buy.go

@@ -6,8 +6,6 @@ import (
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
 	"math"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -19,7 +17,7 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.HeroBuyReq) (co
 }
 
 ///获取用户商品列表
-func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Buy(session comm.IUserSession, req *pb.HeroBuyReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		err        error
 		conf       *cfg.GameShopitemData

modules/hero/api_drawCard.go

@@ -6,8 +6,6 @@ import (
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"math/big"
-
-	"google.golang.org/protobuf/proto"
 )
 
 func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode) {
@@ -18,7 +16,7 @@ func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCa
 }
 
 //抽卡
-func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		szCards    []string       // 最终抽到的卡牌
 		drawCount  int32          // 抽卡次数

modules/hero/api_drawCardFloor.go

@@ -3,8 +3,6 @@ package hero
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 func (this *apiComp) DrawCardFloorCheck(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (code pb.ErrorCode) {
@@ -13,7 +11,7 @@ func (this *apiComp) DrawCardFloorCheck(session comm.IUserSession, req *pb.HeroD
 }
 
 //抽卡
-func (this *apiComp) DrawCardFloor(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) DrawCardFloor(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	rsp := &pb.HeroDrawCardFloorResp{}
 	if heroRecord, err := this.module.modelRecord.GetHeroRecord(session.GetUserId()); err == nil {
 		rsp.Star4 = heroRecord.Star4

modules/hero/api_fusion.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -17,7 +15,7 @@ func (this *apiComp) FusionCheck(session comm.IUserSession, req *pb.HeroFusionRe
 	return
 }
 
-func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		totalCount   int32
 		mapHero      map[string]int32

modules/hero/api_info.go

@@ -6,8 +6,6 @@ import (
 	"go_dreamfactory/sys/db"
 	"go_dreamfactory/utils"
 	"time"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -18,7 +16,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.HeroInfoReq) (
 	return
 }
 
-func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Info(session comm.IUserSession, req *pb.HeroInfoReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		uid string
 	)

modules/hero/api_list.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/pb"
 	"go_dreamfactory/sys/configure"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -14,7 +12,7 @@ func (this *apiComp) ListCheck(session comm.IUserSession, req *pb.HeroListReq) (
 	return
 }
 
-func (this *apiComp) List(session comm.IUserSession, req *pb.HeroListReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) List(session comm.IUserSession, req *pb.HeroListReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	rsp := &pb.HeroListResp{}
 
 	rsp.List = this.module.GetHeroList(session.GetUserId())

modules/hero/api_lock.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -19,7 +17,7 @@ func (this *apiComp) LockCheck(session comm.IUserSession, req *pb.HeroLockReq) (
 }
 
 /// 英雄锁定
-func (this *apiComp) Lock(session comm.IUserSession, req *pb.HeroLockReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) Lock(session comm.IUserSession, req *pb.HeroLockReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		_hero *pb.DBHero
 	)

modules/hero/api_specified.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/pb"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -19,7 +17,7 @@ func (this *apiComp) GetSpecifiedCheck(session comm.IUserSession, req *pb.HeroGe
 }
 
 /// 获取指定星级或等级的英雄 GM 协议
-func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpecifiedReq) (code pb.ErrorCode, data *pb.ErrorData) {
 
 	code = this.GetSpecifiedCheck(session, req) // check
 	if code != pb.ErrorCode_Success {

modules/hero/api_strengthenUpSkill.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -20,7 +18,7 @@ func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.H
 }
 
 /// 英雄技能升级
-func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		upSkillPos int32          // 升级的技能位置
 		_hero      *pb.DBHero     // 操作的英雄

modules/hero/api_strengthenUpStar.go

@@ -5,8 +5,6 @@ import (
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 	"go_dreamfactory/utils"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -19,7 +17,7 @@ func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.He
 }
 
 /// 英雄升星
-func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode, data *pb.ErrorData) {
 	var (
 		starConf *cfg.GameHeroStarupData // 配置表目标升星英雄信息
 		_hero    *pb.DBHero              // 目标英雄

modules/hero/api_strengthenUplv.go

@@ -4,8 +4,6 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-
-	"google.golang.org/protobuf/proto"
 )
 
 //参数校验
@@ -19,7 +17,7 @@ func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.Hero
 }
 
 /// 英雄升级
-func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode, data proto.Message) {
+func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode, data *pb.ErrorData) {
 
 	var (
 		addExp   int32          // 需要增加的经验