apps/gb28181
1
0
Fork 0
mirror of https://github.com/gowvp/gb28181.git synced 2025-12-24 12:12:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

代码重构

Browse Source
This commit is contained in:
xugo
2025-08-30 15:08:22 +08:00
parent 700159cf80
commit 40fa98dc98
14 changed files with 67 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
go.mod
View File

@@ -8,9 +8,8 @@ require (
github.com/gin-contrib/gzip v1.2.3
github.com/gin-gonic/gin v1.10.1
github.com/glebarez/sqlite v1.11.0
github.com/google/wire v0.6.0
github.com/gorilla/websocket v1.5.3
github.com/ixugo/goddd v1.3.9
github.com/google/wire v0.7.0
github.com/ixugo/goddd v1.3.15
github.com/jinzhu/copier v0.4.0
github.com/pelletier/go-toml/v2 v2.2.3
github.com/shirou/gopsutil/v4 v4.25.7

62
go.sum
View File

@@ -45,22 +45,18 @@ github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo=
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI=
github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/ixugo/goddd v1.3.9 h1:i3AducuSOrrUaRmoHfF1OuvoEvLP30mfw6g5E3dWz9w=
github.com/ixugo/goddd v1.3.9/go.mod h1:gb102fElow80HXqvrTlJ56eE5vFEYnI7Nx46Iw/m5eU=
github.com/google/wire v0.7.0 h1:JxUKI6+CVBgCO2WToKy/nQk0sS+amI9z9EjVmdaocj4=
github.com/google/wire v0.7.0/go.mod h1:n6YbUQD9cPKTnHXEBN2DXlOp/mVADhVErcMFb0v3J18=
github.com/ixugo/goddd v1.3.15 h1:zJiM3Ip2O1rNcVM1vtUXJhZsD8ijAzLIEtVuc9p8U6Q=
github.com/ixugo/goddd v1.3.15/go.mod h1:829JFdQV7V9rPbnEpH/7IzQ7mCw2Rs3ae9nLel4iCXA=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
@@ -143,7 +139,6 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -156,76 +151,27 @@ go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U=
go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ=
golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw=
golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=

4
internal/core/gb28181/gbs.go
View File

@@ -80,7 +80,7 @@ func (g GB28181) SaveChannels(channels []*Channel) error {
}
var dev Device
g.store.Device().Edit(context.TODO(), &dev, func(d *Device) {
_ = g.store.Device().Edit(context.TODO(), &dev, func(d *Device) {
d.Channels = len(channels)
}, orm.Where("device_id=?", channels[0].DeviceID))
@@ -93,7 +93,7 @@ func (g GB28181) SaveChannels(channels []*Channel) error {
}, orm.Where("device_id = ? AND channel_id = ?", channel.DeviceID, channel.ChannelID)); err != nil {
channel.ID = g.uni.UniqueID(bz.IDPrefixGBChannel)
channel.DID = dev.ID
g.store.Channel().Add(context.TODO(), channel)
_ = g.store.Channel().Add(context.TODO(), channel)
}
// chIDs = append(chIDs, channel.ID)
}

13
internal/web/api/api.go
View File

@@ -88,8 +88,8 @@ func setupRouter(r *gin.Engine, uc *Usecase) {
})
auth := web.AuthMiddleware(uc.Conf.Server.HTTP.JwtSecret)
r.GET("/health", web.WarpH(uc.getHealth))
r.GET("/app/metrics/api", web.WarpH(uc.getMetricsAPI))
r.GET("/health", web.WrapH(uc.getHealth))
r.GET("/app/metrics/api", web.WrapH(uc.getMetricsAPI))
versionapi.Register(r, uc.Version, auth)
statapi.Register(r)
@@ -102,6 +102,7 @@ func setupRouter(r *gin.Engine, uc *Usecase) {
registerSms(r, uc.SMSAPI, auth)
RegisterUser(r, uc.UserAPI, auth)
// 反向代理流媒体数据
r.Any("/proxy/sms/*path", uc.proxySMS)
}
@@ -225,12 +226,12 @@ func (uc *Usecase) proxySMS(c *gin.Context) {
req.URL.Path = path
}
proxy.ModifyResponse = func(r *http.Response) error {
r.Header.Del("access-control-allow-credentials")
r.Header.Del("access-control-allow-origin")
r.Header.Del("Access-Control-Allow-Credentials")
r.Header.Del("Access-Control-Allow-Origin")
if r.StatusCode >= 300 && r.StatusCode < 400 {
if l := r.Header.Get("location"); l != "" {
if l := r.Header.Get("Location"); l != "" {
if !strings.HasPrefix(l, "http") {
r.Header.Set("location", "/proxy/sms/"+strings.TrimPrefix(l, "/"))
r.Header.Set("Location", "/proxy/sms/"+strings.TrimPrefix(l, "/"))
}
}
}

14
internal/web/api/config.go
View File

@@ -28,14 +28,14 @@ func NewConfigAPI(db *gorm.DB, conf *conf.Bootstrap) ConfigAPI {
func registerConfig(g gin.IRouter, api ConfigAPI, handler ...gin.HandlerFunc) {
{
group := g.Group("/configs", handler...)
// group.GET("", web.WarpH(api.findConfig))
// group.GET("/:id", web.WarpH(api.getConfig))
// group.PUT("/:id", web.WarpH(api.editConfig))
// group.POST("", web.WarpH(api.addConfig))
// group.DELETE("/:id", web.WarpH(api.delConfig))
// group.GET("", web.WrapH(api.findConfig))
// group.GET("/:id", web.WrapH(api.getConfig))
// group.PUT("/:id", web.WrapH(api.editConfig))
// group.POST("", web.WrapH(api.addConfig))
// group.DELETE("/:id", web.WrapH(api.delConfig))
group.GET("/info", web.WarpH(api.getConfigInfo))
group.PUT("/info/sip", web.WarpH(api.editSIP))
group.GET("/info", web.WrapH(api.getConfigInfo))
group.PUT("/info/sip", web.WrapH(api.editSIP))
}
}

28
internal/web/api/gb28181.go
View File

@@ -68,28 +68,28 @@ func registerGB28181(g gin.IRouter, api GB28181API, handler ...gin.HandlerFunc)
})
{
group := g.Group("/devices", handler...)
group.GET("", web.WarpH(api.findDevice))
group.GET("/:id", web.WarpH(api.getDevice))
group.PUT("/:id", web.WarpH(api.editDevice))
group.POST("", web.WarpH(api.addDevice))
group.DELETE("/:id", web.WarpH(api.delDevice))
group.GET("", web.WrapH(api.findDevice))
group.GET("/:id", web.WrapH(api.getDevice))
group.PUT("/:id", web.WrapH(api.editDevice))
group.POST("", web.WrapH(api.addDevice))
group.DELETE("/:id", web.WrapH(api.delDevice))
group.POST("/:id/catalog", web.WarpH(api.queryCatalog)) // 刷新通道
group.POST("/:id/catalog", web.WrapH(api.queryCatalog)) // 刷新通道
group.GET("/channels", web.WarpH(api.FindChannelsForDevice))
group.GET("/channels", web.WrapH(api.FindChannelsForDevice))
}
{
group := g.Group("/channels", handler...)
group.GET("", web.WarpH(api.findChannel))
group.PUT("/:id", web.WarpH(api.editChannel))
group.POST("/:id/play", web.WarpH(api.play))
group.GET("", web.WrapH(api.findChannel))
group.PUT("/:id", web.WrapH(api.editChannel))
group.POST("/:id/play", web.WrapH(api.play))
group.POST("/:id/snapshot", web.WarpH(api.refreshSnapshot)) // 图像抓拍
group.POST("/:id/snapshot", web.WrapH(api.refreshSnapshot)) // 图像抓拍
group.GET("/:id/snapshot", api.getSnapshot) // 获取图像
// group.GET("/:id", web.WarpH(api.getChannel))
// group.POST("", web.WarpH(api.addChannel))
// group.DELETE("/:id", web.WarpH(api.delChannel))
// group.GET("/:id", web.WrapH(api.getChannel))
// group.POST("", web.WrapH(api.addChannel))
// group.DELETE("/:id", web.WrapH(api.delChannel))
}
}

