Commit c7c00323 authored by Liang Ding's avatar Liang Ding

🎨 #12825

parent 0edb411f
...@@ -26,7 +26,7 @@ import org.json.JSONObject; ...@@ -26,7 +26,7 @@ import org.json.JSONObject;
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @author <a href="https://github.com/hzchendou">hzchendou</a> * @author <a href="https://github.com/hzchendou">hzchendou</a>
* @version 1.6.0.1, Apr 16, 2019 * @version 1.6.0.2, Aug 18, 2019
* @since 0.6.0 * @since 0.6.0
*/ */
public final class Option { public final class Option {
...@@ -58,10 +58,16 @@ public final class Option { ...@@ -58,10 +58,16 @@ public final class Option {
public static final String ID_C_HLJS_THEME = "hljsTheme"; public static final String ID_C_HLJS_THEME = "hljsTheme";
/** /**
* Key of enable syn GitHub. 博文定时同步 GitHub 仓库 https://hacpai.com/article/1557238327458 * Key of enable sync (push) GitHub. 导出文章到仓库 https://hacpai.com/article/1557238327458
*/ */
public static final String ID_C_SYNC_GITHUB = "syncGitHub"; public static final String ID_C_SYNC_GITHUB = "syncGitHub";
/**
* Key of enable sync (pull) GitHub. 拉取并展示仓库 https://hacpai.com/article/1557238327458
* https://github.com/b3log/solo/issues/12825
*/
public static final String ID_C_PULL_GITHUB = "pullGitHub";
/** /**
* Key of favicon URL. * Key of favicon URL.
*/ */
...@@ -294,7 +300,7 @@ public final class Option { ...@@ -294,7 +300,7 @@ public final class Option {
* Default preference. * Default preference.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 2.3.0.1, Jul 30, 2019 * @version 2.3.0.2, Aug 18, 2019
* @since 0.3.1 * @since 0.3.1
*/ */
public static final class DefaultPreference { public static final class DefaultPreference {
...@@ -305,10 +311,15 @@ public final class Option { ...@@ -305,10 +311,15 @@ public final class Option {
public static final String DEFAULT_HLJS_THEME = "atom-one-light"; public static final String DEFAULT_HLJS_THEME = "atom-one-light";
/** /**
* Default enable sync GitHub. * Default enable sync push GitHub.
*/ */
public static final String DEFAULT_SYNC_GITHUB = "true"; public static final String DEFAULT_SYNC_GITHUB = "true";
/**
* Default enable sync pull GitHub.
*/
public static final String DEFAULT_PULL_GITHUB = "true";
/** /**
* Default favicon URL. * Default favicon URL.
*/ */
......
...@@ -52,7 +52,7 @@ import static org.b3log.solo.model.Article.*; ...@@ -52,7 +52,7 @@ import static org.b3log.solo.model.Article.*;
* Article management service. * Article management service.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.3.1.5, Jul 22, 2019 * @version 1.3.1.6, Aug 18, 2019
* @since 0.3.5 * @since 0.3.5
*/ */
@Service @Service
...@@ -179,6 +179,15 @@ public class ArticleMgmtService { ...@@ -179,6 +179,15 @@ public class ArticleMgmtService {
return; return;
} }
final JSONObject preference = optionQueryService.getPreference();
if (null == preference) {
return;
}
if (!preference.optBoolean(Option.ID_C_PULL_GITHUB)) {
return;
}
JSONObject admin; JSONObject admin;
try { try {
admin = userRepository.getAdmin(); admin = userRepository.getAdmin();
......
...@@ -52,7 +52,7 @@ import java.util.List; ...@@ -52,7 +52,7 @@ import java.util.List;
* 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.33, Apr 2, 2019 * @version 1.5.2.34, Aug 18, 2019
* @since 0.4.0 * @since 0.4.0
*/ */
@Service @Service
...@@ -482,6 +482,12 @@ public class InitService { ...@@ -482,6 +482,12 @@ public class InitService {
syncGitHubOpt.put(Option.OPTION_VALUE, DefaultPreference.DEFAULT_SYNC_GITHUB); syncGitHubOpt.put(Option.OPTION_VALUE, DefaultPreference.DEFAULT_SYNC_GITHUB);
optionRepository.add(syncGitHubOpt); optionRepository.add(syncGitHubOpt);
final JSONObject pullGitHubOpt = new JSONObject();
pullGitHubOpt.put(Keys.OBJECT_ID, Option.ID_C_PULL_GITHUB);
pullGitHubOpt.put(Option.OPTION_CATEGORY, Option.CATEGORY_C_PREFERENCE);
pullGitHubOpt.put(Option.OPTION_VALUE, DefaultPreference.DEFAULT_PULL_GITHUB);
optionRepository.add(pullGitHubOpt);
final JSONObject faviconURLOpt = new JSONObject(); final JSONObject faviconURLOpt = new JSONObject();
faviconURLOpt.put(Keys.OBJECT_ID, Option.ID_C_FAVICON_URL); faviconURLOpt.put(Keys.OBJECT_ID, Option.ID_C_FAVICON_URL);
faviconURLOpt.put(Option.OPTION_CATEGORY, Option.CATEGORY_C_PREFERENCE); faviconURLOpt.put(Option.OPTION_CATEGORY, Option.CATEGORY_C_PREFERENCE);
......
...@@ -37,7 +37,7 @@ import java.util.Locale; ...@@ -37,7 +37,7 @@ import java.util.Locale;
* Preference management service. * Preference management service.
* *
* @author <a href="http://88250.b3log.org">Liang Ding</a> * @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.4.0.1, Jun 13, 2019 * @version 1.4.0.2, Aug 18, 2019
* @since 0.4.0 * @since 0.4.0
*/ */
@Service @Service
...@@ -210,6 +210,10 @@ public class PreferenceMgmtService { ...@@ -210,6 +210,10 @@ public class PreferenceMgmtService {
syncGitHubOpt.put(Option.OPTION_VALUE, preference.optString(Option.ID_C_SYNC_GITHUB)); syncGitHubOpt.put(Option.OPTION_VALUE, preference.optString(Option.ID_C_SYNC_GITHUB));
optionRepository.update(Option.ID_C_SYNC_GITHUB, syncGitHubOpt); optionRepository.update(Option.ID_C_SYNC_GITHUB, syncGitHubOpt);
final JSONObject pullGitHubOpt = optionRepository.get(Option.ID_C_PULL_GITHUB);
pullGitHubOpt.put(Option.OPTION_VALUE, preference.optString(Option.ID_C_PULL_GITHUB));
optionRepository.update(Option.ID_C_PULL_GITHUB, pullGitHubOpt);
final JSONObject hljsThemeOpt = optionRepository.get(Option.ID_C_HLJS_THEME); final JSONObject hljsThemeOpt = optionRepository.get(Option.ID_C_HLJS_THEME);
hljsThemeOpt.put(Option.OPTION_VALUE, preference.optString(Option.ID_C_HLJS_THEME)); hljsThemeOpt.put(Option.OPTION_VALUE, preference.optString(Option.ID_C_HLJS_THEME));
optionRepository.update(Option.ID_C_HLJS_THEME, hljsThemeOpt); optionRepository.update(Option.ID_C_HLJS_THEME, hljsThemeOpt);
......
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