diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java b/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java index a686a885..5ee9f711 100644 --- a/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java +++ b/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java @@ -1,16 +1,19 @@ package com.hxkj.admin.controller; import com.hxkj.admin.service.IIndexService; +import com.hxkj.common.core.AjaxResult; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.Map; /** * 主页管理 */ +@Slf4j @RestController @RequestMapping("/api/index") public class IndexController { @@ -26,8 +29,8 @@ public class IndexController { */ @GetMapping("/console") public Object console() { - iIndexService.console(); - return null; + Map map = iIndexService.console(); + return AjaxResult.success(map); } } diff --git a/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java b/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java index 2fb5417e..36f5b363 100644 --- a/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java +++ b/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java @@ -1,10 +1,18 @@ package com.hxkj.admin.service; +import java.util.Map; + /** * 主页服务类 */ public interface IIndexService { - void console(); + /** + * 控制台数据 + * + * @author fzr + * @return Map + */ + Map console(); } diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/IIndexServiceImpl.java b/like-admin/src/main/java/com/hxkj/admin/service/impl/IIndexServiceImpl.java index 696a4888..6f7d8071 100644 --- a/like-admin/src/main/java/com/hxkj/admin/service/impl/IIndexServiceImpl.java +++ b/like-admin/src/main/java/com/hxkj/admin/service/impl/IIndexServiceImpl.java @@ -4,14 +4,21 @@ import com.hxkj.admin.service.IIndexService; import com.hxkj.common.utils.TimeUtil; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.Map; @Service public class IIndexServiceImpl implements IIndexService { + /** + * 控制台数据 + * + * @author fzr + * @return Map + */ @Override - public void console() { + public Map console() { Map console = new LinkedHashMap<>(); // 账号信息 @@ -32,8 +39,11 @@ public class IIndexServiceImpl implements IIndexService { // 访客图表 Map visitor = new LinkedHashMap<>(); - System.out.println(TimeUtil.daysAgoTime(8)); + visitor.put("date", TimeUtil.daysAgoDate(8)); + visitor.put("list", new ArrayList<>()); + console.put("visitor", visitor); + return console; } } diff --git a/like-admin/src/main/resources/log4j2-spring.xml b/like-admin/src/main/resources/log4j2-spring.xml new file mode 100644 index 00000000..994df560 --- /dev/null +++ b/like-admin/src/main/resources/log4j2-spring.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/like-common/pom.xml b/like-common/pom.xml index 38a2a29f..4acd62f5 100644 --- a/like-common/pom.xml +++ b/like-common/pom.xml @@ -31,6 +31,17 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-logging + + + + + + org.springframework.boot + spring-boot-starter-log4j2 diff --git a/pom.xml b/pom.xml index 3ffb1eae..49df0963 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,7 @@ 1.8 1.8 1.8 + 2.16.0 5.1.49 3.4.3.1 1.2.2