diff --git a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java index 3238eccd..d591a0ac 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java @@ -17,7 +17,7 @@ import java.util.Map; public class IndexController { @Resource - IIndexService IIndexService; + IIndexService iIndexService; /** * 首页 @@ -27,7 +27,7 @@ public class IndexController { */ @GetMapping("/index") public Object index() { - Map detail = IIndexService.index(); + Map detail = iIndexService.index(); return AjaxResult.success(detail); } @@ -40,7 +40,7 @@ public class IndexController { */ @GetMapping("/decorate") public Object decorate(@Validated @IDMust() @RequestParam("id") Integer id) { - Map detail = IIndexService.decorate(id); + Map detail = iIndexService.decorate(id); return AjaxResult.success(detail); } @@ -52,6 +52,8 @@ public class IndexController { */ @GetMapping("/config") public Object config() { - return AjaxResult.success(); + Map map = iIndexService.config(); + return AjaxResult.success(map); } + } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java index d6100bb9..700bc1f8 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java @@ -39,28 +39,13 @@ public class IndexServiceImpl implements IIndexService { @Override public Map index() { Map response = new LinkedHashMap<>(); - DecoratePage decoratePage = decoratePageMapper.selectOne( new QueryWrapper() .eq("id", 1) .last("limit 1")); - List> tabs = new LinkedList<>(); - List decorateTabbars = decorateTabbarMapper.selectList(new QueryWrapper().orderByAsc("id")); - for (DecorateTabbar tab: decorateTabbars) { - Map map = new LinkedHashMap<>(); - map.put("name", tab.getName()); - map.put("selected", UrlUtil.toAbsoluteUrl(tab.getSelected())); - map.put("unselected", UrlUtil.toAbsoluteUrl(tab.getUnselected())); - map.put("link", tab.getLink()); - tabs.add(map); - } - - String tabbarStyle = ConfigUtil.get("tabbar", "style", "{}"); - + response.put("domain", UrlUtil.domain()); response.put("pages", decoratePage.getPageData()); - response.put("style", ToolsUtil.jsonToMap(tabbarStyle)); - response.put("tabbar", tabs); return response; } @@ -95,7 +80,24 @@ public class IndexServiceImpl implements IIndexService { */ @Override public Map config() { - return null; + Map response = new LinkedHashMap<>(); + + List> tabs = new LinkedList<>(); + List decorateTabbars = decorateTabbarMapper.selectList(new QueryWrapper().orderByAsc("id")); + for (DecorateTabbar tab: decorateTabbars) { + Map map = new LinkedHashMap<>(); + map.put("name", tab.getName()); + map.put("selected", UrlUtil.toAbsoluteUrl(tab.getSelected())); + map.put("unselected", UrlUtil.toAbsoluteUrl(tab.getUnselected())); + map.put("link", tab.getLink()); + tabs.add(map); + } + + String tabbarStyle = ConfigUtil.get("tabbar", "style", "{}"); + response.put("domain", UrlUtil.domain()); + response.put("style", ToolsUtil.jsonToMap(tabbarStyle)); + response.put("tabbar", tabs); + return response; } }