diff --git a/cmd/v2/ui/tool_term.go b/cmd/v2/ui/tool_term.go index 6ec21036a..774f8d498 100644 --- a/cmd/v2/ui/tool_term.go +++ b/cmd/v2/ui/tool_term.go @@ -283,7 +283,7 @@ func (this *appTerm) LazyInit(obs observer.Observer) error { //资源管理器 openExplor := func(dir string) { if runtime.GOOS == "windows" { - if err := exec.Command("explorer", filepath.Join(localDir.Text)).Start(); err != nil { + if err := exec.Command("explorer", filepath.Join(dir)).Start(); err != nil { dialog.ShowError(errors.WithMessage(err, "请确认Json目录是否填写正确"), toolWin.w) return } diff --git a/cmd/v2/ui/views/bingoview.go b/cmd/v2/ui/views/bingoview.go index d3c8d741b..9759f8b96 100644 --- a/cmd/v2/ui/views/bingoview.go +++ b/cmd/v2/ui/views/bingoview.go @@ -87,15 +87,14 @@ func (this *BingoView) CreateView(t *model.TestCase) fyne.CanvasObject { customForm := widget.NewForm(widget.NewFormItem("bingo", bingoEntry)) customForm.OnSubmit = func() { - if bingoEntry.Text == "" || strings.HasPrefix(bingoEntry.Text, "bingo:") { + if bingoEntry.Text == "" || !strings.HasPrefix(bingoEntry.Text, "bingo:") { dialog.ShowError(errors.New("请填写完整并加上bingo:前缀"), this.w) return } - bingo := fmt.Sprintf("bingo:%s", bingoEntry.Text) if err := service.GetPttService().SendToClient( t.MainType, t.SubType, - &pb.GMCmdReq{Cmod: bingo}, + &pb.GMCmdReq{Cmod: bingoEntry.Text}, ); err != nil { logrus.Error(err) return diff --git a/modules/rtask/module.go b/modules/rtask/module.go index 68abb8c66..f5513add9 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -316,7 +316,7 @@ func (this *ModuleRtask) BingoRtask(session comm.IUserSession, groupId, rtaskId return err } - if err := session.SendMsg(string(this.GetType()), "FinishIds", + if err := session.SendMsg(string(this.GetType()), "finishids", &pb.RtaskFinishIdsPush{RtaskId: frtaskArr.RtaskIds, GroupId: groupId}); err != nil { return err } diff --git a/utils/time.go b/utils/time.go index b16a7b98f..ff7cb90cc 100644 --- a/utils/time.go +++ b/utils/time.go @@ -1,6 +1,7 @@ package utils import ( + "fmt" "time" "github.com/jinzhu/now" @@ -37,3 +38,18 @@ func IsYestoday(timestamp int64) bool { yesTime := time.Now().AddDate(0, 0, -1) return tt.Year() == yesTime.Year() && tt.Month() == yesTime.Month() && tt.Day() == yesTime.Day() } + +func MatrixingHour(beginTime string) { + location, err := time.LoadLocation("Asia/Shanghai") + if err != nil { + return + } + myConfig := &now.Config{ + WeekStartDay: time.Monday, + TimeLocation: location, + TimeFormats: []string{"2006-01-02 15:04:05"}, + } + + t, _ := myConfig.Parse(beginTime) + fmt.Println(t) +}