33
internal/web/api/notify.go
View File

@@ -1,33 +0,0 @@
package api
import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/gorilla/websocket"
"github.com/ixugo/goddd/pkg/web"
)
// socketUpgrade 函数用于将HTTP连接升级为WebSocket连接
func socketUpgrade(w http.ResponseWriter, r *http.Request) (*websocket.Conn, error) {
socket := websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool {
return true
},
ReadBufferSize: 1024 * 2,
WriteBufferSize: 1024,
}
return socket.Upgrade(w, r, nil)
}
func registerNotify(g gin.IRouter, handler ...gin.HandlerFunc) {
group := g.Group("/notify")
group.POST("/messages", func(c *gin.Context) {
conn, err := socketUpgrade(c.Writer, c.Request)
if err != nil {
web.Fail(c, err)
return
}
defer conn.Close()
})
}

6
internal/web/api/provider.go
View File

@@ -85,15 +85,15 @@ func NewHTTPHandler(uc *Usecase) http.Handler {
// NewUniqueID 唯一 id 生成器
func NewUniqueID(db *gorm.DB) uniqueid.Core {
return uniqueid.NewCore(uniqueiddb.NewDB(db).AutoMigrate(orm.EnabledAutoMigrate), 5)
return uniqueid.NewCore(uniqueiddb.NewDB(db).AutoMigrate(orm.GetEnabledAutoMigrate()), 5)
}
func NewPushCore(db *gorm.DB, uni uniqueid.Core) push.Core {
return push.NewCore(pushdb.NewDB(db).AutoMigrate(orm.EnabledAutoMigrate), uni)
return push.NewCore(pushdb.NewDB(db).AutoMigrate(orm.GetEnabledAutoMigrate()), uni)
}
func NewGB28181Store(db *gorm.DB) gb28181.Storer {
return gb28181cache.NewCache(gb28181db.NewDB(db).AutoMigrate(orm.EnabledAutoMigrate))
return gb28181cache.NewCache(gb28181db.NewDB(db).AutoMigrate(orm.GetEnabledAutoMigrate()))
}
func NewGB28181(store gb28181.Storer, uni uniqueid.Core) gb28181.GB28181 {

10
internal/web/api/proxy.go
View File

@@ -23,11 +23,11 @@ func NewProxyAPI(db *gorm.DB, uni uniqueid.Core) ProxyAPI {
func registerProxy(g gin.IRouter, api ProxyAPI, handler ...gin.HandlerFunc) {
{
group := g.Group("/stream_proxys", handler...)
group.GET("", web.WarpH(api.findStreamProxy))
group.GET("/:id", web.WarpH(api.getStreamProxy))
group.PUT("/:id", web.WarpH(api.editStreamProxy))
group.POST("", web.WarpH(api.addStreamProxy))
group.DELETE("/:id", web.WarpH(api.delStreamProxy))
group.GET("", web.WrapH(api.findStreamProxy))
group.GET("/:id", web.WrapH(api.getStreamProxy))
group.PUT("/:id", web.WrapH(api.editStreamProxy))
group.POST("", web.WrapH(api.addStreamProxy))
group.DELETE("/:id", web.WrapH(api.delStreamProxy))
}
}

14
internal/web/api/push.go
View File

@@ -27,17 +27,17 @@ func NewPushAPI(mc push.Core, sc sms.Core, conf *conf.Bootstrap) PushAPI {
func registerPushAPI(g gin.IRouter, api PushAPI, handler ...gin.HandlerFunc) {
{
group := g.Group("/stream_pushs", handler...)
group.GET("", web.WarpH(api.findStreamPush))
group.GET("/:id", web.WarpH(api.getStreamPush))
group.PUT("/:id", web.WarpH(api.editStreamPush))
group.POST("", web.WarpH(api.addStreamPush))
group.DELETE("/:id", web.WarpH(api.delStreamPush))
group.GET("", web.WrapH(api.findStreamPush))
group.GET("/:id", web.WrapH(api.getStreamPush))
group.PUT("/:id", web.WrapH(api.editStreamPush))
group.POST("", web.WrapH(api.addStreamPush))
group.DELETE("/:id", web.WrapH(api.delStreamPush))
}
}
// >>> streamPush >>>>>>>>>>>>>>>>>>>>
func (a PushAPI) findStreamPush(c *gin.Context, in *push.FindStreamPushInput) (*web.PageOutput, error) {
func (a PushAPI) findStreamPush(c *gin.Context, in *push.FindStreamPushInput) (*web.PageOutput[*push.FindStreamPushOutputItem], error) {
items, total, err := a.pushCore.FindStreamPush(c.Request.Context(), in)
if err != nil {
return nil, err
@@ -71,7 +71,7 @@ func (a PushAPI) findStreamPush(c *gin.Context, in *push.FindStreamPushInput) (*
PushAddrs: rtmpAddrs,
}
}
return &web.PageOutput{Items: out, Total: total}, err
return &web.PageOutput[*push.FindStreamPushOutputItem]{Items: out, Total: total}, err
}
func (a PushAPI) getStreamPush(c *gin.Context, _ *struct{}) (*push.StreamPush, error) {

10
internal/web/api/sms.go
View File

@@ -32,12 +32,12 @@ func NewSmsAPI(core sms.Core) SmsAPI {
func registerSms(g gin.IRouter, api SmsAPI, handler ...gin.HandlerFunc) {
{
group := g.Group("/media_servers", handler...)
group.GET("", web.WarpH(api.findMediaServer))
group.PUT("/:id", web.WarpH(api.editMediaServer))
group.GET("", web.WrapH(api.findMediaServer))
group.PUT("/:id", web.WrapH(api.editMediaServer))
// group.GET("/:id", web.WarpH(api.getMediaServer))
// group.POST("", web.WarpH(api.addMediaServer))
// group.DELETE("/:id", web.WarpH(api.delMediaServer))
// group.GET("/:id", web.WrapH(api.getMediaServer))
// group.POST("", web.WrapH(api.addMediaServer))
// group.DELETE("/:id", web.WrapH(api.delMediaServer))
}
}

6
internal/web/api/user.go
View File

@@ -21,8 +21,8 @@ func NewUserAPI(conf *conf.Bootstrap) UserAPI {
func RegisterUser(r gin.IRouter, api UserAPI, mid ...gin.HandlerFunc) {
group := r.Group("/user")
group.POST("/login", web.WarpH(api.login))
group.PUT("/user", web.WarpHs(api.updateCredentials, mid...)...)
group.POST("/login", web.WrapH(api.login))
group.PUT("/user", web.WrapHs(api.updateCredentials, mid...)...)
}
// 登录请求结构体
@@ -68,7 +68,7 @@ type updateCredentialsInput struct {
}
// 修改凭据接口
func (api UserAPI) updateCredentials(c *gin.Context, in *updateCredentialsInput) (gin.H, error) {
func (api UserAPI) updateCredentials(_ *gin.Context, in *updateCredentialsInput) (gin.H, error) {
// 更新配置中的用户名和密码
api.conf.Server.Username = in.Username
api.conf.Server.Password = in.Password

14
internal/web/api/zlm_webhook.go
View File

@@ -37,13 +37,13 @@ func NewWebHookAPI(core sms.Core, mediaCore push.Core, conf *conf.Bootstrap, gbs
func registerZLMWebhookAPI(r gin.IRouter, api WebHookAPI, handler ...gin.HandlerFunc) {
{
group := r.Group("/webhook", handler...)
group.POST("/on_server_keepalive", web.WarpH(api.onServerKeepalive))
group.POST("/on_stream_changed", web.WarpH(api.onStreamChanged))
group.POST("/on_publish", web.WarpH(api.onPublish))
group.POST("/on_play", web.WarpH(api.onPlay))
group.POST("/on_stream_none_reader", web.WarpH(api.onStreamNoneReader))
group.POST("/on_rtp_server_timeout", web.WarpH(api.onRTPServerTimeout))
group.POST("/on_stream_not_found", web.WarpH(api.onStreamNotFound))
group.POST("/on_server_keepalive", web.WrapH(api.onServerKeepalive))
group.POST("/on_stream_changed", web.WrapH(api.onStreamChanged))
group.POST("/on_publish", web.WrapH(api.onPublish))
group.POST("/on_play", web.WrapH(api.onPlay))
group.POST("/on_stream_none_reader", web.WrapH(api.onStreamNoneReader))
group.POST("/on_rtp_server_timeout", web.WrapH(api.onRTPServerTimeout))
group.POST("/on_stream_not_found", web.WrapH(api.onStreamNotFound))
}
}

2
plugin/stat/statapi/statapi.go
View File

@@ -11,7 +11,7 @@ import (
func Register(g gin.IRouter, hf ...gin.HandlerFunc) {
stat := g.Group("/stats", hf...)
stat.GET("", web.WarpH(findStat))
stat.GET("", web.WrapH(findStat))
}
func findStat(_ *gin.Context, _ *struct{}) (gin.H, error) {