Commit a8a73e31 authored by Liang Ding's avatar Liang Ding

🎨 适应 Latke 调整

parent 069d11a6
...@@ -17,7 +17,6 @@ package org.b3log.solo; ...@@ -17,7 +17,6 @@ package org.b3log.solo;
import org.apache.commons.cli.*; import org.apache.commons.cli.*;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.RuntimeMode;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
import org.b3log.latke.util.Strings; import org.b3log.latke.util.Strings;
...@@ -32,14 +31,14 @@ import java.net.URI; ...@@ -32,14 +31,14 @@ import java.net.URI;
/** /**
* Solo with embedded Jetty, <a href="https://github.com/b3log/solo/issues/12037">standalone mode</a>. * Solo with embedded Jetty, <a href="https://github.com/b3log/solo/issues/12037">standalone mode</a>.
* * <p>
* <ul> * <ul>
* <li>Windows: java -cp WEB-INF/lib/*;WEB-INF/classes org.b3log.solo.Starter</li> * <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> * <li>Unix-like: java -cp WEB-INF/lib/*:WEB-INF/classes org.b3log.solo.Starter</li>
* </ul> * </ul>
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @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 * @since 1.2.0
*/ */
public final class Starter { public final class Starter {
...@@ -52,6 +51,12 @@ public final class Starter { ...@@ -52,6 +51,12 @@ public final class Starter {
} }
} }
/**
* Private constructor.
*/
private Starter() {
}
/** /**
* Main. * Main.
* *
...@@ -140,7 +145,7 @@ public final class Starter { ...@@ -140,7 +145,7 @@ public final class Starter {
if (null != runtimeMode) { if (null != runtimeMode) {
Latkes.setRuntimeMode(Latkes.RuntimeMode.valueOf(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."); logger.info("Standalone mode, see [https://github.com/b3log/solo/issues/12037] for more details.");
Latkes.initRuntimeEnv(); Latkes.initRuntimeEnv();
...@@ -182,10 +187,4 @@ public final class Starter { ...@@ -182,10 +187,4 @@ public final class Starter {
server.join(); server.join();
} }
/**
* Private constructor.
*/
private Starter() {
}
} }
...@@ -15,10 +15,8 @@ ...@@ -15,10 +15,8 @@
*/ */
package org.b3log.solo.dev; package org.b3log.solo.dev;
import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.DateUtils;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.RuntimeMode;
import org.b3log.latke.ioc.inject.Inject; import org.b3log.latke.ioc.inject.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
...@@ -43,7 +41,7 @@ import java.util.Date; ...@@ -43,7 +41,7 @@ import java.util.Date;
* Generates some dummy articles for development testing. * Generates some dummy articles for development testing.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @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 * @since 0.4.0
*/ */
@RequestProcessor @RequestProcessor
...@@ -52,7 +50,7 @@ public class ArticleGenerator { ...@@ -52,7 +50,7 @@ public class ArticleGenerator {
/** /**
* Logger. * Logger.
*/ */
private static final Logger LOGGER = Logger.getLogger(ArticleGenerator.class.getName()); private static final Logger LOGGER = Logger.getLogger(ArticleGenerator.class);
/** /**
* Article management service. * Article management service.
...@@ -68,18 +66,18 @@ public class ArticleGenerator { ...@@ -68,18 +66,18 @@ public class ArticleGenerator {
/** /**
* Generates some dummy articles with the specified context. * Generates some dummy articles with the specified context.
* *
* @param context the specified context * @param context the specified context
* @param request the specified request * @param request the specified request
* @param response the specified response * @param response the specified response
* @throws IOException io exception * @throws IOException io exception
*/ */
@RequestProcessing(value = "/dev/articles/gen/*", method = HTTPRequestMethod.GET) @RequestProcessing(value = "/dev/articles/gen/*", method = HTTPRequestMethod.GET)
public void genArticles(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response) public void genArticles(final HTTPRequestContext context, final HttpServletRequest request, final HttpServletResponse response)
throws IOException { throws IOException {
if (Latkes.RuntimeMode.DEVELOPMENT != Latkes.getRuntimeMode()) { if (Latkes.RuntimeMode.DEVELOPMENT != Latkes.getRuntimeMode()) {
LOGGER.log(Level.WARN, "Article generation just for development mode, " + "current runtime mode is [{0}]", LOGGER.log(Level.WARN, "Article generation just for development mode, " + "current runtime mode is [{0}]",
Latkes.getRuntimeMode()); Latkes.getRuntimeMode());
response.sendRedirect(Latkes.getServePath()); response.sendRedirect(Latkes.getServePath());
return; return;
...@@ -96,7 +94,6 @@ public class ArticleGenerator { ...@@ -96,7 +94,6 @@ public class ArticleGenerator {
for (int i = 0; i < num; i++) { for (int i = 0; i < num; i++) {
final JSONObject article = new JSONObject(); final JSONObject article = new JSONObject();
article.put(Article.ARTICLE_TITLE, "article title" + i); article.put(Article.ARTICLE_TITLE, "article title" + i);
article.put(Article.ARTICLE_ABSTRACT, "article" + i + " abstract"); article.put(Article.ARTICLE_ABSTRACT, "article" + i + " abstract");
final int deviationTag = 3; final int deviationTag = 3;
...@@ -115,10 +112,8 @@ public class ArticleGenerator { ...@@ -115,10 +112,8 @@ public class ArticleGenerator {
final int deviationDay = -(Integer.valueOf(String.valueOf(i).substring(0, 1)) % deviationBase); final int deviationDay = -(Integer.valueOf(String.valueOf(i).substring(0, 1)) % deviationBase);
final Date date = DateUtils.addMonths(new Date(), deviationDay); final Date date = DateUtils.addMonths(new Date(), deviationDay);
article.put(Article.ARTICLE_CREATE_DATE, date); article.put(Article.ARTICLE_CREATE_DATE, date);
article.put(Article.ARTICLE_UPDATE_DATE, date); article.put(Article.ARTICLE_UPDATE_DATE, date);
article.put(Article.ARTICLE_RANDOM_DOUBLE, Math.random()); article.put(Article.ARTICLE_RANDOM_DOUBLE, Math.random());
article.put(Article.ARTICLE_COMMENTABLE, true); article.put(Article.ARTICLE_COMMENTABLE, true);
article.put(Article.ARTICLE_VIEW_PWD, ""); article.put(Article.ARTICLE_VIEW_PWD, "");
...@@ -126,7 +121,6 @@ public class ArticleGenerator { ...@@ -126,7 +121,6 @@ public class ArticleGenerator {
articleMgmtService.addArticle(new JSONObject().put(Article.ARTICLE, article)); articleMgmtService.addArticle(new JSONObject().put(Article.ARTICLE, article));
} }
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.ERROR, e.getMessage(), e); LOGGER.log(Level.ERROR, e.getMessage(), e);
} }
......
...@@ -21,7 +21,6 @@ import org.apache.commons.io.IOUtils; ...@@ -21,7 +21,6 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.RuntimeDatabase;
import org.b3log.latke.event.Event; import org.b3log.latke.event.Event;
import org.b3log.latke.event.EventException; import org.b3log.latke.event.EventException;
import org.b3log.latke.event.EventManager; import org.b3log.latke.event.EventManager;
...@@ -70,7 +69,7 @@ import java.util.*; ...@@ -70,7 +69,7 @@ import java.util.*;
* Admin console render processing. * Admin console render processing.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.5.2.12, Jul 6, 2017 * @version 1.5.2.13, Jul 9, 2017
* @since 0.4.1 * @since 0.4.1
*/ */
@RequestProcessor @RequestProcessor
......
...@@ -19,7 +19,6 @@ import org.apache.commons.lang.time.DateFormatUtils; ...@@ -19,7 +19,6 @@ import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.DateUtils;
import org.b3log.latke.Keys; import org.b3log.latke.Keys;
import org.b3log.latke.Latkes; import org.b3log.latke.Latkes;
import org.b3log.latke.RuntimeDatabase;
import org.b3log.latke.ioc.inject.Inject; import org.b3log.latke.ioc.inject.Inject;
import org.b3log.latke.logging.Level; import org.b3log.latke.logging.Level;
import org.b3log.latke.logging.Logger; import org.b3log.latke.logging.Logger;
...@@ -62,7 +61,7 @@ import java.util.Set; ...@@ -62,7 +61,7 @@ import java.util.Set;
* Solo initialization service. * Solo initialization service.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.5.2.12, Jul 6, 2017 * @version 1.5.2.13, Jul 9, 2017
* @since 0.4.0 * @since 0.4.0
*/ */
@Service @Service
...@@ -73,6 +72,16 @@ public class InitService { ...@@ -73,6 +72,16 @@ public class InitService {
*/ */
private static final Logger LOGGER = Logger.getLogger(InitService.class); 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. * Statistic repository.
*/ */
...@@ -133,16 +142,6 @@ public class InitService { ...@@ -133,16 +142,6 @@ public class InitService {
@Inject @Inject
private LinkRepository linkRepository; 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. * Language service.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment