log

easydo-chengfa/pom.xml

@@ -87,6 +87,12 @@
             <artifactId>spring-kafka</artifactId>
             <version>2.2.0.RELEASE</version>
         </dependency>
+        <!-- 用于日志切面中，以 json 格式打印出入参 -->
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+        </dependency>
         <!-- <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-high-level-client</artifactId>

easydo-chengfa/src/main/java/easydo/technology/config/MapConfig.java

@@ -1,35 +0,0 @@
-package easydo.technology.config;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Configuration
-@ConfigurationProperties(prefix = "iot.device")
-@Getter
-@Setter
-public class MapConfig {
-
-    /**
-     * data.mapConfig
-     * 这里map名需要和application.properties中的参数一致
-     */
-    private Map<Integer, String> dust = new HashMap<>();
-    private Map<Integer, String> guardrail = new HashMap<>();
-    private Map<Integer, String> smokeMonitor = new HashMap<>();
-    private Map<Integer, String> towerCrane = new HashMap<>();
-    private Map<Integer, String> standardCuringRoom = new HashMap<>();
-    private Map<Integer, String> pmStandardCuringRoom = new HashMap<>();
-    private Map<Integer, String> nut = new HashMap<>();
-    private Map<Integer, String> pmWaterElectricBox = new HashMap<>();
-    private Map<Integer, String> pmDistributionBox = new HashMap<>();
-    private Map<Integer, String> pmCarRinse = new HashMap<>();
-    private Map<Integer, String> pmAIRecognition = new HashMap<>();
-    private Map<Integer, String> pmRoundGuard = new HashMap<>();
-    private Map<Integer, String> pmSmokeMonitor = new HashMap<>();
-
-}

easydo-chengfa/src/main/java/easydo/technology/config/WebLogAspect.java

@@ -0,0 +1,118 @@
+package easydo.technology.config;
+
+import com.google.gson.Gson;
+
+import easydo.technology.annotation.WebLog;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+
+/**
+ * @date 2023/10/6
+ * @time 下午9:19
+ * @discription
+ **/
+@Aspect
+@Component
+@Profile({ "dev", "test" })
+public class WebLogAspect {
+
+    private final static Logger logger = LoggerFactory.getLogger(WebLogAspect.class);
+    /** 换行符 */
+    private static final String LINE_SEPARATOR = System.lineSeparator();
+
+    /** 以自定义 @WebLog 注解为切点 */
+    @Pointcut("@annotation(easydo.technology.annotation.WebLog)")
+    public void webLog() {
+    }
+
+    /**
+     * 在切点之前织入
+     * 
+     * @param joinPoint
+     * @throws Throwable
+     */
+    @Before("webLog()")
+    public void doBefore(JoinPoint joinPoint) throws Throwable {
+        // 开始打印请求日志
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+        // 打印请求 url
+        logger.info("URL======>{},Class Method======>{}.{},Request Args======>{},Ip======>{}", request.getRequestURL().toString(),
+                joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName(),
+                new Gson().toJson(joinPoint.getArgs()),request.getRemoteAddr());
+       
+    }
+
+    /**
+     * 在切点之后织入
+     * 
+     * @throws Throwable
+     */
+    // @After("webLog()")
+    // public void doAfter() throws Throwable {
+    //      // 开始打印请求日志
+    //      ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+    //      HttpServletRequest request = attributes.getRequest();
+    //      Object result = proceedingJoinPoint.proceed();
+    //      logger.info("URL======>{},Class Method======>{}.{},Request Args======>{},Response Args======>{}", request.getRequestURL().toString(),
+    //      joinPoint.getSignature().getDeclaringTypeName(), joinPoint.getSignature().getName(),
+    //      new Gson().toJson(joinPoint.getArgs()),new Gson().toJson(result));
+    // }
+
+    /**
+     * 环绕
+     * 
+     * @param proceedingJoinPoint
+     * @return
+     * @throws Throwable
+     */
+    // @Around("webLog()")
+    // public Object doAround(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
+    //     long startTime = System.currentTimeMillis();
+    //     Object result = proceedingJoinPoint.proceed();
+    //     // 打印出参
+    //     logger.info("Response Args  : {}", new Gson().toJson(result));
+    //     // 执行耗时
+    //     logger.info("Time-Consuming : {} ms", System.currentTimeMillis() - startTime);
+        // return null;
+    // }
+
+    /**
+     * 获取切面注解的描述
+     *
+     * @param joinPoint 切点
+     * @return 描述信息
+     * @throws Exception
+     */
+    public String getAspectLogDescription(JoinPoint joinPoint)
+            throws Exception {
+        String targetName = joinPoint.getTarget().getClass().getName();
+        String methodName = joinPoint.getSignature().getName();
+        Object[] arguments = joinPoint.getArgs();
+        Class targetClass = Class.forName(targetName);
+        Method[] methods = targetClass.getMethods();
+        StringBuilder description = new StringBuilder("");
+        for (Method method : methods) {
+            if (method.getName().equals(methodName)) {
+                Class[] clazzs = method.getParameterTypes();
+                if (clazzs.length == arguments.length) {
+                    description.append(method.getAnnotation(WebLog.class).description());
+                    break;
+                }
+            }
+        }
+        return description.toString();
+    }
+
+}

