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
30086713
Commit
30086713
authored
Jul 21, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Plain Diff
sjfl
parents
044dcce3
7ba58159
Pipeline
#9996
passed with stages
in 39 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
MediaModel.php
app/Model/MediaModel.php
+2
-2
QiniuModel.php
app/Model/QiniuModel.php
+1
-1
No files found.
app/Model/MediaModel.php
View file @
30086713
...
@@ -318,7 +318,7 @@ class MediaModel extends Eloquent
...
@@ -318,7 +318,7 @@ class MediaModel extends Eloquent
if
(
empty
(
$media_catg
)){
if
(
empty
(
$media_catg
)){
throw
new
\Exception
(
"媒资类别不存在"
);
throw
new
\Exception
(
"媒资类别不存在"
);
}
}
$tmp
[]
=
MediaModel
::
select
(
"_id"
,
"book_num"
,
"book_name"
,
"secret_key"
)
->
whereIn
(
'book_num'
,
$media_ids
)
->
get
();
$tmp
[]
=
MediaModel
::
select
(
"_id"
,
"book_num"
,
"book_name"
,
"secret_key"
,
"media_url"
)
->
whereIn
(
'book_num'
,
$media_ids
)
->
get
();
}
}
}
catch
(
\Exception
$exception
){
}
catch
(
\Exception
$exception
){
...
@@ -334,7 +334,7 @@ class MediaModel extends Eloquent
...
@@ -334,7 +334,7 @@ class MediaModel extends Eloquent
/**
/**
* 排除res为空
* 排除res为空
*/
*/
if
(
!
isset
(
$res
[
0
])
||
empty
(
$res
[
0
])){
if
(
!
isset
(
$res
[
0
])
||
empty
(
$res
[
0
]
->
first
()
)){
return
[];
return
[];
}
}
...
...
app/Model/QiniuModel.php
View file @
30086713
...
@@ -77,7 +77,7 @@ final class QiniuModel
...
@@ -77,7 +77,7 @@ final class QiniuModel
return
"
$baseUrl
&token=
$token
"
;
return
"
$baseUrl
&token=
$token
"
;
}
}
public
static
function
uploadToken
(
$bucket
=
""
,
$key
=
null
,
$expires
=
3600
,
$policy
=
null
,
$strictPolicy
=
true
)
public
static
function
uploadToken
(
$bucket
=
""
,
$key
=
null
,
$expires
=
3600
*
24
,
$policy
=
null
,
$strictPolicy
=
true
)
{
{
$deadline
=
time
()
+
$expires
;
$deadline
=
time
()
+
$expires
;
...
...
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