Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
midjourney-proxy
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
徐少华
midjourney-proxy
Commits
89976748
Commit
89976748
authored
Jun 15, 2020
by
朱亚洁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: [1003010] 华为云迁移-OBS/MPC
parent
6cc82c8a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletions
+16
-1
AdvertisingSpaceBizImpl.java
...ud/book/advertising/biz/impl/AdvertisingSpaceBizImpl.java
+1
-1
ConvertConsr.java
...n/java/com/pcloud/book/consumer/convert/ConvertConsr.java
+15
-0
No files found.
pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/impl/AdvertisingSpaceBizImpl.java
View file @
89976748
...
@@ -2510,7 +2510,7 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
...
@@ -2510,7 +2510,7 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
if
(
startTime
.
equals
(
0
d
)
&&
endTime
.
equals
(
0
d
))
{
if
(
startTime
.
equals
(
0
d
)
&&
endTime
.
equals
(
0
d
))
{
musicUrl
=
fileUrl
;
musicUrl
=
fileUrl
;
}
else
{
}
else
{
String
realUrl
=
OssUtils
.
submitClipJob
(
fileText
,
fileUrl
,
startTime
.
toString
(),
duration
.
toString
());
String
realUrl
=
convertConsr
.
clipCustomByUrlAndTime
(
fileText
,
fileUrl
,
startTime
.
toString
(),
duration
.
toString
());
musicUrl
=
realUrl
;
musicUrl
=
realUrl
;
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
pcloud-service-book/src/main/java/com/pcloud/book/consumer/convert/ConvertConsr.java
View file @
89976748
...
@@ -5,6 +5,7 @@ import com.pcloud.common.core.aspect.ParamLog;
...
@@ -5,6 +5,7 @@ import com.pcloud.common.core.aspect.ParamLog;
import
com.pcloud.common.utils.ResponseHandleUtil
;
import
com.pcloud.common.utils.ResponseHandleUtil
;
import
com.pcloud.convert.file.entity.FileUploadInfo
;
import
com.pcloud.convert.file.entity.FileUploadInfo
;
import
com.pcloud.convert.file.service.ConvertFileService
;
import
com.pcloud.convert.file.service.ConvertFileService
;
import
com.pcloud.convert.file.service.TranscodeService
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
...
@@ -23,6 +24,8 @@ public class ConvertConsr {
...
@@ -23,6 +24,8 @@ public class ConvertConsr {
@Autowired
@Autowired
private
ConvertFileService
convertFileService
;
private
ConvertFileService
convertFileService
;
@Autowired
private
TranscodeService
transcodeService
;
/**
/**
* 获取转码文件
* 获取转码文件
...
@@ -40,4 +43,16 @@ public class ConvertConsr {
...
@@ -40,4 +43,16 @@ public class ConvertConsr {
return
fileUploadInfo
;
return
fileUploadInfo
;
}
}
@ParamLog
(
"音视频剪切"
)
public
String
clipCustomByUrlAndTime
(
String
fileName
,
String
fileUrl
,
String
startTime
,
String
duration
){
String
url
=
null
;
try
{
url
=
ResponseHandleUtil
.
parseResponse
(
transcodeService
.
clipCustomByUrlAndTime
(
fileName
,
fileUrl
,
startTime
,
duration
),
String
.
class
);
}
catch
(
Exception
e
){
LOGGER
.
error
(
"音视频剪切失败"
+
e
.
getMessage
(),
e
);
}
return
url
;
}
}
}
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