Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qsh-wc
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
honghuiliu
qsh-wc
Commits
c61b0ef2
Commit
c61b0ef2
authored
Sep 26, 2022
by
mahui
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
378f5cc7
67a7a06e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
qsh_monitor_data.go
server/model/admin/request/qsh_monitor_data.go
+2
-2
fn.go
server/utils/fn.go
+1
-1
No files found.
server/model/admin/request/qsh_monitor_data.go
View file @
c61b0ef2
...
@@ -8,6 +8,6 @@ import (
...
@@ -8,6 +8,6 @@ import (
type
QshMonitorDataSearch
struct
{
type
QshMonitorDataSearch
struct
{
admin
.
QshMonitorData
admin
.
QshMonitorData
request
.
PageInfo
request
.
PageInfo
StartTime
string
`json:"start_time"`
StartTime
string
`json:"start_time"
form:"start_time"
`
EndTime
string
`json:"end_time"`
EndTime
string
`json:"end_time"
form:"end_time"
`
}
}
server/utils/fn.go
View file @
c61b0ef2
...
@@ -41,5 +41,5 @@ func GetYinShiAccessToken(userName string) (string, error) {
...
@@ -41,5 +41,5 @@ func GetYinShiAccessToken(userName string) (string, error) {
// GetCameraUrl 获取监控播放地址
// GetCameraUrl 获取监控播放地址
func
GetCameraUrl
(
deviceId
string
)
string
{
func
GetCameraUrl
(
deviceId
string
)
string
{
return
fmt
.
Sprintf
(
"ezopen://open.ys7.com/%s/1.
hd.
live"
,
deviceId
)
return
fmt
.
Sprintf
(
"ezopen://open.ys7.com/%s/1.live"
,
deviceId
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment