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
d728e701
Unverified
Commit
d728e701
authored
Apr 14, 2020
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
页面静态化 #107
parent
36bf7d7e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
23 deletions
+24
-23
src/main/java/org/b3log/solo/cache/ArticleCache.java
src/main/java/org/b3log/solo/cache/ArticleCache.java
+4
-0
src/main/java/org/b3log/solo/cache/CommentCache.java
src/main/java/org/b3log/solo/cache/CommentCache.java
+4
-0
src/main/java/org/b3log/solo/cache/OptionCache.java
src/main/java/org/b3log/solo/cache/OptionCache.java
+6
-0
src/main/java/org/b3log/solo/cache/PageCache.java
src/main/java/org/b3log/solo/cache/PageCache.java
+4
-0
src/main/java/org/b3log/solo/util/Statics.java
src/main/java/org/b3log/solo/util/Statics.java
+6
-23
No files found.
src/main/java/org/b3log/solo/cache/ArticleCache.java
View file @
d728e701
...
@@ -15,6 +15,7 @@ import org.b3log.latke.Keys;
...
@@ -15,6 +15,7 @@ import org.b3log.latke.Keys;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.model.Article
;
import
org.b3log.solo.util.Solos
;
import
org.b3log.solo.util.Solos
;
import
org.b3log.solo.util.Statics
;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -78,6 +79,7 @@ public class ArticleCache {
...
@@ -78,6 +79,7 @@ public class ArticleCache {
public
void
putArticle
(
final
JSONObject
article
)
{
public
void
putArticle
(
final
JSONObject
article
)
{
idCache
.
put
(
article
.
optString
(
Keys
.
OBJECT_ID
),
Solos
.
clone
(
article
));
idCache
.
put
(
article
.
optString
(
Keys
.
OBJECT_ID
),
Solos
.
clone
(
article
));
permalinkCache
.
put
(
article
.
optString
(
Article
.
ARTICLE_PERMALINK
),
Solos
.
clone
(
article
));
permalinkCache
.
put
(
article
.
optString
(
Article
.
ARTICLE_PERMALINK
),
Solos
.
clone
(
article
));
Statics
.
clear
();
}
}
/**
/**
...
@@ -93,6 +95,7 @@ public class ArticleCache {
...
@@ -93,6 +95,7 @@ public class ArticleCache {
final
String
permalink
=
article
.
optString
(
Article
.
ARTICLE_PERMALINK
);
final
String
permalink
=
article
.
optString
(
Article
.
ARTICLE_PERMALINK
);
idCache
.
remove
(
id
);
idCache
.
remove
(
id
);
permalinkCache
.
remove
(
permalink
);
permalinkCache
.
remove
(
permalink
);
Statics
.
clear
();
}
}
/**
/**
...
@@ -101,5 +104,6 @@ public class ArticleCache {
...
@@ -101,5 +104,6 @@ public class ArticleCache {
public
void
clear
()
{
public
void
clear
()
{
idCache
.
clear
();
idCache
.
clear
();
permalinkCache
.
clear
();
permalinkCache
.
clear
();
Statics
.
clear
();
}
}
}
}
\ No newline at end of file
src/main/java/org/b3log/solo/cache/CommentCache.java
View file @
d728e701
...
@@ -14,6 +14,7 @@ package org.b3log.solo.cache;
...
@@ -14,6 +14,7 @@ package org.b3log.solo.cache;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.solo.util.Solos
;
import
org.b3log.solo.util.Solos
;
import
org.b3log.solo.util.Statics
;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -56,6 +57,7 @@ public class CommentCache {
...
@@ -56,6 +57,7 @@ public class CommentCache {
*/
*/
public
void
putComment
(
final
JSONObject
comment
)
{
public
void
putComment
(
final
JSONObject
comment
)
{
cache
.
put
(
comment
.
optString
(
Keys
.
OBJECT_ID
),
Solos
.
clone
(
comment
));
cache
.
put
(
comment
.
optString
(
Keys
.
OBJECT_ID
),
Solos
.
clone
(
comment
));
Statics
.
clear
();
}
}
/**
/**
...
@@ -65,6 +67,7 @@ public class CommentCache {
...
@@ -65,6 +67,7 @@ public class CommentCache {
*/
*/
public
void
removeComment
(
final
String
id
)
{
public
void
removeComment
(
final
String
id
)
{
cache
.
remove
(
id
);
cache
.
remove
(
id
);
Statics
.
clear
();
}
}
/**
/**
...
@@ -72,5 +75,6 @@ public class CommentCache {
...
@@ -72,5 +75,6 @@ public class CommentCache {
*/
*/
public
void
clear
()
{
public
void
clear
()
{
cache
.
clear
();
cache
.
clear
();
Statics
.
clear
();
}
}
}
}
src/main/java/org/b3log/solo/cache/OptionCache.java
View file @
d728e701
...
@@ -15,6 +15,7 @@ import org.b3log.latke.Keys;
...
@@ -15,6 +15,7 @@ import org.b3log.latke.Keys;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.solo.model.Option
;
import
org.b3log.solo.model.Option
;
import
org.b3log.solo.util.Solos
;
import
org.b3log.solo.util.Solos
;
import
org.b3log.solo.util.Statics
;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -72,6 +73,7 @@ public class OptionCache {
...
@@ -72,6 +73,7 @@ public class OptionCache {
*/
*/
public
void
putCategory
(
final
String
category
,
final
JSONObject
mergedOptions
)
{
public
void
putCategory
(
final
String
category
,
final
JSONObject
mergedOptions
)
{
categoryCache
.
put
(
category
,
mergedOptions
);
categoryCache
.
put
(
category
,
mergedOptions
);
Statics
.
clear
();
}
}
/**
/**
...
@@ -99,6 +101,8 @@ public class OptionCache {
...
@@ -99,6 +101,8 @@ public class OptionCache {
final
String
category
=
option
.
optString
(
Option
.
OPTION_CATEGORY
);
final
String
category
=
option
.
optString
(
Option
.
OPTION_CATEGORY
);
removeCategory
(
category
);
removeCategory
(
category
);
Statics
.
clear
();
}
}
/**
/**
...
@@ -116,6 +120,7 @@ public class OptionCache {
...
@@ -116,6 +120,7 @@ public class OptionCache {
removeCategory
(
category
);
removeCategory
(
category
);
cache
.
remove
(
id
);
cache
.
remove
(
id
);
Statics
.
clear
();
}
}
/**
/**
...
@@ -124,5 +129,6 @@ public class OptionCache {
...
@@ -124,5 +129,6 @@ public class OptionCache {
public
void
clear
()
{
public
void
clear
()
{
cache
.
clear
();
cache
.
clear
();
categoryCache
.
clear
();
categoryCache
.
clear
();
Statics
.
clear
();
}
}
}
}
src/main/java/org/b3log/solo/cache/PageCache.java
View file @
d728e701
...
@@ -14,6 +14,7 @@ package org.b3log.solo.cache;
...
@@ -14,6 +14,7 @@ package org.b3log.solo.cache;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.latke.ioc.Singleton
;
import
org.b3log.solo.util.Solos
;
import
org.b3log.solo.util.Solos
;
import
org.b3log.solo.util.Statics
;
import
org.json.JSONObject
;
import
org.json.JSONObject
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -58,6 +59,7 @@ public class PageCache {
...
@@ -58,6 +59,7 @@ public class PageCache {
final
String
pageId
=
page
.
optString
(
Keys
.
OBJECT_ID
);
final
String
pageId
=
page
.
optString
(
Keys
.
OBJECT_ID
);
cache
.
put
(
pageId
,
Solos
.
clone
(
page
));
cache
.
put
(
pageId
,
Solos
.
clone
(
page
));
Statics
.
clear
();
}
}
/**
/**
...
@@ -67,6 +69,7 @@ public class PageCache {
...
@@ -67,6 +69,7 @@ public class PageCache {
*/
*/
public
void
removePage
(
final
String
id
)
{
public
void
removePage
(
final
String
id
)
{
cache
.
remove
(
id
);
cache
.
remove
(
id
);
Statics
.
clear
();
}
}
/**
/**
...
@@ -74,5 +77,6 @@ public class PageCache {
...
@@ -74,5 +77,6 @@ public class PageCache {
*/
*/
public
void
clear
()
{
public
void
clear
()
{
cache
.
clear
();
cache
.
clear
();
Statics
.
clear
();
}
}
}
}
src/main/java/org/b3log/solo/util/Statics.java
View file @
d728e701
...
@@ -13,7 +13,6 @@ package org.b3log.solo.util;
...
@@ -13,7 +13,6 @@ package org.b3log.solo.util;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.math.RandomUtils
;
import
org.apache.commons.lang.time.DateFormatUtils
;
import
org.apache.commons.lang.time.DateFormatUtils
;
import
org.apache.logging.log4j.Level
;
import
org.apache.logging.log4j.Level
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.LogManager
;
...
@@ -35,7 +34,7 @@ import java.util.zip.GZIPInputStream;
...
@@ -35,7 +34,7 @@ import java.util.zip.GZIPInputStream;
import
java.util.zip.GZIPOutputStream
;
import
java.util.zip.GZIPOutputStream
;
/**
/**
* Static utilities.
* Static utilities.
页面静态化 https://github.com/88250/solo/issues/107
*
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.0, Apr 14, 2020
* @version 1.0.0.0, Apr 14, 2020
...
@@ -129,28 +128,12 @@ public final class Statics {
...
@@ -129,28 +128,12 @@ public final class Statics {
}
}
}
}
private
static
File
[]
files
;
public
static
void
clear
()
{
try
{
/**
FileUtils
.
cleanDirectory
(
DIR
);
* Gets static HTML randomly.
}
catch
(
final
Exception
e
)
{
*
LOGGER
.
log
(
Level
.
ERROR
,
"Clears static cached files failed"
,
e
);
* @return HTML
*/
public
static
String
random
()
{
if
(
null
==
DIR
)
{
return
null
;
}
if
(
null
==
files
)
{
files
=
DIR
.
listFiles
();
if
(
null
==
files
)
{
return
null
;
}
}
}
final
File
file
=
files
[
RandomUtils
.
nextInt
(
files
.
length
)];
return
readFile
(
file
);
}
}
private
static
String
readFile
(
final
File
file
)
{
private
static
String
readFile
(
final
File
file
)
{
...
...
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