liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化登录

Browse Source
This commit is contained in:
wh_zcy 2022-10-12 15:23:13 +08:00
parent ddab5ed2f2
commit a61c656723
19 changed files with 245 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/v2/ui/protocol.go
View File

@ -39,8 +39,11 @@ var (
//sys
ff(comm.ModuleSys, "funclist"): &formview.SysFuncListView{},
//user
ff(comm.ModuleUser, user.UserSubTypeModifyName): &formview.UserModifynameView{},
ff(comm.ModuleUser, user.UserSubTypeModifySign): &formview.UserSignView{},
ff(comm.ModuleUser, user.UserSubTypeModifyAvatar): &formview.UserModifyavatarView{},
ff(comm.ModuleUser, user.UserSubTypeModifyName): &formview.UserModifynameView{},
ff(comm.ModuleUser, user.UserSubTypeModifyFigure): &formview.UserModifyfigureView{},
ff(comm.ModuleUser, user.UserSubTYpeModifyBgp): &formview.UserModifybgpView{},
ff(comm.ModuleUser, user.UserSubTypeModifySign): &formview.UserSignView{},
// items
ff(comm.ModuleItems, "getlist"): &formview.ItemListView{},
ff(comm.ModuleItems, "sellitem"): &formview.ItemsSellView{},
@ -126,7 +129,10 @@ var (
ff(comm.ModuleSys, "funclist"),
},
"user": {
ff(comm.ModuleUser, user.UserSubTypeModifyAvatar),
ff(comm.ModuleUser, user.UserSubTypeModifyName),
ff(comm.ModuleUser, user.UserSubTypeModifyFigure),
ff(comm.ModuleUser, user.UserSubTYpeModifyBgp),
ff(comm.ModuleUser, user.UserSubTypeModifySign),
},
"items": {
@ -236,6 +242,13 @@ var (
MainType: "user",
Enabled: true,
},
ff(comm.ModuleUser, user.UserSubTypeModifyAvatar): {
Desc: "用户头像修改",
NavLabel: "修改头像",
MainType: string(comm.ModuleUser),
SubType: user.UserSubTypeModifyAvatar,
Enabled: true,
},
"user.modifyname": {
Desc: "用户昵称修改",
NavLabel: "修改昵称",
@ -258,6 +271,20 @@ var (
},
Enabled: true,
},
ff(comm.ModuleUser, user.UserSubTypeModifyFigure): {
Desc: "用户形象修改",
NavLabel: "修改形象",
MainType: string(comm.ModuleUser),
SubType: user.UserSubTypeModifyFigure,
Enabled: true,
},
ff(comm.ModuleUser, user.UserSubTYpeModifyBgp): {
Desc: "背景修改",
NavLabel: "修改背景",
MainType: string(comm.ModuleUser),
SubType: user.UserSubTYpeModifyBgp,
Enabled: true,
},
ff(comm.ModuleUser, user.UserSubTypeModifySign): {
NavLabel: "修改签名",
Desc: "用户签名修改",

2
cmd/v2/ui/tool_term.go
View File

@ -745,7 +745,7 @@ func (a *appTerm) createDownloadWindow() fyne.Window {
downloadProgress.Hide()
wg.Done()
}()
logrus.WithField("filepath", remoteLogDirEntry.Text+name).Debug("下载")
logrus.WithField("filepath", saveDirEntry.Text+name).Debug("下载")
if err := a.sshService.ScpDownload(saveDirEntry.Text, remoteLogDirEntry.Text+name); err != nil {
common.ShowTip(name + " 下载失败")
}

16
cmd/v2/ui/toy_userinfo.go
View File

@ -116,7 +116,9 @@ func (this *toyUserInfo) dataListener() {
_ = this.data.Append(this.getFriendPoint()) //12
_ = this.data.Append(this.getModiNameCount()) //13
_ = this.data.Append(this.getCreateTime())
_ = this.data.Append(this.getSign())
_ = this.data.Append(this.getSign()) //15
_ = this.data.Append(this.getBgp()) //16
_ = this.data.Append(this.getFigure()) //17
this.setProp(2, common.USERINFO_NAME, this.userInfo.DbUser.Name)
},
@ -158,6 +160,10 @@ func (this *toyUserInfo) dataListener() {
this.setProp(11, common.USERINFO_ACTIVE_WEEK, rsp.Ex.Activeweek)
this.setProp(12, common.USERINFO_FRIENDPOINT, rsp.Ex.FriendPoint)
this.setProp(13, common.USERINFO_MODINAME, rsp.Ex.ModifynameCount)
this.setProp(13, common.USERINFO_MODINAME, rsp.Ex.ModifynameCount)
this.setProp(15, common.USERINFO_SIGN, rsp.Ex.Sign)
this.setProp(16, "背景", rsp.Data.Bgp)
this.setProp(17, "形象", rsp.Data.Figure)
}
},
})
@ -237,6 +243,14 @@ func (this *toyUserInfo) getTitle() string {
return fmt.Sprintf("%-3s\t: %s", common.USERINFO_TITLE, cast.ToString(this.userInfo.DbUser.Exp))
}
func (this *toyUserInfo) getFigure() string {
return fmt.Sprintf("%-3s\t: %s", "形象", cast.ToString(this.userInfo.DbUser.Figure))
}
func (this *toyUserInfo) getBgp() string {
return fmt.Sprintf("%-3s\t: %s", "背景", cast.ToString(this.userInfo.DbUser.Bgp))
}
func (this *toyUserInfo) getActiveDay() string {
if this.userInfo.DbUserExpand == nil {
return fmt.Sprintf("%-3s\t: %s", common.USERINFO_ACTIVE_DAY, cast.ToString(0))

2
cmd/v2/ui/views/bingoview.go
View File

@ -85,7 +85,7 @@ func (this *BingoView) CreateView(t *model.TestCase) fyne.CanvasObject {
bingoEntry := widget.NewEntry()
bingoEntry.PlaceHolder = "bingo:item,10001,1"
customForm := widget.NewForm(widget.NewFormItem("bingo", bingoEntry))
customForm := widget.NewForm(widget.NewFormItem("自定义", bingoEntry))
customForm.OnSubmit = func() {
if bingoEntry.Text == "" || !strings.HasPrefix(bingoEntry.Text, "bingo:") {
dialog.ShowError(errors.New("请填写完整并加上bingo:前缀"), this.w)

35
cmd/v2/ui/views/user_modifyavatar.go Normal file
View File

@ -0,0 +1,35 @@
package formview
import (
"go_dreamfactory/cmd/v2/model"
"go_dreamfactory/cmd/v2/service"
"go_dreamfactory/pb"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/widget"
"github.com/sirupsen/logrus"
)
// 修改头像
type UserModifyavatarView struct {
BaseformView
}
func (this *UserModifyavatarView) CreateView(t *model.TestCase) fyne.CanvasObject {
avatarId := widget.NewEntry()
this.form.AppendItem(widget.NewFormItem("头像ID", avatarId))
this.form.OnSubmit = func() {
if err := service.GetPttService().SendToClient(
t.MainType,
t.SubType,
&pb.UserModifyavatarReq{AvatarId: avatarId.Text},
); err != nil {
logrus.Error(err)
return
}
}
return this.form
}

36
cmd/v2/ui/views/user_modifybgp.go Normal file
View File

@ -0,0 +1,36 @@
package formview
import (
"go_dreamfactory/cmd/v2/model"
"go_dreamfactory/cmd/v2/service"
"go_dreamfactory/pb"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/widget"
"github.com/sirupsen/logrus"
"github.com/spf13/cast"
)
// 修改背景
type UserModifybgpView struct {
BaseformView
}
func (this *UserModifybgpView) CreateView(t *model.TestCase) fyne.CanvasObject {
bgpId := widget.NewEntry()
this.form.AppendItem(widget.NewFormItem("背景ID", bgpId))
this.form.OnSubmit = func() {
if err := service.GetPttService().SendToClient(
t.MainType,
t.SubType,
&pb.UserModifybgpReq{BgpId: cast.ToInt32(bgpId.Text)},
); err != nil {
logrus.Error(err)
return
}
}
return this.form
}

35
cmd/v2/ui/views/user_modifyfigure.go Normal file
View File

@ -0,0 +1,35 @@
package formview
import (
"go_dreamfactory/cmd/v2/model"
"go_dreamfactory/cmd/v2/service"
"go_dreamfactory/pb"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/widget"
"github.com/sirupsen/logrus"
"github.com/spf13/cast"
)
// 修改形象
type UserModifyfigureView struct {
BaseformView
}
func (this *UserModifyfigureView) CreateView(t *model.TestCase) fyne.CanvasObject {
figureId := widget.NewEntry()
this.form.AppendItem(widget.NewFormItem("形象", figureId))
this.form.OnSubmit = func() {
if err := service.GetPttService().SendToClient(
t.MainType,
t.SubType,
&pb.UserModifyfigureReq{FigureId: cast.ToInt32(figureId.Text)},
); err != nil {
logrus.Error(err)
return
}
}
return this.form
}

7
modules/mail/module.go
View File

@ -4,8 +4,10 @@ import (
"go_dreamfactory/comm"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"time"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/log"
)
/*
@ -47,7 +49,10 @@ func (this *Mail) OnInstallComp() {
// Reward: false,
// }
func (this *Mail) CreateNewMail(session comm.IUserSession, mail *pb.DBMailData) bool {
t := time.Now()
defer func() {
log.Debugf("创建邮件 耗时:%v", time.Since(t))
}()
if mail == nil {
return false
}

6
modules/rtask/config.go
View File

@ -3,8 +3,10 @@ package rtask
import (
"fmt"
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules"
cfg "go_dreamfactory/sys/configure/structs"
"time"
)
const (
@ -151,6 +153,10 @@ func (this *configureComp) getRtaskTypeById(typeId int32) (data *cfg.GameRdtaskC
}
func (this *configureComp) getRtaskCondis(typeId int32) (list []*cfg.GameRdtaskCondiData) {
t := time.Now()
defer func() {
log.Debugf("getRtaskCondis,耗时:%v", time.Since(t))
}()
cfg, err := this.getRtaskCondiCfg()
if err != nil {
return

93
modules/rtask/model_record.go
View File

@ -40,13 +40,17 @@ func (this *ModelRtaskRecord) GetVerifyData(uid string, condiId int32) (*pb.Rtas
func (this *ModelRtaskRecord) getRecord(uid string) *pb.DBRtaskRecord {
record := &pb.DBRtaskRecord{}
if err := this.Get(uid, record); err != nil {
log.Errorf("get rtask record err:%v", err)
log.Warnf("get rtask record err:%v", err)
}
return record
}
// 初始化任务条件数据
func (this *ModelRtaskRecord) initCondiData(uid string) error {
t := time.Now()
defer func() {
log.Debugf("初始化条件耗时:%v", time.Since(t))
}()
dr := this.getRecord(uid)
grc, err := this.moduleRtask.configure.getRtaskCondiCfg()
if err != nil {
@ -88,48 +92,51 @@ func (this *ModelRtaskRecord) initCondiData(uid string) error {
return err
}
} else {
for _, v := range grc.GetDataList() {
if len(v.Inited) != 5 {
continue
}
if _, ok := dr.Vals[v.Id]; ok {
continue
}
vals := []int32{}
for i, p := range v.Inited {
if p == 1 {
vals = append(vals, 0)
} else if p == 0 {
sv := int32(0)
switch i {
case 0:
sv = v.Data1
case 1:
sv = v.Data2
case 2:
sv = v.Data3
case 3:
sv = v.Data4
case 4:
sv = v.Data5
}
vals = append(vals, sv)
} else if p == -1 {
break
}
}
dr.Vals[v.Id] = &pb.RtaskData{
Data: toMap(vals...),
Rtype: v.Type,
Timestamp: time.Now().Unix(),
}
}
update := map[string]interface{}{
"vals": dr.Vals,
}
err = this.Change(uid, update)
}
// else {
// //遍历所有配置
// for _, v := range grc.GetDataList() {
// if len(v.Inited) != 5 {
// continue
// }
// if _, ok := dr.Vals[v.Id]; ok {
// continue
// }
// vals := []int32{}
// // 遍历需要初始化的配置
// for i, p := range v.Inited {
// if p == 1 {
// vals = append(vals, 0)
// } else if p == 0 {
// sv := int32(0)
// switch i {
// case 0:
// sv = v.Data1
// case 1:
// sv = v.Data2
// case 2:
// sv = v.Data3
// case 3:
// sv = v.Data4
// case 4:
// sv = v.Data5
// }
// vals = append(vals, sv)
// } else if p == -1 {
// break
// }
// }
// dr.Vals[v.Id] = &pb.RtaskData{
// Data: toMap(vals...),
// Rtype: v.Type,
// Timestamp: time.Now().Unix(),
// }
// }
// update := map[string]interface{}{
// "vals": dr.Vals,
// }
// err = this.Change(uid, update)
// }
return nil
}

11
modules/rtask/module.go
View File

@ -10,6 +10,7 @@ import (
cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/utils"
"sort"
"time"
"github.com/pkg/errors"
)
@ -199,6 +200,10 @@ func (this *ModuleRtask) initRtaskVerifyHandle() {
}
func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.TaskType, params ...int32) (code pb.ErrorCode) {
t := time.Now()
defer func() {
log.Debugf("耗时:%v", time.Since(t))
}()
this.Debug("任务事件触发", log.Field{"uid", session.GetUserId()}, log.Field{"taskType", rtaskType}, log.Field{"params", params})
var (
err error
@ -206,12 +211,6 @@ func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.T
condis []*rtaskCondi
)
user := this.ModuleUser.GetUser(session.GetUserId())
if user == nil {
code = pb.ErrorCode_UserSessionNobeing
return
}
for _, codi := range this.configure.getRtaskCondis(int32(rtaskType)) {
v, ok := this.handleMap[codi.Id]
if !ok {

5
modules/rtask/updateHandle.go
View File

@ -3,6 +3,7 @@ package rtask
import (
"go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules/task"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
@ -74,6 +75,10 @@ func (this *ModelRtaskRecord) overrideUpdate(uid string, cfg *cfg.GameRdtaskCond
// 累计更新 - 招募等
func (this *ModelRtaskRecord) addUpdate(uid string, cfg *cfg.GameRdtaskCondiData, vals ...int32) (err error) {
t := time.Now()
defer func() {
log.Debugf("add update耗时:%v", time.Since(t))
}()
record := &pb.DBRtaskRecord{Uid: uid}
err = this.Get(uid, record)
if err != nil {

5
modules/task/module.go
View File

@ -9,6 +9,7 @@ import (
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"time"
)
var _ comm.ITask = (*ModuleTask)(nil)
@ -60,6 +61,10 @@ func (this *ModuleTask) Start() (err error) {
//初始化日常、周常、成就
func (this *ModuleTask) InitTaskAll(uid string) {
t := time.Now()
defer func() {
log.Debugf("初始化任务 耗时:%v", time.Since(t))
}()
this.modelTask.initTask(uid, comm.TASK_DAILY)
this.modelTask.initTask(uid, comm.TASK_WEEKLY)
this.modelTask.initTask(uid, comm.TASK_ACHIEVE)

6
modules/user/api.go
View File

@ -20,8 +20,10 @@ const (
UserGetTujianResp = "gettujian" //获取图鉴信息
UserSubTypeLvChangedPush = "lvchanged" //等级变化推送
UserSubTypeModifyName = "modifyname" //修改名称
UserSubTypeFigure = "figure" //形象
UserSubTypeModifySign = "modifysign" // 修改签名
UserSubTypeModifyFigure = "modifyfigure" //修改形象
UserSubTypeModifySign = "modifysign" //修改签名
UserSubTypeModifyAvatar = "modifyavatar" //修改头像
UserSubTYpeModifyBgp = "modifybgp" //修改背景
UserSubTypeInfo = "info" //用户信息
)

41
modules/user/api_login.go
View File

@ -8,7 +8,6 @@ import (
"go_dreamfactory/utils"
"time"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
"google.golang.org/protobuf/proto"
)
@ -31,6 +30,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
user *pb.DBUser
)
t := time.Now()
rsp := &pb.UserLoginResp{}
defer func() {
if user != nil && code == pb.ErrorCode_Success {
@ -41,6 +41,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
code = pb.ErrorCode_SystemError
return
}
log.Debugf("登录耗时:%v", time.Since(t))
}
}()
@ -60,7 +61,6 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
Sid: req.Sid,
Binduid: req.Account,
Lastloginip: session.GetIP(),
Logintime: time.Now().Unix(),
}
err = this.module.modelUser.User_Create(user)
if err != nil {
@ -69,7 +69,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
}
//初始化任务
this.module.ModuleTask.InitTaskAll(user.Uid)
go this.module.ModuleTask.InitTaskAll(user.Uid)
isNewUser = true
} else {
if cu := this.module.modelSession.getUserSession(user.Uid); cu != nil {
@ -130,6 +130,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
rsp.Data = user
// 查询玩家扩展数据
if expand, err := this.module.GetUserExpand(session.GetUserId()); err != nil {
if err != mongo.ErrNoDocuments {
code = pb.ErrorCode_DBError
@ -140,39 +141,13 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (cod
}
}
// if this.module.ModuleSys.IsAccess("", user.Lv) {
this.module.ModuleRtask.InitCondiData(user.Uid)
// }
// 初始化随机任务数据
go this.module.ModuleRtask.InitCondiData(user.Uid)
// 日常登录任务
this.module.ModuleRtask.SendToRtask(session, comm.Rtype7, 1)
go this.module.ModuleRtask.SendToRtask(session, comm.Rtype7, 1)
mail := &pb.DBMailData{
ObjId: primitive.NewObjectID().Hex(),
Uid: user.Uid,
Title: "system mail",
Contex: "Congratulations on getting a login exclusive gift pack",
CreateTime: uint64(time.Now().Unix()),
DueTime: uint64(time.Now().Unix()) + 30*24*3600, // 30天需要走配置文件
Check: false,
Reward: false,
}
fj := make([]*pb.UserAssets, 0)
atn1 := &pb.UserAssets{
A: "hero",
T: "25001",
N: 1,
}
atn2 := &pb.UserAssets{
A: "attr",
T: "gold",
N: 10000,
}
fj = append(fj, atn1)
fj = append(fj, atn2)
mail.Items = fj
this.mail.CreateNewMail(session, mail)
//推送登录公告
this.chat.SendSysChatToUser(session, comm.UserLoginNotice, 0)
go this.chat.SendSysChatToUser(session, comm.UserLoginNotice, 0)
return
}

2
modules/user/api_modifyavatar.go
View File

@ -37,7 +37,7 @@ func (this *apiComp) Modifyavatar(session comm.IUserSession, req *pb.UserModifya
return
}
if err := session.SendMsg(string(this.module.GetType()), UserSubTypeModifyName, &pb.UserModifyavatarResp{
if err := session.SendMsg(string(this.module.GetType()), UserSubTypeModifyAvatar, &pb.UserModifyavatarResp{
Uid: session.GetUserId(),
AvatarId: req.AvatarId,
}); err != nil {

2
modules/user/api_modifybgp.go
View File

@ -35,7 +35,7 @@ func (this *apiComp) Modifybgp(session comm.IUserSession, req *pb.UserModifybgpR
return
}
if err := session.SendMsg(string(this.module.GetType()), UserSubTypeModifyName, &pb.UserModifybgpResp{
if err := session.SendMsg(string(this.module.GetType()), UserSubTYpeModifyBgp, &pb.UserModifybgpResp{
Uid: session.GetUserId(),
BgpId: req.BgpId,
}); err != nil {

2
modules/user/api_modifyfigure.go
View File

@ -35,7 +35,7 @@ func (this *apiComp) Modifyfigure(session comm.IUserSession, req *pb.UserModifyf
return
}
if err := session.SendMsg(string(this.module.GetType()), UserSubTypeModifyName, &pb.UserModifyfigureResp{
if err := session.SendMsg(string(this.module.GetType()), UserSubTypeModifyFigure, &pb.UserModifyfigureResp{
Uid: session.GetUserId(),
FigureId: req.FigureId,
}); err != nil {

2
modules/user/api_modifysign.go
View File

@ -10,7 +10,7 @@ import (
// 修改签名
func (this *apiComp) ModifysignCheck(session comm.IUserSession, req *pb.UserModifysignReq) (code pb.ErrorCode) {
if req.Sign == "" || len(req.Sign) > 90 {
if req.Sign == "" || len(req.Sign) > 200 {
code = pb.ErrorCode_ReqParameterError
}
return