Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
slm-fileview
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
jenkins
slm-fileview
Commits
cf1f833d
Commit
cf1f833d
authored
Dec 25, 2020
by
kl
Committed by
kl
Dec 25, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增markdown格式预览支持
parent
cb219521
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
126 additions
and
26 deletions
+126
-26
freemarker_implicit.ftl
jodconverter-web/src/main/config/freemarker_implicit.ftl
+14
-0
FileType.java
jodconverter-web/src/main/java/cn/keking/model/FileType.java
+3
-1
MarkdownFilePreviewImpl.java
.../java/cn/keking/service/impl/MarkdownFilePreviewImpl.java
+27
-0
DownloadUtils.java
...rter-web/src/main/java/cn/keking/utils/DownloadUtils.java
+2
-2
FileUtils.java
...onverter-web/src/main/java/cn/keking/utils/FileUtils.java
+4
-2
OnlinePreviewController.java
...ava/cn/keking/web/controller/OnlinePreviewController.java
+0
-3
marked.min.js
jodconverter-web/src/main/resources/static/js/marked.min.js
+0
-0
officePicture.ftl
jodconverter-web/src/main/resources/web/officePicture.ftl
+2
-2
txt.ftl
jodconverter-web/src/main/resources/web/txt.ftl
+74
-16
No files found.
jodconverter-web/src/main/config/freemarker_implicit.ftl
0 → 100644
View file @
cf1f833d
[#ftl]
[#-- @implicitly included --]
[#-- @ftlvariable name="imgurls" type="String" --]
[#-- @ftlvariable name="watermarkAngle" type="String" --]
[#-- @ftlvariable name="watermarkHeight" type="String" --]
[#-- @ftlvariable name="watermarkWidth" type="String" --]
[#-- @ftlvariable name="watermarkAlpha" type="String" --]
[#-- @ftlvariable name="watermarkColor" type="String" --]
[#-- @ftlvariable name="watermarkFontsize" type="String" --]
[#-- @ftlvariable name="watermarkFont" type="String" --]
[#-- @ftlvariable name="watermarkYSpace" type="String" --]
[#-- @ftlvariable name="watermarkXSpace" type="String" --]
[#-- @ftlvariable name="watermarkTxt" type="String" --]
[#-- @ftlvariable name="ordinaryUrl" type="String" --]
jodconverter-web/src/main/java/cn/keking/model/FileType.java
View file @
cf1f833d
...
@@ -5,15 +5,17 @@ package cn.keking.model;
...
@@ -5,15 +5,17 @@ package cn.keking.model;
* Content :文件类型,文本,office,压缩包等等
* Content :文件类型,文本,office,压缩包等等
*/
*/
public
enum
FileType
{
public
enum
FileType
{
picture
(
"picture
FilePreviewI
mpl"
),
picture
(
"picture
filepreviewi
mpl"
),
compress
(
"compressFilePreviewImpl"
),
compress
(
"compressFilePreviewImpl"
),
office
(
"officeFilePreviewImpl"
),
office
(
"officeFilePreviewImpl"
),
simText
(
"simTextFilePreviewImpl"
),
simText
(
"simTextFilePreviewImpl"
),
pdf
(
"pdfFilePreviewImpl"
),
pdf
(
"pdfFilePreviewImpl"
),
other
(
"otherFilePreviewImpl"
),
other
(
"otherFilePreviewImpl"
),
media
(
"mediaFilePreviewImpl"
),
media
(
"mediaFilePreviewImpl"
),
markdown
(
"markdownFilePreviewImpl"
),
cad
(
"cadFilePreviewImpl"
);
cad
(
"cadFilePreviewImpl"
);
private
final
String
instanceName
;
private
final
String
instanceName
;
FileType
(
String
instanceName
){
FileType
(
String
instanceName
){
...
...
jodconverter-web/src/main/java/cn/keking/service/impl/MarkdownFilePreviewImpl.java
0 → 100644
View file @
cf1f833d
package
cn
.
keking
.
service
.
impl
;
import
cn.keking.model.FileAttribute
;
import
cn.keking.service.FilePreview
;
import
org.springframework.stereotype.Service
;
import
org.springframework.ui.Model
;
/**
* @author kl (http://kailing.pub)
* @since 2020/12/25
*/
@Service
public
class
MarkdownFilePreviewImpl
implements
FilePreview
{
private
final
SimTextFilePreviewImpl
simTextFilePreview
;
public
MarkdownFilePreviewImpl
(
SimTextFilePreviewImpl
simTextFilePreview
)
{
this
.
simTextFilePreview
=
simTextFilePreview
;
}
@Override
public
String
filePreviewHandle
(
String
url
,
Model
model
,
FileAttribute
fileAttribute
)
{
model
.
addAttribute
(
"markdown"
,
"true"
);
return
simTextFilePreview
.
filePreviewHandle
(
url
,
model
,
fileAttribute
);
}
}
jodconverter-web/src/main/java/cn/keking/utils/DownloadUtils.java
View file @
cf1f833d
...
@@ -58,9 +58,9 @@ public class DownloadUtils {
...
@@ -58,9 +58,9 @@ public class DownloadUtils {
URL
url
=
new
URL
(
urlStr
);
URL
url
=
new
URL
(
urlStr
);
if
(
url
.
getProtocol
()
!=
null
&&
(
url
.
getProtocol
().
toLowerCase
().
startsWith
(
"file"
)||
url
.
getProtocol
().
toLowerCase
().
startsWith
(
"http"
)))
{
if
(
url
.
getProtocol
()
!=
null
&&
(
url
.
getProtocol
().
toLowerCase
().
startsWith
(
"file"
)||
url
.
getProtocol
().
toLowerCase
().
startsWith
(
"http"
)))
{
byte
[]
bytes
=
getBytesFromUrl
(
urlStr
);
byte
[]
bytes
=
getBytesFromUrl
(
urlStr
);
OutputStream
os
=
new
FileOutputStream
(
new
File
(
realPath
)
);
OutputStream
os
=
new
FileOutputStream
(
realPath
);
saveBytesToOutStream
(
bytes
,
os
);
saveBytesToOutStream
(
bytes
,
os
);
}
else
if
(
url
.
getProtocol
()
!=
null
&&
"ftp"
.
equals
(
url
.
getProtocol
().
toLowerCase
()))
{
}
else
if
(
url
.
getProtocol
()
!=
null
&&
"ftp"
.
equals
IgnoreCase
(
url
.
getProtocol
()))
{
String
ftpUsername
=
fileUtils
.
getUrlParameterReg
(
fileAttribute
.
getUrl
(),
URL_PARAM_FTP_USERNAME
);
String
ftpUsername
=
fileUtils
.
getUrlParameterReg
(
fileAttribute
.
getUrl
(),
URL_PARAM_FTP_USERNAME
);
String
ftpPassword
=
fileUtils
.
getUrlParameterReg
(
fileAttribute
.
getUrl
(),
URL_PARAM_FTP_PASSWORD
);
String
ftpPassword
=
fileUtils
.
getUrlParameterReg
(
fileAttribute
.
getUrl
(),
URL_PARAM_FTP_PASSWORD
);
String
ftpControlEncoding
=
fileUtils
.
getUrlParameterReg
(
fileAttribute
.
getUrl
(),
URL_PARAM_FTP_CONTROL_ENCODING
);
String
ftpControlEncoding
=
fileUtils
.
getUrlParameterReg
(
fileAttribute
.
getUrl
(),
URL_PARAM_FTP_CONTROL_ENCODING
);
...
...
jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java
View file @
cf1f833d
...
@@ -27,7 +27,6 @@ public class FileUtils {
...
@@ -27,7 +27,6 @@ public class FileUtils {
private
static
final
String
DEFAULT_CONVERTER_CHARSET
=
System
.
getProperty
(
"sun.jnu.encoding"
);
private
static
final
String
DEFAULT_CONVERTER_CHARSET
=
System
.
getProperty
(
"sun.jnu.encoding"
);
private
final
String
fileDir
=
ConfigConstants
.
getFileDir
();
private
final
String
fileDir
=
ConfigConstants
.
getFileDir
();
private
final
CacheService
cacheService
;
private
final
CacheService
cacheService
;
public
FileUtils
(
CacheService
cacheService
)
{
public
FileUtils
(
CacheService
cacheService
)
{
...
@@ -81,6 +80,9 @@ public class FileUtils {
...
@@ -81,6 +80,9 @@ public class FileUtils {
if
(
listOfficeTypes
().
contains
(
fileType
.
toLowerCase
()))
{
if
(
listOfficeTypes
().
contains
(
fileType
.
toLowerCase
()))
{
return
FileType
.
office
;
return
FileType
.
office
;
}
}
if
(
"md"
.
equalsIgnoreCase
(
fileType
)){
return
FileType
.
markdown
;
}
if
(
Arrays
.
asList
(
simText
).
contains
(
fileType
.
toLowerCase
()))
{
if
(
Arrays
.
asList
(
simText
).
contains
(
fileType
.
toLowerCase
()))
{
return
FileType
.
simText
;
return
FileType
.
simText
;
}
}
...
@@ -323,7 +325,7 @@ public class FileUtils {
...
@@ -323,7 +325,7 @@ public class FileUtils {
FileType
type
;
FileType
type
;
String
suffix
;
String
suffix
;
String
fullFileName
=
getUrlParameterReg
(
url
,
"fullfilename"
);
String
fullFileName
=
getUrlParameterReg
(
url
,
"fullfilename"
);
if
(
!
StringUtils
.
isEmpty
(
fullFileName
))
{
if
(
StringUtils
.
hasText
(
fullFileName
))
{
fileName
=
fullFileName
;
fileName
=
fullFileName
;
type
=
typeFromFileName
(
fileName
);
type
=
typeFromFileName
(
fileName
);
suffix
=
suffixFromFileName
(
fileName
);
suffix
=
suffixFromFileName
(
fileName
);
...
...
jodconverter-web/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
View file @
cf1f833d
...
@@ -32,11 +32,8 @@ public class OnlinePreviewController {
...
@@ -32,11 +32,8 @@ public class OnlinePreviewController {
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
OnlinePreviewController
.
class
);
private
final
Logger
logger
=
LoggerFactory
.
getLogger
(
OnlinePreviewController
.
class
);
private
final
FilePreviewFactory
previewFactory
;
private
final
FilePreviewFactory
previewFactory
;
private
final
CacheService
cacheService
;
private
final
CacheService
cacheService
;
private
final
FileUtils
fileUtils
;
private
final
FileUtils
fileUtils
;
private
final
DownloadUtils
downloadUtils
;
private
final
DownloadUtils
downloadUtils
;
public
OnlinePreviewController
(
FilePreviewFactory
filePreviewFactory
,
public
OnlinePreviewController
(
FilePreviewFactory
filePreviewFactory
,
...
...
jodconverter-web/src/main/resources/static/js/marked.min.js
0 → 100644
View file @
cf1f833d
This diff is collapsed.
Click to expand it.
jodconverter-web/src/main/resources/web/officePicture.ftl
View file @
cf1f833d
...
@@ -63,12 +63,12 @@
...
@@ -63,12 +63,12 @@
window
.
onscroll
=
throttle
(
checkImgs
);
window
.
onscroll
=
throttle
(
checkImgs
);
function
changePreviewType
(
previewType
)
{
function
changePreviewType
(
previewType
)
{
var
url
=
window
.
location
.
href
;
var
url
=
window
.
location
.
href
;
if
(
url
.
indexOf
(
"officePreviewType=image"
)
!=
-
1
)
{
if
(
url
.
indexOf
(
"officePreviewType=image"
)
!=
=
-
1
)
{
url
=
url
.
replace
(
"officePreviewType=image"
,
"officePreviewType="
+
previewType
);
url
=
url
.
replace
(
"officePreviewType=image"
,
"officePreviewType="
+
previewType
);
}
else
{
}
else
{
url
=
url
+
"&officePreviewType="
+
previewType
;
url
=
url
+
"&officePreviewType="
+
previewType
;
}
}
if
(
'allImages'
==
previewType
)
{
if
(
'allImages'
==
=
previewType
)
{
window
.
open
(
url
)
window
.
open
(
url
)
}
else
{
}
else
{
window
.
location
.
href
=
url
;
window
.
location
.
href
=
url
;
...
...
jodconverter-web/src/main/resources/web/txt.ftl
View file @
cf1f833d
<!DOCTYPE html>
<!DOCTYPE html>
<html
lang=
"en"
>
<html
lang=
"en"
>
<head>
<head>
<meta
charset=
"utf-8"
/>
<meta
charset=
"utf-8"
/>
<meta
name=
"viewport"
content=
"width=device-width, user-scalable=yes, initial-scale=1.0"
>
<meta
name=
"viewport"
content=
"width=device-width, user-scalable=yes, initial-scale=1.0"
>
<title>
普通文本预览
</title>
<title>
普通文本预览
</title>
<style>
*
{
margin
:
0
;
padding
:
0
;
}
html
,
body
{
height
:
100%
;
width
:
100%
;
}
</style>
</head>
</head>
<body>
<body>
<div
id =
"text"
></div>
<div
class=
"container"
>
<
#
if
markdown
??
>
<p>
<button
id=
"markdown_btn"
type=
"button"
class=
"btn btn-primary"
>
切换markdown
</button>
<button
id=
"text_btn"
type=
"button"
class=
"btn btn-primary"
>
切换text
</button>
</p>
<div
id=
"markdown"
style=
"padding: 18px;"
></div>
<
#
else
>
<div
id=
"text"
></div>
</
#
if>
</div>
<link
rel=
"stylesheet"
href=
"bootstrap/css/bootstrap.min.css"
/>
<script
src=
"js/jquery-3.0.0.min.js"
type=
"text/javascript"
></script>
<script
src=
"js/jquery-3.0.0.min.js"
type=
"text/javascript"
></script>
<script
src=
"js/jquery.form.min.js"
type=
"text/javascript"
></script>
<script
src=
"bootstrap/js/bootstrap.min.js"
type=
"text/javascript"
></script>
<script
src=
"js/watermark.js"
type=
"text/javascript"
></script>
<script
src=
"js/watermark.js"
type=
"text/javascript"
></script>
<script
src=
"js/marked.min.js"
type=
"text/javascript"
></script>
<script>
<script>
/*初始化水印*/
/*初始化水印*/
window
.
onload
=
function
()
{
window
.
onload
=
function
()
{
var
watermarkTxt
=
'${watermarkTxt}'
;
$
(
"#markdown_btn"
).
hide
()
initWaterMark
();
fetchData
();
}
/**
* 初始化水印
*/
function
initWaterMark
()
{
let
watermarkTxt
=
'${watermarkTxt}'
;
if
(
watermarkTxt
!==
''
)
{
if
(
watermarkTxt
!==
''
)
{
watermark
.
init
({
watermark
.
init
({
watermark_txt
:
'${watermarkTxt}'
,
watermark_txt
:
'${watermarkTxt}'
,
...
@@ -34,23 +50,65 @@
...
@@ -34,23 +50,65 @@
watermark_y_space
:
$
{
watermarkYSpace
},
watermark_y_space
:
$
{
watermarkYSpace
},
watermark_font
:
'${watermarkFont}'
,
watermark_font
:
'${watermarkFont}'
,
watermark_fontsize
:
'${watermarkFontsize}'
,
watermark_fontsize
:
'${watermarkFontsize}'
,
watermark_color
:
'${watermarkColor}'
,
watermark_color
:
'${watermarkColor}'
,
watermark_alpha
:
$
{
watermarkAlpha
},
watermark_alpha
:
$
{
watermarkAlpha
},
watermark_width
:
$
{
watermarkWidth
},
watermark_width
:
$
{
watermarkWidth
},
watermark_height
:
$
{
watermarkHeight
},
watermark_height
:
$
{
watermarkHeight
},
watermark_angle
:
$
{
watermarkAngle
},
watermark_angle
:
$
{
watermarkAngle
},
});
});
}
}
}
/**
* 获取文本数据
*/
function
fetchData
()
{
$
.
ajax
({
$
.
ajax
({
type
:
'GET'
,
type
:
'GET'
,
url
:
'${ordinaryUrl}'
,
url
:
'${ordinaryUrl}'
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
$
(
"#text"
).
html
(
"<pre>"
+
data
+
"</pre>"
);
window
.
textData
=
data
;
window
.
textPreData
=
"<pre>"
+
data
+
"</pre>"
;
window
.
textMarkdownData
=
marked
(
window
.
textData
);
$
(
"#text"
).
html
(
window
.
textPreData
);
$
(
"#markdown"
).
html
(
window
.
textMarkdownData
);
}
}
});
});
}
}
$
(
function
()
{
$
(
"#markdown_btn"
).
click
(
function
()
{
$
(
"#markdown"
).
html
(
window
.
textMarkdownData
);
$
(
"#text_btn"
).
show
()
$
(
"#markdown_btn"
).
hide
()
});
$
(
"#text_btn"
).
click
(
function
()
{
$
(
"#markdown_btn"
).
show
()
$
(
"#text_btn"
).
hide
();
$
(
"#markdown"
).
html
(
window
.
textPreData
);
});
});
</script>
</script>
<style>
*
{
margin
:
0
;
padding
:
0
;
}
html
,
body
{
height
:
100%
;
width
:
100%
;
}
#markdown
{
height
:
97%
;
max-height
:
97%
;
border
:
1px
solid
#eee
;
overflow-y
:
scroll
;
width
:
100%
;
}
</style>
</body>
</body>
</html>
</html>
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