From c2f443523656958550bed4bb0a63827a7d694f32 Mon Sep 17 00:00:00 2001
From: Liang Ding <d@b3log.org>
Date: Thu, 9 Jul 2020 21:43:35 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E7=A7=BB=E9=99=A4=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=9A=84=E9=BB=91=E5=AE=A2=E6=B4=BE=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=20Fix=20#165?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/b3log/solo/service/InitService.java   | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/main/java/org/b3log/solo/service/InitService.java b/src/main/java/org/b3log/solo/service/InitService.java
index 859680335..ddd38ca5a 100644
--- a/src/main/java/org/b3log/solo/service/InitService.java
+++ b/src/main/java/org/b3log/solo/service/InitService.java
@@ -47,7 +47,7 @@
  * Solo initialization service.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.5.2.46, Jul 8, 2020
+ * @version 1.5.2.47, Jul 9, 2020
  * @since 0.4.0
  */
 @Service
@@ -150,11 +150,9 @@ public boolean isInited() {
                 LOGGER.log(Level.WARN, "Solo has not been initialized, please open your browser to init Solo");
                 printedInitMsg = true;
             }
-
             return inited;
         } catch (final Exception e) {
             LOGGER.log(Level.ERROR, "Check init failed", e);
-
             System.exit(-1);
             return false;
         }
@@ -173,7 +171,6 @@ public void initTables() {
             }
         } catch (final Exception e) {
             LOGGER.log(Level.ERROR, "Check tables failed, please make sure database existed and database configuration [jdbc.*] in local.props is correct [msg=" + e.getMessage() + "]");
-
             System.exit(-1);
         }
 
@@ -214,13 +211,11 @@ public void init(final JSONObject requestJSONObject) {
             initStatistic();
             initOptions(requestJSONObject);
             initAdmin(requestJSONObject);
-            initLink();
             helloWorld();
 
             transaction.commit();
         } catch (final Throwable e) {
             LOGGER.log(Level.ERROR, "Initializes Solo failed", e);
-
             System.exit(-1);
         } finally {
             if (transaction.isActive()) {
@@ -351,14 +346,12 @@ private JSONArray tag(final String[] tagTitles, final JSONObject article) throws
         for (String tagTitle1 : tagTitles) {
             final String tagTitle = tagTitle1.trim();
             final JSONObject tag = new JSONObject();
-
             LOGGER.log(Level.TRACE, "Found a new tag[title={}] in article[title={}]", tagTitle, article.optString(Article.ARTICLE_TITLE));
             tag.put(Tag.TAG_TITLE, tagTitle);
             final String tagId = tagRepository.add(tag);
             tag.put(Keys.OBJECT_ID, tagId);
             ret.put(tag);
         }
-
         return ret;
     }
 
@@ -377,7 +370,6 @@ private JSONArray tag(final String[] tagTitles, final JSONObject article) throws
     private void initAdmin(final JSONObject requestJSONObject) throws Exception {
         LOGGER.debug("Initializing admin....");
         final JSONObject admin = new JSONObject();
-
         admin.put(User.USER_NAME, requestJSONObject.getString(User.USER_NAME));
         admin.put(User.USER_URL, Latkes.getServePath());
         admin.put(User.USER_ROLE, Role.ADMIN_ROLE);
@@ -389,25 +381,6 @@ private void initAdmin(final JSONObject requestJSONObject) throws Exception {
         LOGGER.debug("Initialized admin");
     }
 
-    /**
-     * Initializes link.
-     *
-     * @throws Exception exception
-     */
-    private void initLink() throws Exception {
-        LOGGER.debug("Initializing link....");
-        final JSONObject link = new JSONObject();
-
-        link.put(Link.LINK_TITLE, "黑客派");
-        link.put(Link.LINK_ADDRESS, "https://hacpai.com");
-        link.put(Link.LINK_DESCRIPTION, "黑客与画家的社区");
-        link.put(Link.LINK_ICON, "https://static.hacpai.com/images/favicon.png");
-        final int maxOrder = linkRepository.getMaxOrder();
-        link.put(Link.LINK_ORDER, maxOrder + 1);
-        linkRepository.add(link);
-        LOGGER.debug("Initialized link");
-    }
-
     /**
      * Initializes statistic.
      *
@@ -416,13 +389,11 @@ private void initLink() throws Exception {
      */
     private void initStatistic() throws RepositoryException, JSONException {
         LOGGER.debug("Initializing statistic....");
-
         final JSONObject statisticBlogViewCountOpt = new JSONObject();
         statisticBlogViewCountOpt.put(Keys.OBJECT_ID, Option.ID_C_STATISTIC_BLOG_VIEW_COUNT);
         statisticBlogViewCountOpt.put(Option.OPTION_VALUE, "0");
         statisticBlogViewCountOpt.put(Option.OPTION_CATEGORY, Option.CATEGORY_C_STATISTIC);
         optionRepository.add(statisticBlogViewCountOpt);
-
         LOGGER.debug("Initialized statistic");
     }