easydo-chengfa/src/main/java/easydo/technology/controller/ApiController.java

@@ -46,6 +46,7 @@ import easydo.technology.system.domain.SysDept;
 import easydo.technology.utils.LocalDateUtil;
 import easydo.technology.utils.StringUtil;
 import lombok.extern.java.Log;
+
 @Log
 @RestController
 @RequestMapping("/api")
@@ -58,6 +59,7 @@ public class ApiController {
     @Resource
     PasswordEncoder passwordEncoder;
 
+    
     @RequestMapping(value = "/supplier/getList")
     public Object getSupplierList(@RequestBody Map<String, Object> map) throws Exception {
         String token = map.get("token").toString();

easydo-chengfa/src/main/java/easydo/technology/controller/TestController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import easydo.technology.annotation.WebLog;
 import easydo.technology.components.JdbcClient;
 import easydo.technology.service.GLDMasterService;
 import easydo.technology.util.HttpClientUtil;
@@ -92,6 +93,7 @@ public class TestController {
      * }
      */
 
+    @WebLog
     @RequestMapping(value = "/getPage")
     public Object getPage() throws Exception {
         redisUtils.set("test", "123456", 600);
@@ -188,7 +190,4 @@ public class TestController {
     // + resObj.toJSONString());
     // }
 
-   
-
-   
 }

easydo-common/src/main/java/easydo/technology/annotation/WebLog.java

@@ -0,0 +1,18 @@
+package easydo.technology.annotation;
+
+import java.lang.annotation.*;
+/** 
+* @date 2023/10/6 
+* @time 下午9:19 
+* @discription 
+**/ 
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+@Documented
+public @interface WebLog {
+    /**
+    * 日志描述信息
+    * @return
+    **/ 
+    String description() default "";
+}

easydo-core/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
     <parent>
@@ -20,7 +21,7 @@
     <dependencies>
         <dependency>
             <groupId>easydo.technology</groupId>
-            <artifactId>easydo-logging</artifactId>
+            <artifactId>easydo-common</artifactId>
             <version>v20220507</version>
         </dependency>
 

easydo-logging/pom.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>easydo.technology</groupId>
-        <artifactId>easydo</artifactId>
-        <version>v20220507</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>easydo-logging</artifactId>
-    <name>日志模块</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>easydo.technology</groupId>
-            <artifactId>easydo-common</artifactId>
-            <version>v20220507</version>
-        </dependency>
-    </dependencies>
-</project>

easydo-logging/src/main/java/easydo/technology/annotation/Log.java

@@ -1,42 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package easydo.technology.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import easydo.technology.annotation.type.LogActionType;
-
-/**
- * @author Zheng Jie
- * @date 2018-11-24
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Log {
-    String value() default "";
-
-    /**
-     * 是否启用
-     *
-     * @return
-     */
-    boolean enable() default true;
-
-    LogActionType type() default LogActionType.SELECT;
-}

easydo-logging/src/main/java/easydo/technology/annotation/type/LogActionType.java

@@ -1,45 +0,0 @@
-/*
- * Copyright 2019-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package easydo.technology.annotation.type;
-
-/**
- * @author: liaojinlong
- * @date: 2020/6/11 19:47
- * @apiNote: 日志类型
- */
-
-public enum LogActionType {
-    /**
-     * 增删改查
-     */
-    ADD("新增"),
-    SELECT("查询"),
-    UPDATE("更新"),
-    DELETE("删除");
-    private String value;
-
-    LogActionType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}

easydo-logging/src/main/java/easydo/technology/domain/Log.java

@@ -1,65 +0,0 @@
-package easydo.technology.domain;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import org.springframework.beans.BeanUtils;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-/**
- * @author jinjin
- * @date 2020-09-27
- */
-@Getter
-@Setter
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_log")
-public class Log implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "log_id", type = IdType.AUTO)
-    private Long id;
-
-    private String description;
-
-    private String logType;
-
-    private String method;
-
-    private String params;
-
-    private String requestIp;
-
-    private Long time;
-
-    private String username;
-
-    private String address;
-
-    private String browser;
-
-    private byte[] exceptionDetail;
-
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    public Log(String logType, Long time) {
-        this.logType = logType;
-        this.time = time;
-    }
-
-    public void copyFrom(Log source) {
-        BeanUtils.copyProperties(source, this);
-    }
-}

