From 0c20c5ec965a78b8f02a48287f950432af23b495 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Fri, 1 Apr 2022 19:01:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=8E=A5=E5=8F=A3=20=20?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3=20=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=20=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/IndexController.java     |  9 ++-
 .../com/hxkj/admin/service/IIndexService.java | 10 ++-
 .../admin/service/impl/IIndexServiceImpl.java | 14 +++-
 .../src/main/resources/log4j2-spring.xml      | 80 +++++++++++++++++++
 like-common/pom.xml                           | 11 +++
 pom.xml                                       |  1 +
 6 files changed, 119 insertions(+), 6 deletions(-)
 create mode 100644 like-admin/src/main/resources/log4j2-spring.xml

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<String, Object> 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<String, Object>
+     */
+    Map<String, Object> 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<String, Object>
+     */
     @Override
-    public void console() {
+    public Map<String, Object> console() {
         Map<String, Object> console = new LinkedHashMap<>();
 
         // 账号信息
@@ -32,8 +39,11 @@ public class IIndexServiceImpl implements IIndexService {
 
         // 访客图表
         Map<String, Object> 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 日志级别排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
+<configuration monitorInterval="5">
+
+    <!-- 变量配置 -->
+    <Properties>
+        <property name="LOG_PATTERN" value="%date{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n" />
+        <property name="FILE_PATH" value="/www/wwwroot/logs/like-admin" />
+        <property name="FILE_NAME" value="admin-log4j2" />
+    </Properties>
+
+    <appenders>
+        <!-- 控制台输出 -->
+        <console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+        </console>
+
+        <!-- 临时测试日志 -->
+        <File name="Filelog" fileName="${FILE_PATH}/test.log" append="false">
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+        </File>
+
+        <!-- Info日志分割压缩 -->
+        <RollingFile name="RollingFileInfo" fileName="${FILE_PATH}/info.log" filePattern="${FILE_PATH}/${FILE_NAME}-INFO-%d{yyyy-MM-dd}_%i.log.gz">
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="15"/>
+        </RollingFile>
+
+        <!-- warn日志分割压缩 -->
+        <RollingFile name="RollingFileWarn" fileName="${FILE_PATH}/warn.log" filePattern="${FILE_PATH}/${FILE_NAME}-WARN-%d{yyyy-MM-dd}_%i.log.gz">
+            <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="15"/>
+        </RollingFile>
+
+        <!-- error日志分割压缩 -->
+        <RollingFile name="RollingFileError" fileName="${FILE_PATH}/error.log" filePattern="${FILE_PATH}/${FILE_NAME}-ERROR-%d{yyyy-MM-dd}_%i.log.gz">
+            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="15"/>
+        </RollingFile>
+    </appenders>
+
+    <loggers>
+        <!-- 过滤指定DEBUG信息 -->
+        <logger name="org.mybatis" level="info" additivity="false">
+            <AppenderRef ref="Console"/>
+        </logger>
+
+        <!-- 监控系统信息 -->
+        <Logger name="org.springframework" level="info" additivity="false">
+            <AppenderRef ref="Console"/>
+        </Logger>
+
+        <!-- 初始化日志 -->
+        <root level="info">
+            <appender-ref ref="Console"/>
+            <appender-ref ref="Filelog"/>
+            <appender-ref ref="RollingFileInfo"/>
+            <appender-ref ref="RollingFileWarn"/>
+            <appender-ref ref="RollingFileError"/>
+        </root>
+    </loggers>
+
+</configuration>
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 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--log4j2依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
         <!-- Aop依赖 -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index 3ffb1eae..49df0963 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <java.version>1.8</java.version>
+        <log4j2.version>2.16.0</log4j2.version>
         <mysql-connector.version>5.1.49</mysql-connector.version>
         <mybatis-plus.version>3.4.3.1</mybatis-plus.version>
         <mybatis-plus-join.version>1.2.2</mybatis-plus-join.version>