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
43d8e71d
Commit
43d8e71d
authored
Nov 26, 2018
by
songxiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除ActiveMQ相关的代码和配置
parent
42a94a4b
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
46 additions
and
659 deletions
+46
-659
pom.xml
pcloud-common-core/pom.xml
+0
-14
ConvertEnum.java
...ain/java/com/pcloud/common/core/constant/ConvertEnum.java
+18
-28
ActiveMqFactory.java
.../main/java/com/pcloud/common/core/mq/ActiveMqFactory.java
+0
-75
ActiveMqProducer.java
...main/java/com/pcloud/common/core/mq/ActiveMqProducer.java
+0
-275
ActiveMqQueue.java
...rc/main/java/com/pcloud/common/core/mq/ActiveMqQueue.java
+0
-170
pom.xml
pcloud-common/pom.xml
+8
-18
PdfUtils.java
...n/src/main/java/com/pcloud/common/utils/pdf/PdfUtils.java
+13
-53
pom.xml
pom.xml
+7
-26
No files found.
pcloud-common-core/pom.xml
View file @
43d8e71d
...
...
@@ -45,26 +45,12 @@
</dependency>
<!-- Mysql Driver End -->
<!-- ActiveMq Begin -->
<dependency>
<groupId>
org.apache.activemq
</groupId>
<artifactId>
activemq-all
</artifactId>
</dependency>
<!-- ActiveMq End -->
<!-- Jackson Begin -->
<dependency>
<groupId>
org.codehaus.jackson
</groupId>
<artifactId>
jackson-mapper-asl
</artifactId>
</dependency>
<!-- Jackson End -->
<!-- Redis Begin -->
<dependency>
<groupId>
redis.clients
</groupId>
<artifactId>
jedis
</artifactId>
</dependency>
<!-- Redis End -->
</dependencies>
</project>
pcloud-common-core/src/main/java/com/pcloud/common/core/constant/ConvertEnum.java
View file @
43d8e71d
...
...
@@ -4,12 +4,8 @@
package
com
.
pcloud
.
common
.
core
.
constant
;
/**
*
*
* @author:songx
* @date:2017年2月27日,下午4:29:06
*
* 使用RabbitMQ需要去MqQueueConstant中声明队列名称,枚举的第二个值将不再使用,第一个值正常使用
* @date:2017年2月27日,下午4:29:06 使用RabbitMQ需要去MqQueueConstant中声明队列名称,枚举的第二个值将不再使用,第一个值正常使用
* modify by songx at 2018-08-22
*/
public
enum
ConvertEnum
{
...
...
@@ -17,82 +13,82 @@ public enum ConvertEnum {
/**
* 应用转码
*/
APP
(
"APP"
,
"convert2App
"
),
APP
(
"APP
"
),
/**
* 资源中心转码
*/
RESOURCE
(
"RESOURCE"
,
"convert2Resource
"
),
RESOURCE
(
"RESOURCE
"
),
/**
* 报名时的视频转换
*/
MATCH
(
"MATCH"
,
"convert2Resource
"
),
MATCH
(
"MATCH
"
),
/**
* 资源中心即时转换
*/
INSTANT_RESOURCE
(
"INSTANT_RESOURCE"
,
"convert2Resource
"
),
INSTANT_RESOURCE
(
"INSTANT_RESOURCE
"
),
/**
* 报名应用
*/
MATCH_APP
(
"MATCH_APP"
,
"convert2MatchApp
"
),
MATCH_APP
(
"MATCH_APP
"
),
/**
* 内容中心
*/
CONTENT
(
"CONTENT"
,
"convert2Content
"
),
CONTENT
(
"CONTENT
"
),
/**
* 内容中心->题库:文件记忆功能
*/
PRETEST_FILEMEMORY
(
"PRETEST_FILEMEMORY"
,
"convert2PretestFilememory
"
),
PRETEST_FILEMEMORY
(
"PRETEST_FILEMEMORY
"
),
/**
* 小游戏
*/
RAYSTASK
(
"RAYSTASK"
,
"convert2Raystask
"
),
RAYSTASK
(
"RAYSTASK
"
),
/**
* 圈子应用
*/
GROUP_APP
(
"GROUP_APP"
,
"convert2GroupApp
"
),
GROUP_APP
(
"GROUP_APP
"
),
/**
* 投票应用
*/
VOTE_APP
(
"VOTE_APP"
,
"convert2VoteApp
"
),
VOTE_APP
(
"VOTE_APP
"
),
/**
* 教育表格应用
*/
EF_APP
(
"EF_APP"
,
"convert2EfApp
"
),
EF_APP
(
"EF_APP
"
),
/**
* 测试工具
*/
TEST_APP
(
"TEST_APP"
,
"convert2TestApp
"
),
TEST_APP
(
"TEST_APP
"
),
/**
* 直播工具
*/
LIVE_APP
(
"LIVE_APP"
,
"convert2LiveApp
"
),
LIVE_APP
(
"LIVE_APP
"
),
/**
* 视频课
*/
VIDEO_LESSON
(
"VIDEO_LESSON"
,
"convert2VideoLesson
"
),
VIDEO_LESSON
(
"VIDEO_LESSON
"
),
/**
* 音频课
*/
AUDIO_LESSON
(
"AUDIO_LESSON"
,
"convert2AudioLesson"
),
AUDIO_LESSON
(
"AUDIO_LESSON"
),
/**
* 音频纯听
*/
AUDIO_LISTEN
(
"AUDIO_LISTEN"
,
"convert2AudioListen"
);
AUDIO_LISTEN
(
"AUDIO_LISTEN"
);
/**
* 值
...
...
@@ -100,18 +96,12 @@ public enum ConvertEnum {
public
final
String
value
;
/**
* 模板名称
*/
public
final
String
jmsTemplate
;
/**
* 构造
*
* @param value
*/
private
ConvertEnum
(
String
value
,
String
jmsTemplat
e
)
{
private
ConvertEnum
(
String
valu
e
)
{
this
.
value
=
value
;
this
.
jmsTemplate
=
jmsTemplate
;
}
}
pcloud-common-core/src/main/java/com/pcloud/common/core/mq/ActiveMqFactory.java
deleted
100644 → 0
View file @
42a94a4b
package
com
.
pcloud
.
common
.
core
.
mq
;
import
org.apache.activemq.ActiveMQConnectionFactory
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.PropertySource
;
import
org.springframework.jms.connection.CachingConnectionFactory
;
import
org.springframework.jms.connection.SingleConnectionFactory
;
/**
* @描述:
* @作者:songx
* @创建时间:2017年9月14日,上午10:48:02
* @版本:1.0
*/
@Configuration
@PropertySource
(
value
=
"classpath:public_system.properties"
)
public
class
ActiveMqFactory
{
/**
*
*/
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ActiveMqFactory
.
class
);
@Value
(
"${mq.brokerURL}"
)
private
String
brokerURL
;
/**
* 初始化Mq连接
*
* @return
*/
@Bean
(
name
=
"connectionFactory"
)
public
ActiveMQConnectionFactory
getMqConnection
()
{
LOGGER
.
info
(
"【ActiveMq】初始化MQ链接.<START>"
);
ActiveMQConnectionFactory
mqConnection
=
new
ActiveMQConnectionFactory
();
mqConnection
.
setBrokerURL
(
brokerURL
);
mqConnection
.
setTrustAllPackages
(
true
);
return
mqConnection
;
}
/**
* 初始化JMS连接池
*
* @return
*/
@Autowired
@Bean
(
"cachingConnectionFactory"
)
public
CachingConnectionFactory
getCachingConnectionFactory
(
ActiveMQConnectionFactory
connectionFactory
)
{
CachingConnectionFactory
cachingConnectionFactory
=
new
CachingConnectionFactory
(
connectionFactory
);
cachingConnectionFactory
.
setReconnectOnException
(
true
);
cachingConnectionFactory
.
setCacheConsumers
(
false
);
cachingConnectionFactory
.
setCacheProducers
(
false
);
cachingConnectionFactory
.
setSessionCacheSize
(
50
);
return
cachingConnectionFactory
;
}
/**
* Spring用于管理真正的ConnectionFactory的ConnectionFactory
*
* @return
*/
@Autowired
@Bean
(
name
=
"singleConnectionFactory"
)
public
SingleConnectionFactory
getSingleConnection
(
CachingConnectionFactory
cachingConnectionFactory
)
{
LOGGER
.
info
(
"【ActiveMq】初始化spring管理JMS链接.<START>"
);
SingleConnectionFactory
singleConnection
=
new
SingleConnectionFactory
();
singleConnection
.
setTargetConnectionFactory
(
cachingConnectionFactory
);
return
singleConnection
;
}
}
pcloud-common-core/src/main/java/com/pcloud/common/core/mq/ActiveMqProducer.java
deleted
100644 → 0
View file @
42a94a4b
package
com
.
pcloud
.
common
.
core
.
mq
;
import
org.apache.activemq.command.ActiveMQQueue
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.jms.connection.CachingConnectionFactory
;
import
org.springframework.jms.core.JmsTemplate
;
/**
* @描述:
*
* @作者:songx
* @创建时间:2017年9月14日,上午11:40:25 @版本:1.0
*/
@Configuration
public
class
ActiveMqProducer
{
@Autowired
private
CachingConnectionFactory
cachingConnectionFactory
;
@Autowired
(
required
=
false
)
@Qualifier
(
"convertQueue"
)
private
ActiveMQQueue
convertQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"labelUsedQueue"
)
private
ActiveMQQueue
labelUsedQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"logQueue"
)
private
ActiveMQQueue
logQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"messageQueue"
)
private
ActiveMQQueue
messageQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"weektaskQueue"
)
private
ActiveMQQueue
weektaskQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"templateQueue"
)
private
ActiveMQQueue
templateQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"userActionQueue"
)
private
ActiveMQQueue
userActionQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"funnelFlowQueue"
)
private
ActiveMQQueue
funnelFlowQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"fundQueue"
)
private
ActiveMQQueue
fundQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"dynamicQueue"
)
private
ActiveMQQueue
dynamicQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"exapiQueue"
)
private
ActiveMQQueue
exapiQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"frontEventQueue"
)
private
ActiveMQQueue
frontEventQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"transcodeQueue"
)
private
ActiveMQQueue
transcodeQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"promotionTaskQueue"
)
private
ActiveMQQueue
promotionTaskQueue
;
@Autowired
(
required
=
false
)
@Qualifier
(
"promotionTerminateQueue"
)
private
ActiveMQQueue
promotionTerminateQueue
;
/**
* 获取音视频转码JMS
*
* @return
*/
@Bean
(
name
=
"jmsConvertTemplate"
)
public
JmsTemplate
getConvertTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
convertQueue
);
return
jmsTemplate
;
}
/**
* 获取标签使用JMS
*
* @return
*/
@Bean
(
name
=
"jmsLabelUsedTemplate"
)
public
JmsTemplate
getLabelUsedTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
labelUsedQueue
);
return
jmsTemplate
;
}
/**
* 获取日志JMS
*
* @return
*/
@Bean
(
name
=
"jmsLogTemplate"
)
public
JmsTemplate
getLogTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
logQueue
);
return
jmsTemplate
;
}
/**
* 获取消息JMS
*
* @return
*/
@Bean
(
name
=
"jmsMessageTemplate"
)
public
JmsTemplate
getMessageTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
messageQueue
);
return
jmsTemplate
;
}
/**
* 获取编辑任务JMS
*
* @return
*/
@Bean
(
name
=
"jmsWeektaskTemplate"
)
public
JmsTemplate
getWeektaskTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
weektaskQueue
);
return
jmsTemplate
;
}
/**
* 获取模板消息JMS
*
* @return
*/
@Bean
(
name
=
"jmsTemplateTemplate"
)
public
JmsTemplate
getTemplateTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
templateQueue
);
return
jmsTemplate
;
}
/**
* 获取用户行为JMS
*
* @return
*/
@Bean
(
name
=
"jmsUserActionTemplate"
)
public
JmsTemplate
getUserActionTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
userActionQueue
);
return
jmsTemplate
;
}
/**
* 获取漏斗流程JMS
*
* @return
*/
@Bean
(
name
=
"jmsFunnelFlowTemplate"
)
public
JmsTemplate
getFunnelFlowTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
funnelFlowQueue
);
return
jmsTemplate
;
}
/**
* 基金修改监控JMS
*
* @return
*/
@Bean
(
name
=
"jmsFundTemplate"
)
public
JmsTemplate
getJmsFundTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
fundQueue
);
return
jmsTemplate
;
}
/**
* 作者动态监控JMS
*
* @return
*/
@Bean
(
name
=
"jmsDynamicTemplate"
)
public
JmsTemplate
getJmsDynamicTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
dynamicQueue
);
return
jmsTemplate
;
}
/**
* 收集事件
*
* @return
*/
@Bean
(
name
=
"jmsFrontEventTemplate"
)
public
JmsTemplate
getJmsFrontEventTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
frontEventQueue
);
return
jmsTemplate
;
}
/**
* 对外api监控JMS
*
* @author wangrui
* @date 10:40 2018/4/13
*/
@Bean
(
name
=
"jmsExapiTemplate"
)
public
JmsTemplate
getJmsExapiTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
exapiQueue
);
return
jmsTemplate
;
}
/**
* 文件转码JMS
*
* @return
*/
@Bean
(
name
=
"jmsTranscodeTemplate"
)
public
JmsTemplate
getJmsTranscodeTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
transcodeQueue
);
return
jmsTemplate
;
}
/**
* 获取促销任务JMS
*
* @return
*/
@Bean
(
name
=
"jmsPromotionTaskTemplate"
)
public
JmsTemplate
getJmsPromotionTaskTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
promotionTaskQueue
);
return
jmsTemplate
;
}
/**
* 获取促销终止JMS
*
* @return
*/
@Bean
(
name
=
"jmsPromotionTerminateTemplate"
)
public
JmsTemplate
getJmsPromotionTerminateTemplate
()
{
JmsTemplate
jmsTemplate
=
getJmsTemplate
();
jmsTemplate
.
setDefaultDestination
(
promotionTerminateQueue
);
return
jmsTemplate
;
}
/**
* 获取JMS模板
*
* @return
*/
private
JmsTemplate
getJmsTemplate
()
{
JmsTemplate
jmsTemplate
=
new
JmsTemplate
(
cachingConnectionFactory
);
jmsTemplate
.
setReceiveTimeout
(
10000
);
return
jmsTemplate
;
}
}
pcloud-common-core/src/main/java/com/pcloud/common/core/mq/ActiveMqQueue.java
deleted
100644 → 0
View file @
42a94a4b
package
com
.
pcloud
.
common
.
core
.
mq
;
import
org.apache.activemq.command.ActiveMQQueue
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
com.pcloud.common.core.enums.MqQueueEnum
;
/**
*
* @描述:
*
* @作者:songx
* @创建时间:2017年11月14日,上午10:59:55 @版本:1.0
*/
@Configuration
public
class
ActiveMqQueue
{
/**
* 音视频转换消息队列
*
* @return
*/
@Bean
(
name
=
"convertQueue"
)
public
ActiveMQQueue
getConvertQueue
()
{
return
new
ActiveMQQueue
(
"convert"
);
}
/**
* 标签使用量消息队列
*
* @return
*/
@Bean
(
name
=
"labelUsedQueue"
)
public
ActiveMQQueue
getLabelUsedQueue
()
{
return
new
ActiveMQQueue
(
"labelUsed"
);
}
/**
* 日志消息队列
*
* @return
*/
@Bean
(
name
=
"logQueue"
)
public
ActiveMQQueue
getLogQueue
()
{
return
new
ActiveMQQueue
(
"log"
);
}
/**
* 系统消息消息队列
*
* @return
*/
@Bean
(
name
=
"messageQueue"
)
public
ActiveMQQueue
getMessageQueue
()
{
return
new
ActiveMQQueue
(
"message"
);
}
/**
* 周任务消息队列
*
* @return
*/
@Bean
(
name
=
"weektaskQueue"
)
public
ActiveMQQueue
getWeektaskQueue
()
{
return
new
ActiveMQQueue
(
"weektask"
);
}
/**
* 模板消息消息队列
*
* @return
*/
@Bean
(
name
=
"templateQueue"
)
public
ActiveMQQueue
getTemplateQueue
()
{
return
new
ActiveMQQueue
(
"template"
);
}
/**
* 用户行为消息队列
*
* @return
*/
@Bean
(
name
=
"userActionQueue"
)
public
ActiveMQQueue
getUserActionQueue
()
{
return
new
ActiveMQQueue
(
"userAction"
);
}
/**
* 用户漏斗流程队列
*
* @return
*/
@Bean
(
name
=
"funnelFlowQueue"
)
public
ActiveMQQueue
getFunnelFlowQueue
()
{
return
new
ActiveMQQueue
(
"funnelFlow"
);
}
/**
* 基金监控消息队列
*
* @return
*/
@Bean
(
name
=
"fundQueue"
)
public
ActiveMQQueue
getFundQueue
()
{
return
new
ActiveMQQueue
(
"fund"
);
}
/**
* 动态监控消息队列
*
* @return
*/
@Bean
(
name
=
"dynamicQueue"
)
public
ActiveMQQueue
getDynamicQueue
()
{
return
new
ActiveMQQueue
(
"merchantDynamic"
);
}
/**
* 事件分析埋点
*
* @return
*/
@Bean
(
name
=
"frontEventQueue"
)
public
ActiveMQQueue
getFrontEventQueue
()
{
return
new
ActiveMQQueue
(
"frontEvent"
);
}
/**
* 对外api队列
*
* @author wangrui
* @date 10:28 2018/4/13
*/
@Bean
(
name
=
"exapiQueue"
)
public
ActiveMQQueue
getExapiQueue
()
{
return
new
ActiveMQQueue
(
"exapi"
);
}
/**
* 文件转码(非音视频转码)
*
* @return
*/
@Bean
(
name
=
"transcodeQueue"
)
public
ActiveMQQueue
getTranscodeQueue
()
{
return
new
ActiveMQQueue
(
MqQueueEnum
.
TRANSCODE
.
queueName
);
}
/**
* 促销任务
*
* @return
*/
@Bean
(
name
=
"promotionTaskQueue"
)
public
ActiveMQQueue
getPromotionTaskQueue
()
{
return
new
ActiveMQQueue
(
"promotionTask"
);
}
/**
* 促销终止
*
* @return
*/
@Bean
(
name
=
"promotionTerminateQueue"
)
public
ActiveMQQueue
getPromotionTerminateQueue
()
{
return
new
ActiveMQQueue
(
"promotionTerminate"
);
}
}
pcloud-common/pom.xml
View file @
43d8e71d
...
...
@@ -203,6 +203,13 @@
</dependency>
<!-- sftp end -->
<!-- google Begin -->
<dependency>
<groupId>
com.google.guava
</groupId>
<artifactId>
guava
</artifactId>
</dependency>
<!-- google End -->
<!-- ftp begin -->
<dependency>
<groupId>
commons-net
</groupId>
...
...
@@ -241,12 +248,6 @@
<artifactId>
freemarker
</artifactId>
</dependency>
<!-- PDF解析工具 -->
<dependency>
<groupId>
pcloud.tools
</groupId>
<artifactId>
tools
</artifactId>
</dependency>
<!-- 图片处理工具 added by songx at 2017-05-17 -->
<dependency>
<groupId>
net.coobird
</groupId>
...
...
@@ -297,12 +298,6 @@
</dependency>
<!-- end -->
<!-- google 工具包 -->
<dependency>
<groupId>
com.google.guava
</groupId>
<artifactId>
guava
</artifactId>
</dependency>
<!-- Jackson Begin -->
<dependency>
<groupId>
org.codehaus.jackson
</groupId>
...
...
@@ -378,12 +373,7 @@
<version>
1.5.2
</version>
</dependency>
<!--PDF转图片 -->
<dependency>
<groupId>
org.apache.pdfbox
</groupId>
<artifactId>
pdfbox
</artifactId>
<version>
2.0.9
</version>
</dependency>
<dependency>
<groupId>
com.github.jai-imageio
</groupId>
...
...
pcloud-common/src/main/java/com/pcloud/common/utils/pdf/PdfUtils.java
View file @
43d8e71d
package
com
.
pcloud
.
common
.
utils
.
pdf
;
import
java.awt.image.BufferedImage
;
import
java.io.File
;
import
java.io.FileOutputStream
;
import
java.io.IOException
;
...
...
@@ -9,8 +8,6 @@ import java.net.MalformedURLException;
import
java.net.URL
;
import
java.util.List
;
import
org.apache.pdfbox.pdmodel.PDDocument
;
import
org.apache.pdfbox.rendering.PDFRenderer
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.stereotype.Component
;
...
...
@@ -45,9 +42,6 @@ import com.pcloud.common.utils.pdf.po.PdfImagePO;
import
com.pcloud.common.utils.pdf.po.PdfPO
;
import
com.pcloud.common.utils.pdf.po.PdfTablePO
;
import
com.pcloud.common.utils.string.StringUtil
;
import
com.pcloud.tools.pdf.convert.image.PdfToImage
;
import
javax.imageio.ImageIO
;
/**
* @author Administrator
...
...
@@ -78,7 +72,12 @@ public class PdfUtils {
* @return
* @throws Exception
*/
@Deprecated
public
static
List
<
UploadResultInfo
>
pdfToImage
(
String
fileUrl
,
String
format
)
throws
FileException
{
if
(
StringUtil
.
isEmpty
(
fileUrl
))
return
null
;
if
(!
StringUtil
.
isEmpty
(
fileUrl
))
return
null
;
String
fileName
=
FileUtils
.
getFileName
(
fileUrl
);
// 下载PDF文件
byte
[]
bytes
=
FileUtils
.
downloadByteFromUrl
(
fileUrl
);
...
...
@@ -95,48 +94,6 @@ public class PdfUtils {
}
/**
* PDF文件转换图片
*
* @param fileUrl
* @param format
* @return
*/
public
static
List
<
UploadResultInfo
>
pdf2Image
(
String
fileUrl
,
String
format
)
{
String
fileName
=
FileUtils
.
getFileName
(
fileUrl
);
String
filePath
=
FilePathConst
.
DOWNLOAD_PATH
+
fileName
+
"_"
+
UUIDUitl
.
generateString
(
12
);
String
outputPath
=
FilePathConst
.
PDF_PATH
+
fileName
+
"_"
+
UUIDUitl
.
generateString
(
12
);
try
{
FileUtils
.
downloadFileFromUrl
(
fileUrl
,
filePath
);
File
outputDir
=
new
File
(
outputPath
);
if
(!
outputDir
.
exists
())
{
outputDir
.
mkdir
();
}
File
file
=
new
File
(
filePath
);
if
(!
file
.
exists
())
{
LOGGER
.
error
(
fileUrl
+
" download error"
);
throw
new
FileException
(
FileException
.
FILE_DOWNLOAD_FAILURE
,
"下载文件失败"
);
}
LOGGER
.
info
(
"pdf downloaded to Folder: "
+
outputDir
.
getName
());
PDDocument
document
=
PDDocument
.
load
(
new
File
(
filePath
));
int
total
=
document
.
getNumberOfPages
();
LOGGER
.
info
(
"Total images to be converted: "
+
total
);
PDFRenderer
render
=
new
PDFRenderer
(
document
);
for
(
int
i
=
0
;
i
<
total
;
i
++)
{
BufferedImage
image
=
render
.
renderImage
(
i
,
2.0f
);
File
outputfile
=
new
File
(
outputPath
+
"page"
+
(
i
+
1
)
+
"."
+
format
);
ImageIO
.
write
(
image
,
format
,
outputfile
);
}
document
.
close
();
LOGGER
.
info
(
"Converted Images are saved at: "
+
outputDir
.
getAbsolutePath
());
return
pdfImageUpload
(
outputPath
,
fileName
,
format
);
}
catch
(
Exception
e
)
{
LOGGER
.
warn
(
"pdf convert error"
,
e
);
return
pdfToImage
(
fileUrl
,
format
);
}
}
/**
* PDF转换文件
*
* @param b
...
...
@@ -154,8 +111,8 @@ public class PdfUtils {
fi
.
mkdirs
();
}
try
{
PdfToImage
pImage
=
new
PdfToImage
(
IMAGE_WITH
,
IMAGE_HEIGHT
,
prefix
,
format
);
pImage
.
convertPagesToHiResImages
(
b
,
outPath
);
// PdfToImage pImage = new PdfToImage(IMAGE_WITH, IMAGE_HEIGHT, prefix, format);
// pImage.convertPagesToHiResImages(b, outPath);
}
catch
(
Exception
e
)
{
FileUtils
.
deleteDirectory
(
outPath
);
LOGGER
.
error
(
"【PDF】PDF转换图片失败:"
+
e
.
getMessage
(),
e
);
...
...
@@ -401,9 +358,12 @@ public class PdfUtils {
/**
* 加水印(字符串)
*
* @param inputFile 需要加水印的PDF路径
* @param outputFile 输出生成PDF的路径
* @param waterMarkName 水印字符
* @param inputFile
* 需要加水印的PDF路径
* @param outputFile
* 输出生成PDF的路径
* @param waterMarkName
* 水印字符
*/
public
static
void
stringWaterMark
(
String
filePath
,
String
waterMarkName
)
{
PdfReader
reader
=
null
;
...
...
pom.xml
View file @
43d8e71d
...
...
@@ -233,14 +233,6 @@
</dependency>
<!-- Common Dependency End -->
<!-- Mysql Driver Begin -->
<dependency>
<groupId>
mysql
</groupId>
<artifactId>
mysql-connector-java
</artifactId>
<version>
6.0.6
</version>
</dependency>
<!-- Mysql Driver End -->
<!-- logback-json -->
<dependency>
<groupId>
ch.qos.logback.contrib
</groupId>
...
...
@@ -258,18 +250,14 @@
<version>
0.1.2
</version>
</dependency>
<!-- Others Begin -->
<dependency>
<groupId>
org.jboss.netty
</groupId>
<artifactId>
netty
</artifactId>
<version>
3.2.10.Final
</version>
</dependency>
<!-- Mysql Driver Begin -->
<dependency>
<groupId>
org.apache.activemq
</groupId>
<artifactId>
activemq-all
</artifactId>
<version>
5.15.0
</version>
<groupId>
mysql
</groupId>
<artifactId>
mysql-connector-java
</artifactId>
<version>
6.0.6
</version>
</dependency>
<!--
Others
End -->
<!--
Mysql Driver
End -->
<!-- 图片处理工具 added by songx at 2017-05-17 -->
<dependency>
...
...
@@ -297,13 +285,6 @@
<version>
3.0.0
</version>
</dependency>
<!-- PDF解析工具 added by songx at 2017-06-13 -->
<dependency>
<groupId>
pcloud.tools
</groupId>
<artifactId>
tools
</artifactId>
<version>
18.03.22
</version>
</dependency>
<!-- 阿里云媒体转码SDK包 added by songx at 2017-06-22 -->
<dependency>
<groupId>
com.aliyun
</groupId>
...
...
@@ -320,6 +301,7 @@
<artifactId>
aliyun-java-sdk-mts
</artifactId>
<version>
2.1.7
</version>
</dependency>
<!-- end -->
<!-- solr add by gaop at 2018-4-23 11:33:47 -->
<dependency>
...
...
@@ -327,7 +309,6 @@
<artifactId>
spring-data-solr
</artifactId>
<version>
${spring.data.solr.version}
</version>
</dependency>
<!-- end -->
<!-- Jackson Begin -->
<dependency>
...
...
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