easydo-logging/src/main/java/easydo/technology/mapper/LogMapper.java

@@ -1,15 +0,0 @@
-package easydo.technology.mapper;
-
-import org.springframework.stereotype.Repository;
-
-import easydo.technology.base.CommonMapper;
-import easydo.technology.domain.Log;
-
-/**
- * @author jinjin
- * @date 2020-09-27
- */
-@Repository
-public interface LogMapper extends CommonMapper<Log> {
-
-}

easydo-logging/src/main/java/easydo/technology/rest/LogController.java

@@ -1,106 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package easydo.technology.rest;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import easydo.technology.annotation.Log;
-import easydo.technology.service.LogService;
-import easydo.technology.service.dto.LogQueryParam;
-import easydo.technology.utils.SecurityUtils;
-import lombok.RequiredArgsConstructor;
-
-/**
- * @author Zheng Jie
- * @date 2018-11-24
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/logs")
-public class LogController {
-
-    private final LogService logService;
-
-    @Log("导出数据")
-    @GetMapping(value = "/download")
-    @PreAuthorize("@el.check()")
-    public void download(HttpServletResponse response, LogQueryParam criteria) throws IOException {
-        criteria.setLogType("INFO");
-        logService.download(logService.queryAll(criteria), response);
-    }
-
-    @Log("导出错误数据")
-    @GetMapping(value = "/error/download")
-    @PreAuthorize("@el.check()")
-    public void downloadErrorLog(HttpServletResponse response, LogQueryParam criteria) throws IOException {
-        criteria.setLogType("ERROR");
-        logService.download(logService.queryAll(criteria), response);
-    }
-
-    @GetMapping
-    @PreAuthorize("@el.check()")
-    public ResponseEntity<Object> query(LogQueryParam criteria, Pageable pageable) {
-        criteria.setLogType("INFO");
-        return new ResponseEntity<>(logService.queryAll(criteria, pageable), HttpStatus.OK);
-    }
-
-    @GetMapping(value = "/user")
-    public ResponseEntity<Object> queryUserLog(LogQueryParam criteria, Pageable pageable) {
-        criteria.setLogType("INFO");
-        criteria.setBlurry(SecurityUtils.getCurrentUsername());
-        return new ResponseEntity<>(logService.queryAllByUser(criteria, pageable), HttpStatus.OK);
-    }
-
-    @GetMapping(value = "/error")
-    @PreAuthorize("@el.check()")
-    public ResponseEntity<Object> queryErrorLog(LogQueryParam criteria, Pageable pageable) {
-        criteria.setLogType("ERROR");
-        return new ResponseEntity<>(logService.queryAll(criteria, pageable), HttpStatus.OK);
-    }
-
-    @GetMapping(value = "/error/{id}")
-    public ResponseEntity<Object> queryErrorLogs(@PathVariable Long id) {
-        return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK);
-    }
-
-    @DeleteMapping(value = "/del/error")
-    @Log("删除所有ERROR日志")
-    @PreAuthorize("@el.check()")
-    public ResponseEntity<Object> delAllErrorLog() {
-        logService.delAllByError();
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @DeleteMapping(value = "/del/info")
-    @Log("删除所有INFO日志")
-    @PreAuthorize("@el.check()")
-    public ResponseEntity<Object> delAllInfoLog() {
-        logService.delAllByInfo();
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

easydo-logging/src/main/java/easydo/technology/service/LogService.java

@@ -1,94 +0,0 @@
-package easydo.technology.service;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.springframework.data.domain.Pageable;
-import org.springframework.scheduling.annotation.Async;
-
-import easydo.technology.base.CommonService;
-import easydo.technology.base.PageInfo;
-import easydo.technology.domain.Log;
-import easydo.technology.service.dto.LogQueryParam;
-import easydo.technology.service.dto.LogSmallDTO;
-
-/**
- * @author jinjin
- * @date 2020-09-27
- */
-public interface LogService extends CommonService<Log> {
-
-    static final String CACHE_KEY = "log";
-
-    /**
-     * 查询数据分页
-     *
-     * @param query    条件
-     * @param pageable 分页参数
-     * @return PageInfo<Log>
-     */
-    Object queryAll(LogQueryParam query, Pageable pageable);
-
-    /**
-     * 查询所有数据不分页
-     *
-     * @param query 条件参数
-     * @return List<Log>
-     */
-    List<Log> queryAll(LogQueryParam query);
-
-    Log findById(Long id);
-
-    /**
-     * 查询用户日志
-     *
-     * @param criteria 查询条件
-     * @param pageable 分页参数
-     * @return -
-     */
-    PageInfo<LogSmallDTO> queryAllByUser(LogQueryParam criteria, Pageable pageable);
-
-    /**
-     * 保存日志数据
-     *
-     * @param username  用户
-     * @param browser   浏览器
-     * @param ip        请求IP
-     * @param joinPoint /
-     * @param log       日志实体
-     */
-    @Async
-    void save(String username, String browser, String ip, ProceedingJoinPoint joinPoint, Log log);
-
-    /**
-     * 查询异常详情
-     *
-     * @param id 日志ID
-     * @return Object
-     */
-    Object findByErrDetail(Long id);
-
-    /**
-     * 导出日志
-     *
-     * @param logs     待导出的数据
-     * @param response /
-     * @throws IOException /
-     */
-    void download(List<Log> logs, HttpServletResponse response) throws IOException;
-
-    boolean removeByLogType(String logType);
-
-    /**
-     * 删除所有错误日志
-     */
-    void delAllByError();
-
-    /**
-     * 删除所有INFO日志
-     */
-    void delAllByInfo();
-}

