From 0691f280c288edc319f8dfcda0c9b9a0c9d96489 Mon Sep 17 00:00:00 2001 From: CDCDDCDC <792192820@qq.com> Date: Sun, 13 Jul 2025 20:34:54 +0800 Subject: [PATCH] =?UTF-8?q?example:=20=E4=BE=8B=E5=AD=90=E6=9B=B4=E6=96=B0?= =?UTF-8?q?go=20mod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 -- example/intercom/config.yaml | 4 +-- example/intercom/event.go | 3 +++ example/intercom/go.mod | 9 +++---- example/intercom/go.sum | 14 +++++----- example/jt1078/docker_video_config.yaml | 12 ++++----- example/jt1078/go.mod | 18 ++++++------- example/jt1078/go.sum | 36 ++++++++++++------------- example/simulation/go.mod | 7 +++-- example/simulation/go.sum | 14 +++++----- example/video/go.mod | 7 +++-- example/video/go.sum | 14 +++++----- 12 files changed, 66 insertions(+), 74 deletions(-) diff --git a/README.md b/README.md index 2b3a534..7b7aec1 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ ![MIT License](https://img.shields.io/github/license/cuteLittleDevil/m7s-jt1078) [![Go Report Card](https://goreportcard.com/badge/github.com/cuteLittleDevil/m7s-jt1078/v5)](https://goreportcard.com/report/github.com/cuteLittleDevil/m7s-jt1078/v5) ![Latest Release](https://img.shields.io/github/v/release/cuteLittleDevil/m7s-jt1078) -![Release](https://github.com/cuteLittleDevil/m7s-jt1078/actions/workflows/mac.yml/badge.svg) -![Release](https://github.com/cuteLittleDevil/m7s-jt1078/actions/workflows/win.yml/badge.svg) ![Release](https://github.com/cuteLittleDevil/m7s-jt1078/actions/workflows/ubuntu.yml/badge.svg) [![Docker Image Size](https://img.shields.io/docker/image-size/cdcddcdc/m7s-jt1078/latest)](https://hub.docker.com/r/cdcddcdc/m7s-jt1078) diff --git a/example/intercom/config.yaml b/example/intercom/config.yaml index c2adfe3..4efb4f0 100644 --- a/example/intercom/config.yaml +++ b/example/intercom/config.yaml @@ -29,8 +29,8 @@ jt1078: playback: # 回放视频 addr: '0.0.0.0:12052' - on_join_url: "https://127.0.0.1:12000/api/v1/play-back-join" - on_leave_url: "https://127.0.0.1:12000/api/v1/play-back-leave" + on_join_url: "https://127.0.0.1:12000/api/v1/jt808/play-back-join" + on_leave_url: "https://127.0.0.1:12000/api/v1/jt808/play-back-leave" prefix: "live/jt1079" # 默认自定义前缀-手机号-通道 如：live/jt1079-295696659617-1 overtime_second: 0 # 无人订阅的情况 多久就关闭这个链接（小于等于0则不启用 默认0 推荐还是使用9102指令去触发关闭) diff --git a/example/intercom/event.go b/example/intercom/event.go index 410d3eb..56e7922 100644 --- a/example/intercom/event.go +++ b/example/intercom/event.go @@ -60,6 +60,7 @@ func onEventRealTimeJoin(c *gin.Context) { StreamPath string `json:"streamPath"` Sim string `json:"sim"` Channel int `json:"channel"` + StartTime string `json:"startTime"` } var req Request if err := c.BindJSON(&req); err != nil { @@ -83,6 +84,8 @@ func onEventRealTimeLeave(c *gin.Context) { StreamPath string `json:"streamPath"` Sim string `json:"sim"` Channel int `json:"channel"` + StartTime string `json:"startTime"` + EndTime string `json:"endTime"` } var req Request if err := c.BindJSON(&req); err != nil { diff --git a/example/intercom/go.mod b/example/intercom/go.mod index 54e7e85..c13f143 100644 --- a/example/intercom/go.mod +++ b/example/intercom/go.mod @@ -6,9 +6,10 @@ require ( github.com/cuteLittleDevil/go-jt808/protocol v1.16.0 github.com/cuteLittleDevil/go-jt808/service v1.11.0 github.com/cuteLittleDevil/go-jt808/shared v1.6.0 - github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0 + github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1 github.com/gin-gonic/gin v1.10.1 - m7s.live/v5 v5.0.2 + github.com/pion/rtp v1.8.10 + m7s.live/v5 v5.0.3 ) require ( @@ -29,7 +30,6 @@ require ( github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.20.0 // indirect - github.com/go-resty/resty/v2 v2.16.5 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/gobwas/httphead v0.1.0 // indirect @@ -76,7 +76,6 @@ require ( github.com/pion/mdns v0.0.12 // indirect github.com/pion/randutil v0.1.0 // indirect github.com/pion/rtcp v1.2.15 // indirect - github.com/pion/rtp v1.8.10 // indirect github.com/pion/sctp v1.8.35 // indirect github.com/pion/sdp/v3 v3.0.9 // indirect github.com/pion/srtp/v2 v2.0.20 // indirect @@ -124,5 +123,5 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.5.7 // indirect gorm.io/driver/postgres v1.5.9 // indirect - gorm.io/gorm v1.25.11 // indirect + gorm.io/gorm v1.30.0 // indirect ) diff --git a/example/intercom/go.sum b/example/intercom/go.sum index 0677025..cc5b88b 100644 --- a/example/intercom/go.sum +++ b/example/intercom/go.sum @@ -24,8 +24,8 @@ github.com/cuteLittleDevil/go-jt808/service v1.11.0 h1:+unxCBMitYRIpjka5FcIKSFjV github.com/cuteLittleDevil/go-jt808/service v1.11.0/go.mod h1:sjfTZKpMMPa3FLgFn56j5DvLATy4hJ54FbgDkE82QXw= github.com/cuteLittleDevil/go-jt808/shared v1.6.0 h1:aJ6a8f3AVS47p5Nja7+/kLRqhnRcv+j/7Jmd+SpnkQ4= github.com/cuteLittleDevil/go-jt808/shared v1.6.0/go.mod h1:BMWFmkDRLNjcXcuiPm/yphfWfZ6xNuTAJDkDDNhysOM= -github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0 h1:XMn2u2qlC0EmrKv+5ILymCBeTs0Oh/tI/9fSlpOxLvU= -github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0/go.mod h1:U0rfzfNXGUl+3+/jM0/vsBvbNI/F7m5xGKmyl6YnKx0= +github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1 h1:/nxU2iPfq9CeTC8oh6eC4vuDgBhjz/oCHbSPrrFKQQ0= +github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1/go.mod h1:Q69DAQIdUULhT5B3AEQN5Bqp2Nbk5Wok+OMS1GtakEo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -53,8 +53,6 @@ github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBEx github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI= github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow= -github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= -github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= @@ -358,8 +356,8 @@ gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkD gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8= gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= -gorm.io/gorm v1.25.11 h1:/Wfyg1B/je1hnDx3sMkX+gAlxrlZpn6X0BXRlwXlvHg= -gorm.io/gorm v1.25.11/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= -m7s.live/v5 v5.0.2 h1:QpKm5WNkJNvaRnblelqTZGik7P7IsImjlHwnf9cSow8= -m7s.live/v5 v5.0.2/go.mod h1:qpLysNpSNVxPgzRVcvOqKAQxWpefd9lRzDbQn+ZhRCY= +gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs= +gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= +m7s.live/v5 v5.0.3 h1:S6ojmKUUOFfJXNXpcMbJXWJbzgzSErSv2yinccu+8hs= +m7s.live/v5 v5.0.3/go.mod h1:UO0nxUNUEXz4+n3YpqC+FEe5cmi0inpq1B9fyZLJWrs= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= diff --git a/example/jt1078/docker_video_config.yaml b/example/jt1078/docker_video_config.yaml index f271890..2a8eef1 100644 --- a/example/jt1078/docker_video_config.yaml +++ b/example/jt1078/docker_video_config.yaml @@ -18,21 +18,21 @@ jt1078: port: 10010 # 对讲默认udp端口 ip: "101.35.2.3" # 外网ip 用于SDP协商修改 audio_ports: [10020, 10050] # 音频端口范围 [min,max] - on_join_url: "https://127.0.0.1:10001/api/v1/jt808/event/join-audio" # 设备连接到音频端口的回调 - on_leave_url: "https://127.0.0.1:10001/api/v1/jt808/event/leave-audio" # 设备断开了音频端口的回调 + on_join_url: "http://127.0.0.1:10001/api/v1/jt808/event/join-audio" # 设备连接到音频端口的回调 + on_leave_url: "http://127.0.0.1:10001/api/v1/jt808/event/leave-audio" # 设备断开了音频端口的回调 overtime_second: 60 # 多久没有下发对讲语言的数据 就关闭这个链接 realtime: # 实时视频 addr: '0.0.0.0:10051' - on_join_url: "https://127.0.0.1:10001/api/v1/jt808/event/real-time-join" - on_leave_url: "https://127.0.0.1:10001/api/v1/jt808/event/real-time-leave" + on_join_url: "http://127.0.0.1:10001/api/v1/jt808/event/real-time-join" + on_leave_url: "http://127.0.0.1:10001/api/v1/jt808/event/real-time-leave" prefix: "live/jt1078" # 默认自定义前缀-手机号-通道 如：live/jt1078-295696659617-1 overtime_second: 0 # 无人订阅的情况 多久就关闭这个链接（小于等于0则不启用 默认0 推荐还是使用9102指令去触发关闭) playback: # 回放视频 addr: '0.0.0.0:10052' - on_join_url: "https://127.0.0.1:10001/api/v1/play-back-join" - on_leave_url: "https://127.0.0.1:10001/api/v1/play-back-leave" + on_join_url: "http://127.0.0.1:10001/api/v1/jt808/play-back-join" + on_leave_url: "http://127.0.0.1:10001/api/v1/jt808/play-back-leave" prefix: "live/jt1079" # 默认自定义前缀-手机号-通道 如：live/jt1079-295696659617-1 overtime_second: 0 # 无人订阅的情况 多久就关闭这个链接（小于等于0则不启用 默认0 推荐还是使用9102指令去触发关闭) diff --git a/example/jt1078/go.mod b/example/jt1078/go.mod index b2e1c48..b32b4ac 100644 --- a/example/jt1078/go.mod +++ b/example/jt1078/go.mod @@ -3,8 +3,8 @@ module jt1078 go 1.23.8 require ( - github.com/cuteLittleDevil/m7s-jt1078/v5 v5.6.0 - m7s.live/v5 v5.0.2 + github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0 + m7s.live/v5 v5.0.3 ) require ( @@ -94,14 +94,14 @@ require ( github.com/yapingcat/gomedia v0.0.0-20240601043430-920523f8e5c7 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.uber.org/mock v0.5.0 // indirect - golang.org/x/crypto v0.38.0 // indirect + golang.org/x/crypto v0.39.0 // indirect golang.org/x/exp v0.0.0-20240716175740-e3f259677ff7 // indirect - golang.org/x/mod v0.19.0 // indirect - golang.org/x/net v0.40.0 // indirect - golang.org/x/sync v0.14.0 // indirect + golang.org/x/mod v0.25.0 // indirect + golang.org/x/net v0.41.0 // indirect + golang.org/x/sync v0.15.0 // indirect golang.org/x/sys v0.33.0 // indirect - golang.org/x/text v0.25.0 // indirect - golang.org/x/tools v0.23.0 // indirect + golang.org/x/text v0.26.0 // indirect + golang.org/x/tools v0.33.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect google.golang.org/grpc v1.65.0 // indirect @@ -109,5 +109,5 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.5.7 // indirect gorm.io/driver/postgres v1.5.9 // indirect - gorm.io/gorm v1.25.11 // indirect + gorm.io/gorm v1.30.0 // indirect ) diff --git a/example/jt1078/go.sum b/example/jt1078/go.sum index bcfcc94..056a8e9 100644 --- a/example/jt1078/go.sum +++ b/example/jt1078/go.sum @@ -18,8 +18,8 @@ github.com/cilium/ebpf v0.15.0 h1:7NxJhNiBT3NG8pZJ3c+yfrVdHY8ScgKD27sScgjLMMk= github.com/cilium/ebpf v0.15.0/go.mod h1:DHp1WyrLeiBh19Cf/tfiSMhqheEiK8fXFZ4No0P1Hso= github.com/cuteLittleDevil/go-jt808/protocol v1.16.0 h1:svWxOTAfKLchDp/5kwwVVhoFprLM98QJUgmYCs5ixj8= github.com/cuteLittleDevil/go-jt808/protocol v1.16.0/go.mod h1:5wF2o2JCjVVj/oAqkwvCzgu23UYMrnDO+PkhiS0/egs= -github.com/cuteLittleDevil/m7s-jt1078/v5 v5.6.0 h1:z6b6FFyJFACf3RJIS23fP5+Z+UV5nuoCCeU60cAyvRA= -github.com/cuteLittleDevil/m7s-jt1078/v5 v5.6.0/go.mod h1:IruDxdWBKu72A2obGE31QQaqLdBdXc/V0tBiDvn294o= +github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0 h1:XMn2u2qlC0EmrKv+5ILymCBeTs0Oh/tI/9fSlpOxLvU= +github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0/go.mod h1:U0rfzfNXGUl+3+/jM0/vsBvbNI/F7m5xGKmyl6YnKx0= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -241,14 +241,14 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= -golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= +golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= golang.org/x/exp v0.0.0-20240716175740-e3f259677ff7 h1:wDLEX9a7YQoKdKNQt88rtydkqDxeGaBUTnIYc3iG/mA= golang.org/x/exp v0.0.0-20240716175740-e3f259677ff7/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= 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.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= -golang.org/x/mod v0.19.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= @@ -257,13 +257,13 @@ golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= -golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= +golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= 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.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= -golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= +golang.org/x/sync v0.15.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-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -296,16 +296,16 @@ 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.12.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.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= -golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= +golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= 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.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= -golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= +golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= +golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= 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/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d h1:kHjw/5UfflP/L5EbledDrcG4C2597RtymmGRZvHiCuY= @@ -329,7 +329,7 @@ gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkD gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8= gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= -gorm.io/gorm v1.25.11 h1:/Wfyg1B/je1hnDx3sMkX+gAlxrlZpn6X0BXRlwXlvHg= -gorm.io/gorm v1.25.11/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= -m7s.live/v5 v5.0.2 h1:QpKm5WNkJNvaRnblelqTZGik7P7IsImjlHwnf9cSow8= -m7s.live/v5 v5.0.2/go.mod h1:qpLysNpSNVxPgzRVcvOqKAQxWpefd9lRzDbQn+ZhRCY= +gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs= +gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= +m7s.live/v5 v5.0.3 h1:S6ojmKUUOFfJXNXpcMbJXWJbzgzSErSv2yinccu+8hs= +m7s.live/v5 v5.0.3/go.mod h1:UO0nxUNUEXz4+n3YpqC+FEe5cmi0inpq1B9fyZLJWrs= diff --git a/example/simulation/go.mod b/example/simulation/go.mod index fec89d6..1e84ac7 100644 --- a/example/simulation/go.mod +++ b/example/simulation/go.mod @@ -3,8 +3,8 @@ module simulation go 1.23.8 require ( - github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0 - m7s.live/v5 v5.0.2 + github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1 + m7s.live/v5 v5.0.3 ) require ( @@ -18,7 +18,6 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/deepch/vdk v0.0.27 // indirect github.com/go-ole/go-ole v1.3.0 // indirect - github.com/go-resty/resty/v2 v2.16.5 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/gobwas/httphead v0.1.0 // indirect @@ -102,5 +101,5 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.5.7 // indirect gorm.io/driver/postgres v1.5.9 // indirect - gorm.io/gorm v1.25.11 // indirect + gorm.io/gorm v1.30.0 // indirect ) diff --git a/example/simulation/go.sum b/example/simulation/go.sum index 924250c..49ecd33 100644 --- a/example/simulation/go.sum +++ b/example/simulation/go.sum @@ -12,8 +12,8 @@ github.com/cilium/ebpf v0.15.0 h1:7NxJhNiBT3NG8pZJ3c+yfrVdHY8ScgKD27sScgjLMMk= github.com/cilium/ebpf v0.15.0/go.mod h1:DHp1WyrLeiBh19Cf/tfiSMhqheEiK8fXFZ4No0P1Hso= github.com/cuteLittleDevil/go-jt808/protocol v1.16.0 h1:svWxOTAfKLchDp/5kwwVVhoFprLM98QJUgmYCs5ixj8= github.com/cuteLittleDevil/go-jt808/protocol v1.16.0/go.mod h1:5wF2o2JCjVVj/oAqkwvCzgu23UYMrnDO+PkhiS0/egs= -github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0 h1:XMn2u2qlC0EmrKv+5ILymCBeTs0Oh/tI/9fSlpOxLvU= -github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0/go.mod h1:U0rfzfNXGUl+3+/jM0/vsBvbNI/F7m5xGKmyl6YnKx0= +github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1 h1:/nxU2iPfq9CeTC8oh6eC4vuDgBhjz/oCHbSPrrFKQQ0= +github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1/go.mod h1:Q69DAQIdUULhT5B3AEQN5Bqp2Nbk5Wok+OMS1GtakEo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -27,8 +27,6 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI= github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow= -github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= -github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= @@ -305,7 +303,7 @@ gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkD gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8= gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= -gorm.io/gorm v1.25.11 h1:/Wfyg1B/je1hnDx3sMkX+gAlxrlZpn6X0BXRlwXlvHg= -gorm.io/gorm v1.25.11/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= -m7s.live/v5 v5.0.2 h1:QpKm5WNkJNvaRnblelqTZGik7P7IsImjlHwnf9cSow8= -m7s.live/v5 v5.0.2/go.mod h1:qpLysNpSNVxPgzRVcvOqKAQxWpefd9lRzDbQn+ZhRCY= +gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs= +gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= +m7s.live/v5 v5.0.3 h1:S6ojmKUUOFfJXNXpcMbJXWJbzgzSErSv2yinccu+8hs= +m7s.live/v5 v5.0.3/go.mod h1:UO0nxUNUEXz4+n3YpqC+FEe5cmi0inpq1B9fyZLJWrs= diff --git a/example/video/go.mod b/example/video/go.mod index bf73680..35a9959 100644 --- a/example/video/go.mod +++ b/example/video/go.mod @@ -6,9 +6,9 @@ require ( github.com/cuteLittleDevil/go-jt808/protocol v1.16.0 github.com/cuteLittleDevil/go-jt808/service v1.11.0 github.com/cuteLittleDevil/go-jt808/shared v1.6.0 - github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0 + github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1 github.com/gin-gonic/gin v1.10.0 - m7s.live/v5 v5.0.2 + m7s.live/v5 v5.0.3 ) require ( @@ -29,7 +29,6 @@ require ( github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.20.0 // indirect - github.com/go-resty/resty/v2 v2.16.5 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/gobwas/httphead v0.1.0 // indirect @@ -124,5 +123,5 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.5.7 // indirect gorm.io/driver/postgres v1.5.9 // indirect - gorm.io/gorm v1.25.11 // indirect + gorm.io/gorm v1.30.0 // indirect ) diff --git a/example/video/go.sum b/example/video/go.sum index 9c17e31..b0f743d 100644 --- a/example/video/go.sum +++ b/example/video/go.sum @@ -24,8 +24,8 @@ github.com/cuteLittleDevil/go-jt808/service v1.11.0 h1:+unxCBMitYRIpjka5FcIKSFjV github.com/cuteLittleDevil/go-jt808/service v1.11.0/go.mod h1:sjfTZKpMMPa3FLgFn56j5DvLATy4hJ54FbgDkE82QXw= github.com/cuteLittleDevil/go-jt808/shared v1.6.0 h1:aJ6a8f3AVS47p5Nja7+/kLRqhnRcv+j/7Jmd+SpnkQ4= github.com/cuteLittleDevil/go-jt808/shared v1.6.0/go.mod h1:BMWFmkDRLNjcXcuiPm/yphfWfZ6xNuTAJDkDDNhysOM= -github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0 h1:XMn2u2qlC0EmrKv+5ILymCBeTs0Oh/tI/9fSlpOxLvU= -github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.0/go.mod h1:U0rfzfNXGUl+3+/jM0/vsBvbNI/F7m5xGKmyl6YnKx0= +github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1 h1:/nxU2iPfq9CeTC8oh6eC4vuDgBhjz/oCHbSPrrFKQQ0= +github.com/cuteLittleDevil/m7s-jt1078/v5 v5.8.1/go.mod h1:Q69DAQIdUULhT5B3AEQN5Bqp2Nbk5Wok+OMS1GtakEo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -53,8 +53,6 @@ github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBEx github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI= github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow= -github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= -github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= @@ -358,8 +356,8 @@ gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkD gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8= gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= -gorm.io/gorm v1.25.11 h1:/Wfyg1B/je1hnDx3sMkX+gAlxrlZpn6X0BXRlwXlvHg= -gorm.io/gorm v1.25.11/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= -m7s.live/v5 v5.0.2 h1:QpKm5WNkJNvaRnblelqTZGik7P7IsImjlHwnf9cSow8= -m7s.live/v5 v5.0.2/go.mod h1:qpLysNpSNVxPgzRVcvOqKAQxWpefd9lRzDbQn+ZhRCY= +gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs= +gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= +m7s.live/v5 v5.0.3 h1:S6ojmKUUOFfJXNXpcMbJXWJbzgzSErSv2yinccu+8hs= +m7s.live/v5 v5.0.3/go.mod h1:UO0nxUNUEXz4+n3YpqC+FEe5cmi0inpq1B9fyZLJWrs= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=