BaseSystem
/
Cron_Admin
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复entry_id不展示问题，去掉channel里面的密钥

This commit is contained in:
renzhiyuan 2024-12-05 09:55:30 +08:00
parent 1a89850b5f
commit 3f1f2286e1
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/http/entities/backend/cmd.go
View File

@ -107,6 +107,7 @@ func (response *CmdListResponse) ResponseFromDb(l croncmdmodel.CronCmd) {
response.CmdId = l.CmdId response.CmdId = l.CmdId
response.CmdName = l.CmdName response.CmdName = l.CmdName
response.UserIds = l.UserIds response.UserIds = l.UserIds
response.EntryId = l.EntryId
response.Status = l.Status response.Status = l.Status
response.ReadDbId = l.ReadDbId response.ReadDbId = l.ReadDbId
response.WriteDbId = l.WriteDbId response.WriteDbId = l.WriteDbId

38
app/http/entities/backend/corn_report_channel.go
View File

@ -9,29 +9,29 @@ import (
type ReportChannelListRequest struct { type ReportChannelListRequest struct {
entities.PageRequest entities.PageRequest
ReportChannelId int `json:"report_channel_id" form:"report_channel_id" validate:"min=0"` ReportChannelId int `json:"report_channel_id" form:"report_channel_id" validate:"min=0"`
Status int `json:"status" form:"status"` Status int `json:"status" form:"status"`
ClientKey string `json:"client_key" form:"client_key"` ClientKey string `json:"client_key" form:"client_key"`
ClientSecret string `json:"client_secret" form:"client_secret"` //ClientSecret string `json:"client_secret" form:"client_secret"`
CreateTime []string `json:"create_time" form:"create_time"` CreateTime []string `json:"create_time" form:"create_time"`
UpdateTime []string `json:"update_time" form:"update_time"` UpdateTime []string `json:"update_time" form:"update_time"`
} }
type ReportChannelList struct { type ReportChannelList struct {
entities.PageRequest entities.PageRequest
ReportChannelId int `json:"report_channel_id" form:"report_channel_id" validate:"min=0"` ReportChannelId int `json:"report_channel_id" form:"report_channel_id" validate:"min=0"`
Status int `json:"status" form:"status"` Status int `json:"status" form:"status"`
ClientKey string `json:"client_key" form:"client_key"` ClientKey string `json:"client_key" form:"client_key"`
ClientSecret string `json:"client_secret" form:"client_secret"` //ClientSecret string `json:"client_secret" form:"client_secret"`
CreateTime []time.Time `json:"create_time" form:"create_time"` CreateTime []time.Time `json:"create_time" form:"create_time"`
UpdateTime []time.Time `json:"update_time" form:"update_time"` UpdateTime []time.Time `json:"update_time" form:"update_time"`
} }
func (this *ReportChannelListRequest) Request2DB() (filter ReportChannelList, err error) { func (this *ReportChannelListRequest) Request2DB() (filter ReportChannelList, err error) {
filter.PageRequest = this.PageRequest filter.PageRequest = this.PageRequest
filter.ReportChannelId = this.ReportChannelId filter.ReportChannelId = this.ReportChannelId
filter.ClientKey = this.ClientKey filter.ClientKey = this.ClientKey
filter.ClientSecret = this.ClientSecret //filter.ClientSecret = this.ClientSecret
filter.Status = this.Status filter.Status = this.Status
filter.CreateTime = []time.Time{} filter.CreateTime = []time.Time{}
var t time.Time var t time.Time
@ -60,17 +60,17 @@ func (this *ReportChannelListRequest) Request2DB() (filter ReportChannelList, er
type ReportChannelListResponse struct { type ReportChannelListResponse struct {
ReportChannelId int `json:"report_channel_id"` ReportChannelId int `json:"report_channel_id"`
ClientKey string `json:"client_key"` ClientKey string `json:"client_key"`
ClientSecret string `json:"client_secret"` //ClientSecret string `json:"client_secret"`
Config string `json:"config"` Config string `json:"config"`
CreateTime string `json:"create_time"` CreateTime string `json:"create_time"`
Status int `json:"status"` Status int `json:"status"`
UpdateTime string `json:"update_time"` UpdateTime string `json:"update_time"`
} }
func (this *ReportChannelListResponse) FromDb(in cronreportchannelmodel.CronReportChannel) { func (this *ReportChannelListResponse) FromDb(in cronreportchannelmodel.CronReportChannel) {
this.ReportChannelId = in.ReportChannelId this.ReportChannelId = in.ReportChannelId
this.ClientKey = in.ClientKey this.ClientKey = in.ClientKey
this.ClientSecret = in.ClientSecret //this.ClientSecret = in.ClientSecret
this.Config = in.Config this.Config = in.Config
this.CreateTime = in.CreateTime.Format("2006-01-02 15:04:05") this.CreateTime = in.CreateTime.Format("2006-01-02 15:04:05")
this.Status = in.Status this.Status = in.Status

6
app/services/cron_report_channel_service.go
View File

@ -35,9 +35,9 @@ func ReportChannelList(param backend.ReportChannelList) (list []cronreportchanne
if param.ClientKey != "" { if param.ClientKey != "" {
opts = append(opts, repo.WithLikeClientKey(param.ClientKey)) opts = append(opts, repo.WithLikeClientKey(param.ClientKey))
} }
if param.ClientSecret != "" { //if param.ClientSecret != "" {
opts = append(opts, repo.WithLikeClientSecret(param.ClientSecret)) // opts = append(opts, repo.WithLikeClientSecret(param.ClientSecret))
} //}
if len(param.UpdateTime) == 2 { if len(param.UpdateTime) == 2 {
opts = append(opts, repo.WithByUpdateDate(param.UpdateTime[0], param.UpdateTime[1])) opts = append(opts, repo.WithByUpdateDate(param.UpdateTime[0], param.UpdateTime[1]))
} }