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 17:23:12 +08:00
parent 3f1f2286e1
commit 46bcfec6a0
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,12 +15,14 @@ type ReportChannelListRequest struct {
//ClientSecret string `json:"client_secret" form:"client_secret"`
CreateTime []string `json:"create_time" form:"create_time"`
UpdateTime []string `json:"update_time" form:"update_time"`
ChannelName string `json:"channel_name" form:"channel_name"`
}
type ReportChannelList struct {
entities.PageRequest
ReportChannelId int `json:"report_channel_id" form:"report_channel_id" validate:"min=0"`
Status int `json:"status" form:"status"`
ChannelName string `json:"channel_name" form:"channel_name"`
ClientKey string `json:"client_key" form:"client_key"`
//ClientSecret string `json:"client_secret" form:"client_secret"`
CreateTime []time.Time `json:"create_time" form:"create_time"`
@ -31,6 +33,7 @@ func (this *ReportChannelListRequest) Request2DB() (filter ReportChannelList, er
filter.PageRequest = this.PageRequest
filter.ReportChannelId = this.ReportChannelId
filter.ClientKey = this.ClientKey
filter.ChannelName = this.ChannelName
//filter.ClientSecret = this.ClientSecret
filter.Status = this.Status
filter.CreateTime = []time.Time{}
@ -59,6 +62,7 @@ func (this *ReportChannelListRequest) Request2DB() (filter ReportChannelList, er
type ReportChannelListResponse struct {
ReportChannelId int `json:"report_channel_id"`
ChannelName string `json:"channel_name"`
ClientKey string `json:"client_key"`
//ClientSecret string `json:"client_secret"`
Config string `json:"config"`
@ -70,7 +74,7 @@ type ReportChannelListResponse struct {
func (this *ReportChannelListResponse) FromDb(in cronreportchannelmodel.CronReportChannel) {
this.ReportChannelId = in.ReportChannelId
this.ClientKey = in.ClientKey
//this.ClientSecret = in.ClientSecret
this.ChannelName = in.ChannelName
this.Config = in.Config
this.CreateTime = in.CreateTime.Format("2006-01-02 15:04:05")
this.Status = in.Status
@ -78,6 +82,7 @@ func (this *ReportChannelListResponse) FromDb(in cronreportchannelmodel.CronRepo
}
type ReportChannelCreateRequest struct {
ChannelName string `json:"channel_name" validate:"required" label:"名称"`
ClientKey string `json:"client_key" validate:"required" label:"服务key"`
ClientSecret string `json:"client_secret" validate:"required" label:"服务secret"`
Config string `json:"config" validate:"required" label:"服务配置"`
@ -85,6 +90,7 @@ type ReportChannelCreateRequest struct {
}
func (this *ReportChannelCreateRequest) Request2DB() (db cronreportchannelmodel.CronReportChannel) {
db.ChannelName = this.ChannelName
db.ClientKey = this.ClientKey
db.ClientSecret = this.ClientSecret
db.Config = this.Config
@ -94,6 +100,7 @@ func (this *ReportChannelCreateRequest) Request2DB() (db cronreportchannelmodel.
type ReportChannelUpdateRequest struct {
ReportChannelId int `json:"report_channel_id" validate:"required" `
ChannelName string `json:"channel_name" label:"名称"`
ClientKey string `json:"client_key" label:"配置key"`
ClientSecret string `json:"client_secret" label:"配置密钥"`
Config string `json:"config" label:"配置"`
@ -103,6 +110,7 @@ type ReportChannelUpdateRequest struct {
func (this *ReportChannelUpdateRequest) Request2DB() (db cronreportchannelmodel.CronReportChannel) {
db.ReportChannelId = this.ReportChannelId
db.ClientKey = this.ClientKey
db.ChannelName = this.ChannelName
db.ClientSecret = this.ClientSecret
db.Config = this.Config
db.Status = this.Status

1
app/models/cronreportchannelmodel/cron_report_channel.go
View File

@ -14,6 +14,7 @@ var (
// 实体
type CronReportChannel struct {
ReportChannelId int `xorm:"'report_channel_id' UNSIGNED INT pk autoincr"`
ChannelName string `xorm:"'channel_name' varchar(20)"`
ClientKey string `xorm:"'client_key' varchar(20)"`
ClientSecret string `xorm:"'client_secret' varchar(50)"`
Config string `xorm:"'config' JSON"`

6
app/repository/cron_report_channel.go
View File

@ -21,6 +21,12 @@ func (c *ReportChannel) WithByID(id int) DBOption {
}
}
func (c *ReportChannel) WithByName(name string) DBOption {
return func(g *xorm.Session) *xorm.Session {
return g.Where("channel_name like '%?%'", name)
}
}
func (c *ReportChannel) WithLikeClientKey(ClientKey string) DBOption {
return func(g *xorm.Session) *xorm.Session {
return g.Where("client_key like ?", "%"+ClientKey+"%")

4
app/services/cron_report_channel_service.go
View File

@ -44,6 +44,10 @@ func ReportChannelList(param backend.ReportChannelList) (list []cronreportchanne
if len(param.CreateTime) == 2 {
opts = append(opts, repo.WithByDate(param.CreateTime[0], param.CreateTime[1]))
}
if param.ChannelName != "" {
opts = append(opts, repo.WithByName(param.ChannelName))
}
total, err = repo.FindAndCount(&list, opts...)
return