diff --git a/README.md b/README.md index 2a4373b08..9b9b91a12 100755 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ **Halo** [ˈheɪloʊ]
Fast,simple,powerful blog system powered by Java. -**Halo** [ˈheɪloʊ]，意为光环。当然，你也可以读拼音(哈喽)。
+**Halo** [ˈheɪloʊ]，意为光环。当然，你也可以当成拼音读(哈喽)。
轻快，简洁，功能强大，使用Java开发的博客系统。 ## Demo 演示 diff --git a/src/main/java/cc/ryanc/halo/service/CategoryService.java b/src/main/java/cc/ryanc/halo/service/CategoryService.java index 9ce1e251b..17a1dad4f 100755 --- a/src/main/java/cc/ryanc/halo/service/CategoryService.java +++ b/src/main/java/cc/ryanc/halo/service/CategoryService.java @@ -14,7 +14,7 @@ import java.util.Optional; public interface CategoryService { /** - * 新增分类目录 + * 新增/修改分类目录 * * @param category 分类目录 * @return 如果插入成功，返回分类目录对象 @@ -29,14 +29,6 @@ public interface CategoryService { */ Category removeByCateId(Long cateId); - /** - * 修改分类目录信息 - * - * @param category 分类目录对象 - * @return 如果修改成功 返回当前分类目录对象 - */ - Category updateByCategory(Category category); - /** * 获取所有分类目录 * diff --git a/src/main/java/cc/ryanc/halo/service/MenuService.java b/src/main/java/cc/ryanc/halo/service/MenuService.java index 4e5e0f3e0..684f510c6 100644 --- a/src/main/java/cc/ryanc/halo/service/MenuService.java +++ b/src/main/java/cc/ryanc/halo/service/MenuService.java @@ -14,7 +14,7 @@ import java.util.Optional; public interface MenuService { /** - * 新增菜单 + * 新增/修改菜单 * * @param menu menu * @return Menu @@ -36,13 +36,6 @@ public interface MenuService { */ Menu removeByMenuId(Long menuId); - /** - * 修改菜单 - * @param menu menu - * @return Menu - */ - Menu updateByMenu(Menu menu); - /** * 根据编号查询菜单 * @param menuId menuId diff --git a/src/main/java/cc/ryanc/halo/service/impl/CategoryServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/CategoryServiceImpl.java index 0fc522ab9..8a6ce44da 100755 --- a/src/main/java/cc/ryanc/halo/service/impl/CategoryServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/CategoryServiceImpl.java @@ -29,7 +29,7 @@ public class CategoryServiceImpl implements CategoryService{ private static final String CATEGORY_CACHE_NAME = "cate_cache"; /** - * 保存分类目录 清除缓存 + * 保存/修改分类目录 清除缓存 * * @param category 分类目录 * @return ategory @@ -54,19 +54,6 @@ public class CategoryServiceImpl implements CategoryService{ return category.get(); } - /** - * 修改分类目录 缓存 - * - * @param category 分类目录对象 - * @return Category - */ - @CachePut(value = CATEGORY_CACHE_NAME,key = "#category.cateId+'cate'") - @CacheEvict(value = CATEGORY_CACHE_NAME,key = CATEGORY_KEY) - @Override - public Category updateByCategory(Category category) { - return categoryRepository.save(category); - } - /** * 查询所有分类目录 缓存 * diff --git a/src/main/java/cc/ryanc/halo/service/impl/MenuServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/MenuServiceImpl.java index ee81bbf32..30ca66e09 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/MenuServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/MenuServiceImpl.java @@ -32,7 +32,7 @@ public class MenuServiceImpl implements MenuService{ } /** - * 新增菜单 + * 新增/修改菜单 * * @param menu menu * @return Menu @@ -55,17 +55,6 @@ public class MenuServiceImpl implements MenuService{ return menu.get(); } - /** - * 修改菜单 - * - * @param menu menu - * @return Menu - */ - @Override - public Menu updateByMenu(Menu menu) { - return menuRepository.save(menu); - } - /** * 根据编号查询菜单 * 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 fbd8343c2..4d45355a8 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java @@ -37,14 +37,14 @@ public class CategoryController { public String categories(Model model){ List categories = categoryService.findAllCategories(); model.addAttribute("categories",categories); - + model.addAttribute("statusName","添加"); //设置选项 model.addAttribute("options",HaloConst.OPTIONS); return "admin/admin_category"; } /** - * 新增分类目录 + * 新增/修改分类目录 * * @param category category对象 * @return freemarker页面 @@ -93,24 +93,6 @@ public class CategoryController { return "redirect:/admin/category"; } - /** - * 处理修改分类的请求 - * - * @param category category - * @return redirect - */ - @PostMapping(value = "/update") - public String updateCategory(@ModelAttribute Category category){ - try{ - Optional beforeCate = categoryService.findByCateId(category.getCateId()); - log.info("修改之前的数据："+beforeCate.get()+"，修改之后的数据："+category); - categoryService.updateByCategory(category); - }catch (Exception e){ - log.error("未知错误："+e.getMessage()); - } - return "redirect:/admin/category"; - } - /** * 跳转到修改页面 * @@ -120,11 +102,13 @@ public class CategoryController { */ @GetMapping(value = "/edit") public String toEditCategory(Model model,@PathParam("cateId") Long cateId){ + List categories = categoryService.findAllCategories(); Optional category = categoryService.findByCateId(cateId); - model.addAttribute("category",category.get()); - + model.addAttribute("updateCategory",category.get()); + model.addAttribute("categories",categories); + model.addAttribute("statusName","修改"); //设置选项 model.addAttribute("options", HaloConst.OPTIONS); - return "admin/admin_cate-update"; + return "admin/admin_category"; } } diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java index 54a44466d..1a61e05ac 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java @@ -7,10 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -22,7 +19,7 @@ import java.util.List; */ @Slf4j @Controller -@RequestMapping(value = "/admin/menu") +@RequestMapping(value = "/admin/menus") public class MenuController { @Autowired @@ -35,17 +32,17 @@ public class MenuController { * @return string */ @GetMapping - public String menu(Model model){ + public String menus(Model model){ List menus = menuService.findAllMenus(); model.addAttribute("menus",menus); - + model.addAttribute("statusName","添加"); //设置选项 model.addAttribute("options",HaloConst.OPTIONS); return "/admin/admin_menu"; } /** - * 新增菜单 + * 新增/修改菜单 * * @param menu menu * @return string @@ -57,6 +54,24 @@ public class MenuController { }catch (Exception e){ log.error("保存菜单失败："+e.getMessage()); } - return "redirect:/admin/menu"; + return "redirect:/admin/menus"; + } + + /** + * 跳转到修改页面 + * @param id id + * @param model model + * @return string + */ + @GetMapping(value = "/edit") + public String updateMenu(@RequestParam("menuId") Long menuId,Model model){ + List menus = menuService.findAllMenus(); + Menu menu = menuService.findByMenuId(menuId).get(); + model.addAttribute("statusName","修改"); + model.addAttribute("updateMenu",menu); + model.addAttribute("menus",menus); + //设置选项 + model.addAttribute("options", HaloConst.OPTIONS); + return "/admin/admin_menu"; } } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 90314dd23..efacec492 100755 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,36 +1,24 @@ -# 端口配置 server: port: 8090 spring: - # 数据源配置 使用druid数据源 datasource: type: com.alibaba.druid.pool.DruidDataSource # H2database 配置 driver-class-name: org.h2.Driver url: jdbc:h2:file:~/halo/halo_db - # url: jdbc:h2:mem:halo_db username: admin password: 123456 - # MySQL配置 - #driver-class-name: com.mysql.jdbc.Driver - #url: jdbc:mysql://localhost:3306/halodb?useUnicode=true&characterEncoding=utf8&useSSL=false - #username: root - #password: 123456 h2: console: settings: web-allow-others: true path: /h2-console enabled: true - - # jpa配置 jpa: hibernate: ddl-auto: update show-sql: true database-platform: org.hibernate.dialect.H2Dialect - - # freemarker配置 freemarker: allow-request-override: false cache: false @@ -44,7 +32,6 @@ spring: cache: ehcache: config: ehcache.xml -# 设置日志输出路径 logging: file: ./logs/log.log diff --git a/src/main/resources/templates/admin/admin_cate-update.ftl b/src/main/resources/templates/admin/admin_cate-update.ftl deleted file mode 100755 index a4332ac97..000000000 --- a/src/main/resources/templates/admin/admin_cate-update.ftl +++ /dev/null @@ -1,78 +0,0 @@ -<#compress > -<#include "module/_macro.ftl"> -<@head title="Halo后台管理-修改分类"> - -
- - <#include "module/_header.ftl"> - - <#include "module/_sidebar.ftl"> -
- - -
-

