Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
media-resource
Overview
Overview
Details
Activity
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
杨昕
media-resource
Commits
f0255cfe
Commit
f0255cfe
authored
Jul 13, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sfdj
parent
84cb4120
Pipeline
#9873
passed with stages
in 34 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletions
+16
-1
MediaController.php
app/Http/Controllers/Api/Client/MediaController.php
+6
-1
MediaModel.php
app/Model/MediaModel.php
+10
-0
No files found.
app/Http/Controllers/Api/Client/MediaController.php
View file @
f0255cfe
...
@@ -85,6 +85,8 @@ class MediaController extends Controller
...
@@ -85,6 +85,8 @@ class MediaController extends Controller
'secret_key'
=>
''
,
'secret_key'
=>
''
,
'media_url'
=>
'required'
,
'media_url'
=>
'required'
,
'description'
=>
''
,
'description'
=>
''
,
'start_time'
=>
''
,
'end_time'
=>
''
,
],
config
(
'app.client_request_parameters'
)));
],
config
(
'app.client_request_parameters'
)));
...
@@ -114,6 +116,8 @@ class MediaController extends Controller
...
@@ -114,6 +116,8 @@ class MediaController extends Controller
'access_key'
=>
''
,
'access_key'
=>
''
,
'secret_key'
=>
''
,
'secret_key'
=>
''
,
'media_url'
=>
'required'
,
'media_url'
=>
'required'
,
'start_time'
=>
''
,
'end_time'
=>
''
,
]);
]);
MediaModel
::
updatehookMedia
(
$request
,
$id
);
MediaModel
::
updatehookMedia
(
$request
,
$id
);
...
@@ -136,10 +140,11 @@ class MediaController extends Controller
...
@@ -136,10 +140,11 @@ class MediaController extends Controller
SrsHookValidate
::
srsHookCallback
(
$request
,[
SrsHookValidate
::
srsHookCallback
(
$request
,[
'media_name'
=>
''
,
'media_name'
=>
''
,
'username'
=>
''
,
'username'
=>
''
,
'page'
=>
''
,
'page'
=>
'
integer
'
,
'media_id'
=>
''
,
'media_id'
=>
''
,
'description'
=>
''
,
'description'
=>
''
,
'sort'
=>
''
,
'sort'
=>
''
,
'page_size'
=>
'integer'
,
]);
]);
return
MediaModel
::
mediaList
(
$request
);
return
MediaModel
::
mediaList
(
$request
);
...
...
app/Model/MediaModel.php
View file @
f0255cfe
...
@@ -146,6 +146,8 @@ class MediaModel extends Eloquent
...
@@ -146,6 +146,8 @@ class MediaModel extends Eloquent
'description'
=>
$request
->
description
,
'description'
=>
$request
->
description
,
'username'
=>
$request
->
token_username
,
//员工工号
'username'
=>
$request
->
token_username
,
//员工工号
'user_id'
=>
$request
->
token_user_id
,
'user_id'
=>
$request
->
token_user_id
,
'start_time'
=>
$request
->
start_time
??
''
,
'end_time'
=>
$request
->
end_time
??
''
,
];
];
}
else
{
}
else
{
...
@@ -164,6 +166,8 @@ class MediaModel extends Eloquent
...
@@ -164,6 +166,8 @@ class MediaModel extends Eloquent
'description'
=>
$request
->
description
,
'description'
=>
$request
->
description
,
'username'
=>
$request
->
token_username
,
//员工工号
'username'
=>
$request
->
token_username
,
//员工工号
'user_id'
=>
$request
->
token_user_id
,
'user_id'
=>
$request
->
token_user_id
,
'start_time'
=>
$request
->
start_time
??
''
,
'end_time'
=>
$request
->
end_time
??
''
,
];
];
}
}
...
@@ -218,6 +222,9 @@ class MediaModel extends Eloquent
...
@@ -218,6 +222,9 @@ class MediaModel extends Eloquent
'secret_key'
=>
$request
->
secret_key
,
'secret_key'
=>
$request
->
secret_key
,
'create_time'
=>
date
(
'Y-m-d H:i:s'
,
time
()),
'create_time'
=>
date
(
'Y-m-d H:i:s'
,
time
()),
'description'
=>
$request
->
description
,
'description'
=>
$request
->
description
,
'start_time'
=>
$request
->
start_time
??
''
,
'end_time'
=>
$request
->
end_time
??
''
,
];
];
}
else
{
}
else
{
...
@@ -233,6 +240,9 @@ class MediaModel extends Eloquent
...
@@ -233,6 +240,9 @@ class MediaModel extends Eloquent
'secret_key'
=>
$request
->
secret_key
,
'secret_key'
=>
$request
->
secret_key
,
'create_time'
=>
date
(
'Y-m-d H:i:s'
,
time
()),
'create_time'
=>
date
(
'Y-m-d H:i:s'
,
time
()),
'description'
=>
$request
->
description
,
'description'
=>
$request
->
description
,
'start_time'
=>
$request
->
start_time
??
''
,
'end_time'
=>
$request
->
end_time
??
''
,
];
];
}
}
...
...
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