easydo-logging/src/main/java/easydo/technology/service/dto/LogErrorDTO.java

@@ -1,47 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package easydo.technology.service.dto;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-
-/**
- * @author Zheng Jie
- * @date 2019-5-22
- */
-@Data
-public class LogErrorDTO implements Serializable {
-
-    private Long id;
-
-    private String username;
-
-    private String description;
-
-    private String method;
-
-    private String params;
-
-    private String browser;
-
-    private String requestIp;
-
-    private String address;
-
-    private Date createTime;
-}

easydo-logging/src/main/java/easydo/technology/service/dto/LogQueryCriteria.java

@@ -1,40 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package easydo.technology.service.dto;
-
-import java.sql.Timestamp;
-import java.util.List;
-
-import easydo.technology.annotation.Query;
-import lombok.Data;
-
-/**
- * 日志查询类
- * @author Zheng Jie
- * @date 2019-6-4 09:23:07
- */
-@Data
-public class LogQueryCriteria {
-
-    @Query(blurry = "username,description,address,requestIp,method,params")
-    private String blurry;
-
-    @Query
-    private String logType;
-
-    @Query(type = Query.Type.BETWEEN)
-    private List<Timestamp> createTime;
-}

easydo-logging/src/main/java/easydo/technology/service/dto/LogQueryParam.java

@@ -1,31 +0,0 @@
-package easydo.technology.service.dto;
-
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import easydo.technology.annotation.Query;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
-* @author jinjin
-* @date 2020-09-27
-*/
-@Getter
-@Setter
-public class LogQueryParam {
-
-    @Query(blurry = "username,description,address,requestIp,method,params")
-    private String blurry;
-
-    /** 精确 */
-    @Query
-    private String logType;
-
-    /** BETWEEN */
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @Query(type = Query.Type.BETWEEN)
-    private List<Date> createTime;
-}

easydo-logging/src/main/java/easydo/technology/service/dto/LogSmallDTO.java

@@ -1,41 +0,0 @@
-/*
- *  Copyright 2019-2020 Zheng Jie
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package easydo.technology.service.dto;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import lombok.Data;
-
-/**
- * @author Zheng Jie
- * @date 2019-5-22
- */
-@Data
-public class LogSmallDTO implements Serializable {
-
-    private String description;
-
-    private String requestIp;
-
-    private Long time;
-
-    private String address;
-
-    private String browser;
-
-    private Date createTime;
-}

easydo-logging/src/main/java/easydo/technology/service/impl/LogServiceImpl.java

