Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
Administrator
solo-1
Commits
23e5551d
Unverified
Commit
23e5551d
authored
Apr 12, 2020
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐛
图床上传相同图片后第二幅显示不出来 Fix #101
parent
8c5e81b2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
14 deletions
+15
-14
src/main/java/org/b3log/solo/util/Images.java
src/main/java/org/b3log/solo/util/Images.java
+13
-12
src/main/java/org/b3log/solo/util/Markdowns.java
src/main/java/org/b3log/solo/util/Markdowns.java
+2
-2
No files found.
src/main/java/org/b3log/solo/util/Images.java
View file @
23e5551d
...
@@ -17,6 +17,9 @@ import org.apache.commons.lang.time.DateUtils;
...
@@ -17,6 +17,9 @@ import org.apache.commons.lang.time.DateUtils;
import
org.apache.logging.log4j.Level
;
import
org.apache.logging.log4j.Level
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.apache.logging.log4j.Logger
;
import
org.jsoup.nodes.Document
;
import
org.jsoup.nodes.Element
;
import
org.jsoup.select.Elements
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -26,7 +29,7 @@ import java.util.concurrent.ThreadLocalRandom;
...
@@ -26,7 +29,7 @@ import java.util.concurrent.ThreadLocalRandom;
* Image utilities.
* Image utilities.
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.
1.0, Feb 27
, 2020
* @version 1.1.
2.0, Apr 12
, 2020
* @since 2.7.0
* @since 2.7.0
*/
*/
public
final
class
Images
{
public
final
class
Images
{
...
@@ -44,27 +47,25 @@ public final class Images {
...
@@ -44,27 +47,25 @@ public final class Images {
/**
/**
* Qiniu image processing.
* Qiniu image processing.
*
*
* @param html the specified content HTML
* @param doc the specified doc
* @return processed content
*/
*/
public
static
String
qiniuImgProcessing
(
final
String
html
)
{
public
static
void
qiniuImgProcessing
(
final
Document
doc
)
{
String
ret
=
html
;
final
Elements
imgs
=
doc
.
select
(
"img"
);
final
String
[]
imgSrcs
=
StringUtils
.
substringsBetween
(
html
,
"<img src=\""
,
"\""
);
if
(
imgs
.
isEmpty
())
{
if
(
null
==
imgSrcs
)
{
return
;
return
ret
;
}
}
for
(
final
String
imgSrc
:
imgSrcs
)
{
for
(
final
Element
img
:
imgs
)
{
String
imgSrc
=
img
.
attr
(
"src"
);
if
(!
StringUtils
.
startsWith
(
imgSrc
,
COMMUNITY_FILE_URL
)
||
if
(!
StringUtils
.
startsWith
(
imgSrc
,
COMMUNITY_FILE_URL
)
||
StringUtils
.
contains
(
imgSrc
,
".gif"
)
||
StringUtils
.
containsIgnoreCase
(
imgSrc
,
"imageView"
)
||
StringUtils
.
contains
(
imgSrc
,
".gif"
)
||
StringUtils
.
containsIgnoreCase
(
imgSrc
,
"imageView"
)
||
StringUtils
.
containsIgnoreCase
(
imgSrc
,
"data:"
))
{
StringUtils
.
containsIgnoreCase
(
imgSrc
,
"data:"
))
{
continue
;
continue
;
}
}
ret
=
StringUtils
.
replace
(
ret
,
imgSrc
,
imgSrc
+
"?imageView2/2/w/1280/format/jpg/interlace/1/q/100"
);
imgSrc
+=
"?imageView2/2/w/1280/format/jpg/interlace/1/q/100"
;
img
.
attr
(
"src"
,
imgSrc
);
}
}
return
ret
;
}
}
/**
/**
...
...
src/main/java/org/b3log/solo/util/Markdowns.java
View file @
23e5551d
...
@@ -54,7 +54,7 @@ import java.util.concurrent.*;
...
@@ -54,7 +54,7 @@ import java.util.concurrent.*;
* </p>
* </p>
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 2.3.1.1
5, Jan 25
, 2020
* @version 2.3.1.1
6, Apr 12
, 2020
* @since 0.4.5
* @since 0.4.5
*/
*/
public
final
class
Markdowns
{
public
final
class
Markdowns
{
...
@@ -225,10 +225,10 @@ public final class Markdowns {
...
@@ -225,10 +225,10 @@ public final class Markdowns {
toRemove
.
forEach
(
Node:
:
remove
);
toRemove
.
forEach
(
Node:
:
remove
);
doc
.
outputSettings
().
prettyPrint
(
false
);
doc
.
outputSettings
().
prettyPrint
(
false
);
Images
.
qiniuImgProcessing
(
doc
);
String
ret
=
doc
.
select
(
"body"
).
html
();
String
ret
=
doc
.
select
(
"body"
).
html
();
ret
=
StringUtils
.
trim
(
ret
);
ret
=
StringUtils
.
trim
(
ret
);
ret
=
Images
.
qiniuImgProcessing
(
ret
);
// cache it
// cache it
putHTML
(
markdownText
,
ret
);
putHTML
(
markdownText
,
ret
);
...
...
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