Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
member-api
Project
Project
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
曲欣亮
member-api
Commits
83c602cc
Commit
83c602cc
authored
Dec 07, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://key@gitlab.egolm.com/hanxu/siff-film-api.git
parents
e9545cbb
4bfdeccd
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
133 additions
and
133 deletions
+133
-133
AliyunApiController.java
...main/java/com/egolm/film/api/web/AliyunApiController.java
+133
-133
No files found.
src/main/java/com/egolm/film/api/web/AliyunApiController.java
View file @
83c602cc
...
@@ -95,7 +95,7 @@ public class AliyunApiController {
...
@@ -95,7 +95,7 @@ public class AliyunApiController {
if
(
response
!=
null
)
{
if
(
response
!=
null
)
{
return
Rjx
.
jsonOk
().
set
(
"RequestId"
,
response
.
getRequestId
()).
set
(
"UploadAuth"
,
response
.
getUploadAuth
()).
set
(
"UploadAddress"
,
response
.
getUploadAddress
());
return
Rjx
.
jsonOk
().
set
(
"RequestId"
,
response
.
getRequestId
()).
set
(
"UploadAuth"
,
response
.
getUploadAuth
()).
set
(
"UploadAddress"
,
response
.
getUploadAddress
());
}
else
{
}
else
{
return
Rjx
.
jsonErr
().
set
Message
(
"InvalidVideo.NotFound : The video does not exist."
);
return
Rjx
.
jsonErr
().
set
Code
(-
1
).
setMessage
(
"InvalidVideo.NotFound : The video does not exist."
);
}
}
}
}
...
@@ -120,7 +120,7 @@ public class AliyunApiController {
...
@@ -120,7 +120,7 @@ public class AliyunApiController {
if
(
response
!=
null
)
{
if
(
response
!=
null
)
{
return
Rjx
.
jsonOk
().
set
(
"playAuth"
,
response
.
getPlayAuth
()).
set
(
"videoMeta"
,
response
.
getVideoMeta
());
return
Rjx
.
jsonOk
().
set
(
"playAuth"
,
response
.
getPlayAuth
()).
set
(
"videoMeta"
,
response
.
getVideoMeta
());
}
else
{
}
else
{
return
Rjx
.
jsonErr
().
set
Message
(
"InvalidVideo.NotFound : The video does not exist."
);
return
Rjx
.
jsonErr
().
set
Code
(-
1
).
setMessage
(
"InvalidVideo.NotFound : The video does not exist."
);
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
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