@@ -1,181 +0,0 @@
-package easydo.technology.service.impl;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.reflect.MethodSignature;
-// 默认不使用缓存
-//import org.springframework.cache.annotation.CacheConfig;
-//import org.springframework.cache.annotation.CacheEvict;
-//import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import ch.qos.logback.core.util.FileUtil;
-import easydo.technology.base.PageInfo;
-import easydo.technology.base.QueryHelpMybatisPlus;
-import easydo.technology.base.impl.CommonServiceImpl;
-import easydo.technology.domain.Log;
-import easydo.technology.mapper.LogMapper;
-import easydo.technology.service.LogService;
-import easydo.technology.service.dto.LogErrorDTO;
-import easydo.technology.service.dto.LogQueryParam;
-import easydo.technology.service.dto.LogSmallDTO;
-import easydo.technology.utils.ConvertUtil;
-import easydo.technology.utils.PageUtil;
-import easydo.technology.utils.ValidationUtil;
-import io.netty.util.internal.ObjectUtil;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @author jinjin
- * @date 2020-09-27
- */
-@Slf4j
-@Service
-@AllArgsConstructor
-// @CacheConfig(cacheNames = LogService.CACHE_KEY)
-@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
-public class LogServiceImpl extends CommonServiceImpl<Log> implements LogService {
-
-    // private final RedisUtils redisUtils;
-    private final LogMapper logMapper;
-
-    @Override
-    public Object queryAll(LogQueryParam query, Pageable pageable) {
-        IPage<Log> page = PageUtil.toMybatisPage(pageable);
-        IPage<Log> pageList = logMapper.selectPage(page, QueryHelpMybatisPlus.getPredicate(query));
-        String status = "ERROR";
-        if (status.equals(query.getLogType())) {
-            return ConvertUtil.convertPage(pageList, LogErrorDTO.class);
-        }
-        return ConvertUtil.convertPage(pageList, Log.class);
-    }
-
-    @Override
-    public List<Log> queryAll(LogQueryParam query) {
-        return logMapper.selectList(QueryHelpMybatisPlus.getPredicate(query));
-    }
-
-    @Override
-    public PageInfo<LogSmallDTO> queryAllByUser(LogQueryParam query, Pageable pageable) {
-        IPage<Log> page = PageUtil.toMybatisPage(pageable);
-        IPage<Log> pageList = logMapper.selectPage(page, QueryHelpMybatisPlus.getPredicate(query));
-        return ConvertUtil.convertPage(pageList, LogSmallDTO.class);
-    }
-
-    @Override
-    // @Cacheable(key = "'id:' + #p0")
-    public Log findById(Long id) {
-        return logMapper.selectById(id);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean removeByLogType(String logType) {
-        UpdateWrapper<Log> wrapper = new UpdateWrapper<>();
-        wrapper.lambda().eq(Log::getLogType, logType);
-        return logMapper.delete(wrapper) > 0;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(String username, String browser, String ip, ProceedingJoinPoint joinPoint, Log log) {
-
-        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        Method method = signature.getMethod();
-        easydo.technology.annotation.Log aopLog = method.getAnnotation(easydo.technology.annotation.Log.class);
-
-        // 方法路径
-        String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
-
-        StringBuilder params = new StringBuilder("{");
-        // 参数值
-        List<Object> argValues = new ArrayList<>(Arrays.asList(joinPoint.getArgs()));
-        // 参数名称
-        for (Object argValue : argValues) {
-            params.append(argValue).append(" ");
-        }
-        // 描述
-        if (log != null) {
-            log.setDescription(aopLog.value());
-        }
-        assert log != null;
-        log.setRequestIp(ip);
-
-        String loginPath = "login";
-        if (loginPath.equals(signature.getName())) {
-            try {
-                username = JSONObject.parseObject(JSONObject.toJSONString(argValues.get(0))).getString("username");
-            } catch (Exception e) {
-                LogServiceImpl.log.error(e.getMessage(), e);
-            }
-        }
-        // log.setAddress(StringUtils.getCityInfo(log.getRequestIp()));
-        log.setMethod(methodName);
-        log.setUsername(username);
-        log.setParams(params.toString() + " }");
-        log.setBrowser(browser);
-        if (log.getId() == null) {
-            logMapper.insert(log);
-        } else {
-            logMapper.updateById(log);
-        }
-    }
-
-    @Override
-    public Object findByErrDetail(Long id) {
-        Log log = findById(id);
-        ValidationUtil.isNull(log.getId(), "Log", "id", id);
-        byte[] details = log.getExceptionDetail();
-        // return Dict.create().set("exception", new String(details != null ? details :
-        // "".getBytes()));
-        return new String(details != null ? details : "".getBytes());
-    }
-
-    @Override
-    public void download(List<Log> logs, HttpServletResponse response) throws IOException {
-        List<Map<String, Object>> list = new ArrayList<>();
-        for (Log log : logs) {
-            Map<String, Object> map = new LinkedHashMap<>();
-            map.put("用户名", log.getUsername());
-            map.put("IP", log.getRequestIp());
-            map.put("IP来源", log.getAddress());
-            map.put("描述", log.getDescription());
-            map.put("浏览器", log.getBrowser());
-            map.put("请求耗时/毫秒", log.getTime());
-            map.put("异常详情", new String(
-                    log.getExceptionDetail() != null ? log.getExceptionDetail() : "".getBytes()));
-            map.put("创建日期", log.getCreateTime());
-            list.add(map);
-        }
-        // FileUtil.downloadExcel(list, response);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delAllByError() {
-        this.removeByLogType("ERROR");
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delAllByInfo() {
-        this.removeByLogType("INFO");
-    }
-}

easydo-system/src/main/java/easydo/technology/system/rest/DictController.java

@@ -35,7 +35,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import easydo.technology.annotation.Log;
 import easydo.technology.exception.BadRequestException;
 import easydo.technology.system.service.DictService;
 import lombok.RequiredArgsConstructor;
@@ -52,25 +51,21 @@ public class DictController {
     private final DictService dictService;
     private static final String ENTITY_NAME = "dict";
 
-    @Log("导出字典数据")
     @GetMapping(value = "/download")
     public void download(HttpServletResponse response, DictQueryParam criteria) throws IOException {
         dictService.download(dictService.queryAll(criteria), response);
     }
 
-    @Log("查询字典")
     @GetMapping(value = "/all")
     public ResponseEntity<Object> queryAll(){
         return new ResponseEntity<>(dictService.queryAll(new DictQueryParam()),HttpStatus.OK);
     }
 
-    @Log("查询字典")
     @GetMapping
     public ResponseEntity<Object> query(DictQueryParam query, Pageable pageable){
         return new ResponseEntity<>(dictService.queryAll(query,pageable),HttpStatus.OK);
     }
 
-    @Log("新增字典")
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody Dict resources){
         if (resources.getId() != null) {
@@ -80,14 +75,12 @@ public class DictController {
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
-    @Log("修改字典")
     @PutMapping
     public ResponseEntity<Object> update(@RequestBody Dict resources){
         dictService.updateById(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
-    @Log("删除字典")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){
         dictService.removeByIds(ids);

easydo-system/src/main/java/easydo/technology/system/rest/DictDetailController.java

@@ -38,7 +38,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import easydo.technology.annotation.Log;
 import easydo.technology.exception.BadRequestException;
 import easydo.technology.system.service.DictDetailService;
 import lombok.RequiredArgsConstructor;
@@ -55,7 +54,6 @@ public class DictDetailController {
     private final DictDetailService dictDetailService;
     private static final String ENTITY_NAME = "dictDetail";
 
-    @Log("查询字典详情")
     @GetMapping
     public ResponseEntity<Object> query(DictDetailQueryParam query,
                                         @PageableDefault(sort = {"dictSort"}, direction = Sort.Direction.ASC) Pageable pageable){
@@ -66,7 +64,6 @@ public class DictDetailController {
         }
     }
 
-    @Log("查询多个字典详情")
     @GetMapping(value = "/map")
     public ResponseEntity<Object> getDictDetailMaps(@RequestParam String dictName){
         String[] names = dictName.split("[,，]");
@@ -77,7 +74,6 @@ public class DictDetailController {
         return new ResponseEntity<>(dictMap, HttpStatus.OK);
     }
 
-    @Log("新增字典详情")
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody DictDetailDto resources){
         if (resources.getId() != null) {
@@ -87,14 +83,12 @@ public class DictDetailController {
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
-    @Log("修改字典详情")
     @PutMapping
     public ResponseEntity<Object> update(@RequestBody DictDetailDto resources){
         dictDetailService.updateById(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
-    @Log("删除字典详情")
     @DeleteMapping(value = "/{id}")
     public ResponseEntity<Object> delete(@PathVariable Long id){
         dictDetailService.removeById(id);

easydo-system/src/main/java/easydo/technology/system/rest/MenuController.java

@@ -16,7 +16,6 @@
 package easydo.technology.system.rest;
 
 import com.alibaba.fastjson.JSONObject;
-import easydo.technology.annotation.Log;
 import easydo.technology.exception.BadRequestException;
 import easydo.technology.system.domain.Menu;
 import easydo.technology.system.dto.MenuDto;
@@ -50,7 +49,6 @@ public class MenuController {
     // private final MenuMapper menuMapper;
     private static final String ENTITY_NAME = "menu";
 
-    @Log("查询菜单")
     @GetMapping
     public ResponseEntity<Object> query(MenuQueryParam criteria) throws Exception {
         List<MenuDto> menuDtoList = menuService.queryAll(criteria, true);
@@ -87,7 +85,6 @@ public class MenuController {
 //        return new ResponseEntity<>(menuService.buildMenus(menuDtos), HttpStatus.OK);
 //    }
 
-    @Log("查询菜单")
     @PostMapping("/superior")
     public ResponseEntity<Object> getSuperior(@RequestBody List<Long> ids) throws Exception {
         Set<MenuDto> menuDtos = new LinkedHashSet<>();
@@ -101,7 +98,6 @@ public class MenuController {
         throw new Exception("参数缺失");
     }
 
-    @Log("新增菜单")
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody Menu resources) {
         if (resources.getId() != null) {
@@ -111,14 +107,12 @@ public class MenuController {
         return new ResponseEntity<>(resources, HttpStatus.OK);
     }
 
-    @Log("修改菜单")
     @PutMapping
     public ResponseEntity<Object> update(@Validated(Menu.Update.class) @RequestBody Menu resources) {
         menuService.updateById(resources);
         return new ResponseEntity<>(resources, HttpStatus.OK);
     }
 
-    @Log("删除菜单")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<Long> ids) {
         Set<Menu> menuSet = new HashSet<>();
@@ -133,7 +127,6 @@ public class MenuController {
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    @Log("导出菜单数据")
     @GetMapping(value = "/download")
     public void download(HttpServletResponse response, MenuQueryParam criteria) throws Exception {
         menuService.download(menuService.queryAll(criteria, false), response);

easydo-system/src/main/java/easydo/technology/system/rest/RoleController.java

@@ -15,7 +15,6 @@
  */
 package easydo.technology.system.rest;
 
-import easydo.technology.annotation.Log;
 import easydo.technology.exception.BadRequestException;
 import easydo.technology.system.domain.Role;
 import easydo.technology.system.dto.RoleDto;
@@ -54,7 +53,6 @@ public class RoleController {
         return new ResponseEntity<>(roleService.findById(id), HttpStatus.OK);
     }
 
-    @Log("导出角色数据")
     @GetMapping(value = "/download")
     public void download(HttpServletResponse response, RoleQueryParam criteria) throws IOException {
         roleService.download(roleService.queryAll(criteria), response);
@@ -65,7 +63,6 @@ public class RoleController {
         return new ResponseEntity<>(roleService.queryAll(), HttpStatus.OK);
     }
 
-    @Log("查询角色")
     @GetMapping
     public ResponseEntity<Object> query(RoleQueryParam criteria, Pageable pageable) {
         return new ResponseEntity<>(roleService.queryAll(criteria, pageable), HttpStatus.OK);
@@ -78,7 +75,6 @@ public class RoleController {
         return new ResponseEntity<>(map, HttpStatus.OK);
     }
 
-    @Log("新增角色")
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody RoleDto resources) {
         if (resources.getId() != null) {
@@ -89,7 +85,6 @@ public class RoleController {
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
-    @Log("修改角色")
     @PutMapping
     public ResponseEntity<Object> update(@Validated(Role.Update.class) @RequestBody RoleDto resources) {
         getLevels(resources.getLevel());
@@ -97,7 +92,6 @@ public class RoleController {
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
-    @Log("修改角色菜单")
     @PutMapping(value = "/menu")
     public ResponseEntity<Object> updateMenu(@RequestBody RoleDto resources) {
         RoleDto role = roleService.findById(resources.getId());
@@ -106,7 +100,6 @@ public class RoleController {
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
-    @Log("删除角色")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<Long> ids) {
         for (Long id : ids) {

easydo-system/src/main/java/easydo/technology/system/rest/SysDictController.java

@@ -1,6 +1,5 @@
 package easydo.technology.system.rest;
 
-import easydo.technology.annotation.Log;
 import easydo.technology.system.dto.DictDetailDto;
 import easydo.technology.system.mapper.DictDetailMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +14,6 @@ import java.util.List;
 public class SysDictController {
     @Autowired
     private DictDetailMapper dictDetailMapper;
-    @Log("字典查询")
     @RequestMapping(value = "/selectDict")
     public List<DictDetailDto> selectDict(@RequestBody DictDetailDto detailDto){
         List<DictDetailDto> dictDetailDtos = dictDetailMapper.getDictDetailsByDictName(detailDto);

easydo-system/src/main/java/easydo/technology/system/rest/SysUserController.java

@@ -1,7 +1,6 @@
 package easydo.technology.system.rest;
 
 
-import easydo.technology.annotation.Log;
 import easydo.technology.system.domain.User;
 import easydo.technology.system.domain.vo.UserDto;
 import easydo.technology.system.service.UserService;
@@ -32,7 +31,6 @@ public class SysUserController {
     @Autowired
     private UserService sysUserService;
 
-    @Log("查询用户")
     @RequestMapping(value = "/getList")
     public ResponseEntity<Object> getList(@RequestBody Map<Object,Object> paramMap){
         Map<String, Object> result = new HashMap<>();
@@ -46,7 +44,6 @@ public class SysUserController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-    @Log("查询用户(userId为字符串)")
     @RequestMapping(value = "/getUserStrList")
     public ResponseEntity<Object> getUserStrList(@RequestBody Map<Object,Object> paramMap){
         Map<String, Object> result = new HashMap<>();

easydo-system/src/main/java/easydo/technology/system/rest/UserController.java

@@ -17,7 +17,6 @@ package easydo.technology.system.rest;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import easydo.technology.annotation.Log;
 import easydo.technology.config.RsaProperties;
 import easydo.technology.core.processors.UserProcessor;
 import easydo.technology.exception.BadRequestException;
@@ -78,7 +77,6 @@ public class UserController {
         userService.download(userService.queryAll(criteria), response);
     }
 
-    @Log("查询用户")
     @GetMapping
 /**
     // 该注解会影响前端用户查询用户列表，先干掉，后续有需求斟酌一下再打开
@@ -107,7 +105,6 @@ public class UserController {
         return new ResponseEntity<>(PageUtil.toPage(null, 0), HttpStatus.OK);
     }
 
-    @Log("新增用户")
     @PostMapping
     public ResponseEntity<Object> create(@Validated @RequestBody UserDto resources) {
         checkLevel(resources);
@@ -117,7 +114,6 @@ public class UserController {
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
-    @Log("修改用户")
     @PutMapping
     public ResponseEntity<Object> update(@Validated(User.Update.class) @RequestBody UserDto resources) {
         checkLevel(resources);
@@ -125,7 +121,6 @@ public class UserController {
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
-    @Log("修改用户：个人中心")
     @PutMapping(value = "center")
     public ResponseEntity<Object> center(@Validated(User.Update.class) @RequestBody User resources) {
         if (!resources.getId().equals(SecurityUtils.getCurrentUserId())) {
@@ -135,7 +130,6 @@ public class UserController {
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
-    @Log("删除用户")
     @DeleteMapping
     public ResponseEntity<Object> delete(@RequestBody Set<Long> ids) {
         for (Long id : ids) {
@@ -195,7 +189,6 @@ public class UserController {
         return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK);
     }
 
-    @Log("修改邮箱")
     @PostMapping(value = "/updateEmail/{code}")
     public ResponseEntity<Object> updateEmail(@PathVariable String code, @RequestBody User user) throws Exception {
         String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, user.getPassword());

easydo-system/src/main/java/easydo/technology/system/security/rest/AuthorizationController.java

@@ -16,7 +16,6 @@
 package easydo.technology.system.security.rest;
 
 import com.wf.captcha.base.Captcha;
-import easydo.technology.annotation.Log;
 import easydo.technology.annotation.rest.AnonymousDeleteMapping;
 import easydo.technology.annotation.rest.AnonymousGetMapping;
 import easydo.technology.annotation.rest.AnonymousPostMapping;
@@ -70,7 +69,6 @@ public class AuthorizationController {
     private final DeptService deptService;
     private final LoginProperties loginProperties;
 
-    @Log("用户登录")
     @AnonymousPostMapping(value = "/login")
     public ResponseEntity<Object> login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request)
             throws Exception {

easydo-system/src/main/java/easydo/technology/system/security/rest/OnlineController.java

@@ -15,7 +15,6 @@
  */
 package easydo.technology.system.security.rest;
 
-import easydo.technology.annotation.Log;
 import easydo.technology.system.security.service.OnlineUserService;
 import easydo.technology.utils.EncryptUtils;
 import lombok.RequiredArgsConstructor;
@@ -44,7 +43,6 @@ public class OnlineController {
         return new ResponseEntity<>(onlineUserService.getAll(filter, pageable),HttpStatus.OK);
     }
 
-    @Log("导出数据")
     @GetMapping(value = "/download")
     public void download(HttpServletResponse response, String filter) throws IOException {
         onlineUserService.download(onlineUserService.getAll(filter), response);

pom.xml

@@ -17,7 +17,6 @@
     <modules>
         <module>zero-lite-framework</module>
         <module>easydo-common</module>
-        <module>easydo-logging</module>
 
         <module>easydo-core</module>
         <module>easydo-system</module>