kedaya_haitao/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: kedaya_haitao:f0e46a4116dd96492af4717016654b603b6fb807
Branches Tags
kedaya_haitao:main
kedaya_haitao:v1.0
...
compare: kedaya_haitao:ab25b7597c40bcc807e6a4f625bffb41afe3a419
Branches Tags
kedaya_haitao:main
kedaya_haitao:v1.0

2 Commits
f0e46a4116 ... ab25b7597c

Author SHA1 Message Date
timerzz
ab25b7597c feat go mod tidy
All checks were successful
Build image / build (push) Successful in 1m32s
Details
2024-05-14 20:41:11 +08:00
timerzz
1452122efd feat 抽离response 2024-05-14 20:39:12 +08:00
5 changed files with 10 additions and 11 deletions
Show Stats Expand all files Collapse all files

3
go.mod
View File

@ -3,7 +3,7 @@ module haitao_watcher
go 1.22.2
require (
gitea.timerzz.com/kedaya_haitao/common v0.0.0-20240513121252-d83795b6d236
gitea.timerzz.com/kedaya_haitao/common v0.0.0-20240514123648-99c3e85dbc18
github.com/go-resty/resty/v2 v2.13.1
github.com/gofiber/fiber/v3 v3.0.0-beta.2
github.com/golang/glog v1.2.1
@ -32,6 +32,7 @@ require (
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/coreos/go-iptables v0.7.0 // indirect
github.com/corpix/uarand v0.2.0 // indirect
github.com/ericlagergren/aegis v0.0.0-20230312195928-b4ce538b56f9 // indirect
github.com/ericlagergren/polyval v0.0.0-20220411101811-e25bc10ba391 // indirect
github.com/ericlagergren/siv v0.0.0-20220507050439-0b757b3aa5f1 // indirect

6
go.sum
View File

@ -1,6 +1,6 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
gitea.timerzz.com/kedaya_haitao/common v0.0.0-20240513121252-d83795b6d236 h1:1t5dh6l20cexlTqmGesIY2ClqrLBqy+OE8LAVp//JC8=
gitea.timerzz.com/kedaya_haitao/common v0.0.0-20240513121252-d83795b6d236/go.mod h1:jQhygETzidSqipdL3N77SJBJVEcvKYxdNDUPfIuHdL8=
gitea.timerzz.com/kedaya_haitao/common v0.0.0-20240514123648-99c3e85dbc18 h1:lTARBVopKcR47VJGzumhNDTmxc0QUpzHnk9AuD/6kfs=
gitea.timerzz.com/kedaya_haitao/common v0.0.0-20240514123648-99c3e85dbc18/go.mod h1:cgLy4gB0z2UZD3kBp1IAemt28dkaKNdt4RC0LNkE1I8=
github.com/3andne/restls-client-go v0.1.6 h1:tRx/YilqW7iHpgmEL4E1D8dAsuB0tFF3uvncS+B6I08=
github.com/3andne/restls-client-go v0.1.6/go.mod h1:iEdTZNt9kzPIxjIGSMScUFSBrUH6bFRNg0BWlP4orEY=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@ -51,6 +51,8 @@ github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
github.com/coreos/go-iptables v0.7.0 h1:XWM3V+MPRr5/q51NuWSgU0fqMad64Zyxs8ZUoMsamr8=
github.com/coreos/go-iptables v0.7.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q=
github.com/corpix/uarand v0.2.0 h1:U98xXwud/AVuCpkpgfPF7J5TQgr7R5tqT8VZP5KWbzE=
github.com/corpix/uarand v0.2.0/go.mod h1:/3Z1QIqWkDIhf6XWn/08/uMHoQ8JUoTIKc2iPchBOmM=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

6
pkg/model/response.go
View File

@ -1,6 +0,0 @@
package model
type ListResponse[E any] struct {
Total int64 `json:"total"`
List []E `json:"list"`
}

3
pkg/pusher/controller.go
View File

@ -3,6 +3,7 @@ package pusher
import (
"context"
"fmt"
"gitea.timerzz.com/kedaya_haitao/common/pkg/web"
"github.com/golang/glog"
"gorm.io/gorm"
"gorm.io/gorm/schema"
@ -93,7 +94,7 @@ type ListPusherInfoRequest struct {
All bool `query:"all"`
}
func (c *Controller) List(req ListPusherInfoRequest) (resp model.ListResponse[model.Pusher[*options.AnPushOption]], err error) {
func (c *Controller) List(req ListPusherInfoRequest) (resp web.ListResponse[model.Pusher[*options.AnPushOption]], err error) {
tx := c.db
if req.Keyword != "" {
tx = tx.Where("name LIKE ? or remark LIKE ?", fmt.Sprintf("%%%s%%", req.Keyword), fmt.Sprintf("%%%s%%", req.Keyword))

3
pkg/watcher/controller.go
View File

@ -4,6 +4,7 @@ import (
"context"
"fmt"
"gitea.timerzz.com/kedaya_haitao/common/pkg/proxy"
"gitea.timerzz.com/kedaya_haitao/common/pkg/web"
"github.com/golang/glog"
"gorm.io/gorm"
"gorm.io/gorm/clause"
@ -103,7 +104,7 @@ type ListWatcherInfoRequest struct {
Size int `query:"size"`
}
func (c *Controller) List(req ListWatcherInfoRequest) (resp model.ListResponse[model.Product], err error) {
func (c *Controller) List(req ListWatcherInfoRequest) (resp web.ListResponse[model.Product], err error) {
tx := c.db
if req.Keyword != "" {
tx = tx.Where("name LIKE ? or remark LIKE ?", fmt.Sprintf("%%%s%%", req.Keyword), fmt.Sprintf("%%%s%%", req.Keyword))