From 9c08c268c9d1086731f361685b4b587da705d5ee Mon Sep 17 00:00:00 2001 From: ruibaby Date: Mon, 18 Mar 2019 10:16:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/ryanc/halo/model/support/Theme.java | 8 ++++---- .../java/cc/ryanc/halo/utils/HaloUtils.java | 7 +++---- .../java/cc/ryanc/halo/utils/ThemeUtils.java | 6 +++--- .../web/controller/admin/AdminController.java | 6 ++++++ .../controller/admin/AttachmentController.java | 2 +- .../web/controller/admin/BackupController.java | 2 +- .../controller/admin/CategoryController.java | 2 +- .../web/controller/admin/PostController.java | 2 +- .../web/controller/admin/ThemeController.java | 13 +++---------- .../controller/admin/base/BaseController.java | 18 +++++++----------- 10 files changed, 30 insertions(+), 36 deletions(-) diff --git a/src/main/java/cc/ryanc/halo/model/support/Theme.java b/src/main/java/cc/ryanc/halo/model/support/Theme.java index 508430b30..cf255fd90 100644 --- a/src/main/java/cc/ryanc/halo/model/support/Theme.java +++ b/src/main/java/cc/ryanc/halo/model/support/Theme.java @@ -16,22 +16,22 @@ public class Theme implements Serializable { private static final long serialVersionUID = 1L; /** - * theme name + * Theme name */ private String themeName; /** - * is support setting options + * Is support setting options */ private boolean hasOptions; /** - * is support update + * Is support update */ private boolean hasUpdate; /** - * is internal theme + * Is internal theme */ private boolean isInternal; } diff --git a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java index 705ce8e3a..717be2b72 100755 --- a/src/main/java/cc/ryanc/halo/utils/HaloUtils.java +++ b/src/main/java/cc/ryanc/halo/utils/HaloUtils.java @@ -200,9 +200,8 @@ public class HaloUtils { final BufferedImage image = ImageIO.read(new FileInputStream(file)); return image.getWidth() + "x" + image.getHeight(); } catch (Exception e) { - log.error("Failed to get read image file", e); + throw new RuntimeException("Failed to get read image file",e); } - return ""; } /** @@ -224,7 +223,7 @@ public class HaloUtils { bufferedWriter = new BufferedWriter(fileWriter); bufferedWriter.write(data); } catch (Exception e) { - log.error("Failed to export file", e); + throw new RuntimeException("Failed to export file",e); } finally { if (null != bufferedWriter) { bufferedWriter.close(); @@ -298,7 +297,7 @@ public class HaloUtils { result.append(line); } } catch (Exception e) { - log.error("Failed to create baidu post", e); + throw new RuntimeException("Failed to push posts to baidu",e); } finally { try { if (null != out) { diff --git a/src/main/java/cc/ryanc/halo/utils/ThemeUtils.java b/src/main/java/cc/ryanc/halo/utils/ThemeUtils.java index f34adbc0a..8e2ac4f31 100644 --- a/src/main/java/cc/ryanc/halo/utils/ThemeUtils.java +++ b/src/main/java/cc/ryanc/halo/utils/ThemeUtils.java @@ -33,7 +33,7 @@ public class ThemeUtils { themes.addAll(getThemesByPath(getInternalThemesPath(), true)); themes.addAll(getThemesByPath(getUsersThemesPath(), false)); } catch (Exception e) { - log.error("Themes scan failed", e); + throw new RuntimeException("Themes scan failed",e); } return themes; } @@ -76,7 +76,7 @@ public class ThemeUtils { } } } catch (Exception e) { - log.error("Themes scan failed", e); + throw new RuntimeException("Themes scan failed",e); } return themes; } @@ -142,7 +142,7 @@ public class ThemeUtils { } } } catch (Exception e) { - log.error("Failed to get theme template", e); + throw new RuntimeException("Failed to get theme template",e); } return templates; } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java index e4fa806b7..4cb076e91 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java @@ -66,4 +66,10 @@ public class AdminController { return "admin/admin_index"; } + + @GetMapping(value = "/login") + public String login(){ + + return ""; + } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java index ec36926b2..166eb4821 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java @@ -22,7 +22,7 @@ public class AttachmentController { } /** - * attachments list + * Attachments list * * @return template path: admin/admin_attachment */ diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java index 87a51f957..9a2ba9a9b 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; public class BackupController { /** - * backup manage + * Backup manage * * @return template path: admin/admin_backup.ftl */ diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java index 47335a8c1..71fbe4522 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java @@ -22,7 +22,7 @@ public class CategoryController { } /** - * categories manage + * Categories manage * * @return template path: admin/admin_category.ftl */ diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java index 48c407f29..d3514fed9 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java @@ -32,7 +32,7 @@ public class PostController { } /** - * posts manage + * Posts manage * * @param model model * @param status post status diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java index c38eff80b..0a254c19b 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/ThemeController.java @@ -3,8 +3,6 @@ package cc.ryanc.halo.web.controller.admin; import cc.ryanc.halo.logging.Logger; import cc.ryanc.halo.model.support.JsonResult; import cc.ryanc.halo.service.LogService; -import cc.ryanc.halo.service.OptionService; -import cc.ryanc.halo.utils.LocaleMessageUtil; import cc.ryanc.halo.utils.ThemeUtils; import cc.ryanc.halo.web.controller.admin.base.BaseController; import cc.ryanc.halo.web.controller.content.base.BaseContentController; @@ -15,7 +13,6 @@ import cn.hutool.core.text.StrBuilder; import cn.hutool.core.util.RuntimeUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ZipUtil; -import freemarker.template.Configuration; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -42,11 +39,7 @@ public class ThemeController extends BaseController { private LogService logsService; - public ThemeController(Configuration configuration, - OptionService optionService, - LocaleMessageUtil localeMessageUtil, - LogService logsService) { - super(configuration, optionService, localeMessageUtil); + public ThemeController(LogService logsService) { this.logsService = logsService; } @@ -70,7 +63,7 @@ public class ThemeController extends BaseController { * @param request request * @return JsonResult */ - @GetMapping(value = "/set") + @PostMapping(value = "/active") @ResponseBody @CacheEvict(value = "posts", allEntries = true, beforeInvocation = true) public JsonResult activeTheme(@RequestParam("themeName") String themeName, @@ -208,7 +201,7 @@ public class ThemeController extends BaseController { * @param hasUpdate hasUpdate */ @GetMapping(value = "/options") - public String setting(Model model, + public String options(Model model, @RequestParam("theme") String theme, @RequestParam("hasUpdate") String hasUpdate) { model.addAttribute("themeDir", theme); diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/base/BaseController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/base/BaseController.java index ef8229da0..b0687ae6b 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/base/BaseController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/base/BaseController.java @@ -5,6 +5,7 @@ import cc.ryanc.halo.utils.LocaleMessageUtil; import cc.ryanc.halo.utils.ThemeUtils; import freemarker.template.Configuration; import freemarker.template.TemplateModelException; +import org.springframework.beans.factory.annotation.Autowired; import static cc.ryanc.halo.model.support.HaloConst.OPTIONS; import static cc.ryanc.halo.model.support.HaloConst.THEMES; @@ -17,19 +18,14 @@ import static cc.ryanc.halo.model.support.HaloConst.THEMES; */ public abstract class BaseController { - public final Configuration configuration; + @Autowired + public Configuration configuration; - public final OptionService optionService; + @Autowired + public OptionService optionService; - public final LocaleMessageUtil localeMessageUtil; - - public BaseController(Configuration configuration, - OptionService optionService, - LocaleMessageUtil localeMessageUtil) { - this.configuration = configuration; - this.optionService = optionService; - this.localeMessageUtil = localeMessageUtil; - } + @Autowired + public LocaleMessageUtil localeMessageUtil; /** * Clear all caches