记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
42a9feda
Commit
42a9feda
authored
Apr 15, 2022
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~oss;
parent
236aa14b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
AlOssController.java
...ce/platform/controller/basicServices/AlOssController.java
+3
-2
No files found.
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AlOssController.java
View file @
42a9feda
...
...
@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiImplicitParam;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
...
...
@@ -99,7 +100,7 @@ public class AlOssController {
PlatformOssFiles
ossFile
=
this
.
getOldOssFile
(
fileNew
);
UploadVo
uploadVo
=
new
UploadVo
();
try
{
if
(
null
==
ossFile
||
(
isCutFrame
>
0
&&
ossFile
.
getVideoImg
().
isEmpty
(
)))
{
//保证上传过的文件也能截帧
if
(
null
==
ossFile
||
(
isCutFrame
>
0
&&
StringUtils
.
isBlank
(
ossFile
.
getVideoImg
()
)))
{
//保证上传过的文件也能截帧
// 上传
ossFile
=
this
.
uploadOssFile
(
file
,
pathName
,
buckType
,
resize
,
fileNew
,
isCutFrame
,
true
);
}
...
...
@@ -145,7 +146,7 @@ public class AlOssController {
PlatformOssFiles
ossFile
=
this
.
getOldOssFile
(
fileNew
);
UploadVo
uploadVo
=
new
UploadVo
();
try
{
if
(
null
==
ossFile
||
(
isCutFrame
>
0
&&
ossFile
.
getVideoImg
().
isEmpty
(
)))
{
//保证上传过的文件也能截帧
if
(
null
==
ossFile
||
(
isCutFrame
>
0
&&
StringUtils
.
isBlank
(
ossFile
.
getVideoImg
()
)))
{
//保证上传过的文件也能截帧
// 上传
ossFile
=
this
.
uploadOssFile
(
file
,
pathName
,
buckType
,
resize
,
fileNew
,
isCutFrame
,
false
);
}
...
...
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