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
a8a73e31
Commit
a8a73e31
authored
Jul 09, 2017
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎨
适应 Latke 调整
parent
069d11a6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
38 deletions
+29
-38
src/main/java/org/b3log/solo/Starter.java
src/main/java/org/b3log/solo/Starter.java
+9
-10
src/main/java/org/b3log/solo/dev/ArticleGenerator.java
src/main/java/org/b3log/solo/dev/ArticleGenerator.java
+8
-14
src/main/java/org/b3log/solo/processor/console/AdminConsole.java
...n/java/org/b3log/solo/processor/console/AdminConsole.java
+1
-2
src/main/java/org/b3log/solo/service/InitService.java
src/main/java/org/b3log/solo/service/InitService.java
+11
-12
No files found.
src/main/java/org/b3log/solo/Starter.java
View file @
a8a73e31
...
...
@@ -17,7 +17,6 @@ package org.b3log.solo;
import
org.apache.commons.cli.*
;
import
org.b3log.latke.Latkes
;
import
org.b3log.latke.RuntimeMode
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
import
org.b3log.latke.util.Strings
;
...
...
@@ -32,14 +31,14 @@ import java.net.URI;
/**
* Solo with embedded Jetty, <a href="https://github.com/b3log/solo/issues/12037">standalone mode</a>.
*
*
<p>
* <ul>
* <li>Windows: java -cp WEB-INF/lib/*;WEB-INF/classes org.b3log.solo.Starter</li>
* <li>Unix-like: java -cp WEB-INF/lib/*:WEB-INF/classes org.b3log.solo.Starter</li>
* </ul>
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.0.
8, May 4
, 2017
* @version 1.1.0.
9, Jul 9
, 2017
* @since 1.2.0
*/
public
final
class
Starter
{
...
...
@@ -52,6 +51,12 @@ public final class Starter {
}
}
/**
* Private constructor.
*/
private
Starter
()
{
}
/**
* Main.
*
...
...
@@ -140,7 +145,7 @@ public final class Starter {
if
(
null
!=
runtimeMode
)
{
Latkes
.
setRuntimeMode
(
Latkes
.
RuntimeMode
.
valueOf
(
runtimeMode
));
}
Latkes
.
setScanPath
(
"org.b3log.solo"
);
// For Latke IoC
Latkes
.
setScanPath
(
"org.b3log.solo"
);
// For Latke IoC
logger
.
info
(
"Standalone mode, see [https://github.com/b3log/solo/issues/12037] for more details."
);
Latkes
.
initRuntimeEnv
();
...
...
@@ -182,10 +187,4 @@ public final class Starter {
server
.
join
();
}
/**
* Private constructor.
*/
private
Starter
()
{
}
}
src/main/java/org/b3log/solo/dev/ArticleGenerator.java
View file @
a8a73e31
...
...
@@ -15,10 +15,8 @@
*/
package
org
.
b3log
.
solo
.
dev
;
import
org.apache.commons.lang.time.DateUtils
;
import
org.b3log.latke.Latkes
;
import
org.b3log.latke.RuntimeMode
;
import
org.b3log.latke.ioc.inject.Inject
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
...
...
@@ -43,7 +41,7 @@ import java.util.Date;
* Generates some dummy articles for development testing.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.0.
4, Feb 1, 2013
* @version 1.0.0.
5, Jul 9, 2017
* @since 0.4.0
*/
@RequestProcessor
...
...
@@ -52,7 +50,7 @@ public class ArticleGenerator {
/**
* Logger.
*/
private
static
final
Logger
LOGGER
=
Logger
.
getLogger
(
ArticleGenerator
.
class
.
getName
()
);
private
static
final
Logger
LOGGER
=
Logger
.
getLogger
(
ArticleGenerator
.
class
);
/**
* Article management service.
...
...
@@ -68,18 +66,18 @@ public class ArticleGenerator {
/**
* Generates some dummy articles with the specified context.
*
* @param context the specified context
* @param request the specified request
*
* @param context
the specified context
* @param request
the specified request
* @param response the specified response
* @throws IOException io exception
* @throws IOException io exception
*/
@RequestProcessing
(
value
=
"/dev/articles/gen/*"
,
method
=
HTTPRequestMethod
.
GET
)
public
void
genArticles
(
final
HTTPRequestContext
context
,
final
HttpServletRequest
request
,
final
HttpServletResponse
response
)
throws
IOException
{
throws
IOException
{
if
(
Latkes
.
RuntimeMode
.
DEVELOPMENT
!=
Latkes
.
getRuntimeMode
())
{
LOGGER
.
log
(
Level
.
WARN
,
"Article generation just for development mode, "
+
"current runtime mode is [{0}]"
,
Latkes
.
getRuntimeMode
());
Latkes
.
getRuntimeMode
());
response
.
sendRedirect
(
Latkes
.
getServePath
());
return
;
...
...
@@ -96,7 +94,6 @@ public class ArticleGenerator {
for
(
int
i
=
0
;
i
<
num
;
i
++)
{
final
JSONObject
article
=
new
JSONObject
();
article
.
put
(
Article
.
ARTICLE_TITLE
,
"article title"
+
i
);
article
.
put
(
Article
.
ARTICLE_ABSTRACT
,
"article"
+
i
+
" abstract"
);
final
int
deviationTag
=
3
;
...
...
@@ -115,10 +112,8 @@ public class ArticleGenerator {
final
int
deviationDay
=
-(
Integer
.
valueOf
(
String
.
valueOf
(
i
).
substring
(
0
,
1
))
%
deviationBase
);
final
Date
date
=
DateUtils
.
addMonths
(
new
Date
(),
deviationDay
);
article
.
put
(
Article
.
ARTICLE_CREATE_DATE
,
date
);
article
.
put
(
Article
.
ARTICLE_UPDATE_DATE
,
date
);
article
.
put
(
Article
.
ARTICLE_RANDOM_DOUBLE
,
Math
.
random
());
article
.
put
(
Article
.
ARTICLE_COMMENTABLE
,
true
);
article
.
put
(
Article
.
ARTICLE_VIEW_PWD
,
""
);
...
...
@@ -126,7 +121,6 @@ public class ArticleGenerator {
articleMgmtService
.
addArticle
(
new
JSONObject
().
put
(
Article
.
ARTICLE
,
article
));
}
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
e
.
getMessage
(),
e
);
}
...
...
src/main/java/org/b3log/solo/processor/console/AdminConsole.java
View file @
a8a73e31
...
...
@@ -21,7 +21,6 @@ import org.apache.commons.io.IOUtils;
import
org.apache.commons.lang.StringUtils
;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.Latkes
;
import
org.b3log.latke.RuntimeDatabase
;
import
org.b3log.latke.event.Event
;
import
org.b3log.latke.event.EventException
;
import
org.b3log.latke.event.EventManager
;
...
...
@@ -70,7 +69,7 @@ import java.util.*;
* Admin console render processing.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.5.2.1
2, Jul 6
, 2017
* @version 1.5.2.1
3, Jul 9
, 2017
* @since 0.4.1
*/
@RequestProcessor
...
...
src/main/java/org/b3log/solo/service/InitService.java
View file @
a8a73e31
...
...
@@ -19,7 +19,6 @@ import org.apache.commons.lang.time.DateFormatUtils;
import
org.apache.commons.lang.time.DateUtils
;
import
org.b3log.latke.Keys
;
import
org.b3log.latke.Latkes
;
import
org.b3log.latke.RuntimeDatabase
;
import
org.b3log.latke.ioc.inject.Inject
;
import
org.b3log.latke.logging.Level
;
import
org.b3log.latke.logging.Logger
;
...
...
@@ -62,7 +61,7 @@ import java.util.Set;
* Solo initialization service.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.5.2.1
2, Jul 6
, 2017
* @version 1.5.2.1
3, Jul 9
, 2017
* @since 0.4.0
*/
@Service
...
...
@@ -73,6 +72,16 @@ public class InitService {
*/
private
static
final
Logger
LOGGER
=
Logger
.
getLogger
(
InitService
.
class
);
/**
* Maximum count of initialization.
*/
private
static
final
int
MAX_RETRIES_CNT
=
3
;
/**
* Initialized time zone id.
*/
private
static
final
String
INIT_TIME_ZONE_ID
=
"Asia/Shanghai"
;
/**
* Statistic repository.
*/
...
...
@@ -133,16 +142,6 @@ public class InitService {
@Inject
private
LinkRepository
linkRepository
;
/**
* Maximum count of initialization.
*/
private
static
final
int
MAX_RETRIES_CNT
=
3
;
/**
* Initialized time zone id.
*/
private
static
final
String
INIT_TIME_ZONE_ID
=
"Asia/Shanghai"
;
/**
* Language service.
*/
...
...
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