分类目录 -

-
    -
  1. 首页
    2. -
  2. 分类目录
    3. -
  3. 修改
    4. -
-
-
-
-
-
-

修改分类目录

-
- -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - -
-
-
-
-
-
- - -
- <#include "module/_footer.ftl"> -
-<@footer> - \ No newline at end of file diff --git a/src/main/resources/templates/admin/admin_category.ftl b/src/main/resources/templates/admin/admin_category.ftl index 02d2dd1b5..cd73cc317 100755 --- a/src/main/resources/templates/admin/admin_category.ftl +++ b/src/main/resources/templates/admin/admin_category.ftl @@ -27,30 +27,56 @@
-

添加分类目录

+

${statusName}分类目录<#if updateCategory??>[${updateCategory.cateName}]

-
-
-
- - - 页面上所显示的名称 + <#if updateCategory??> + + +
+
+ + + 页面上所显示的名称 +
+
+ + + *这是文章路径上显示的名称，最好为英文 +
+
+ + + *添加描述，部分主题可显示 +
-
- - - *这是文章路径上显示的名称，最好为英文 +
+
-
- - - *添加描述，部分主题可显示 + + <#else > +
+
+
+ + + 页面上所显示的名称 +
+
+ + + *这是文章路径上显示的名称，最好为英文 +
+
+ + + *添加描述，部分主题可显示 +
-
-
- -
- +
+ +
+ +
@@ -77,7 +103,11 @@ ${(cate.cateDesc)!} 2 - 修改 + <#if updateCategory?? && updateCategory.cateId==cate.cateId> + 正在修改 + <#else > + 修改 + diff --git a/src/main/resources/templates/admin/admin_md-editor.ftl b/src/main/resources/templates/admin/admin_md-editor.ftl index 46d6d7e50..f9f82228f 100644 --- a/src/main/resources/templates/admin/admin_md-editor.ftl +++ b/src/main/resources/templates/admin/admin_md-editor.ftl @@ -32,7 +32,7 @@
<#if post??> - +
diff --git a/src/main/resources/templates/admin/admin_menu.ftl b/src/main/resources/templates/admin/admin_menu.ftl index 2861ad69a..3202b2062 100644 --- a/src/main/resources/templates/admin/admin_menu.ftl +++ b/src/main/resources/templates/admin/admin_menu.ftl @@ -21,33 +21,57 @@
-

添加分类目录

+

${statusName}菜单<#if updateMenu??>[${updateMenu.menuName}]

-