diff --git a/pear-common/src/main/java/com/pearadmin/common/plugin/logging/aop/LoggingAspect.java b/pear-common/src/main/java/com/pearadmin/common/plugin/logging/aop/LoggingAspect.java index 64bcf921a4ad537646b31d12e66df8ac75cdc2bf..ec9b679ca6ee9108828117d13d66a709e18e2fc7 100644 --- a/pear-common/src/main/java/com/pearadmin/common/plugin/logging/aop/LoggingAspect.java +++ b/pear-common/src/main/java/com/pearadmin/common/plugin/logging/aop/LoggingAspect.java @@ -2,8 +2,10 @@ package com.pearadmin.common.plugin.logging.aop; import com.pearadmin.common.plugin.logging.aop.annotation.Logging; import com.pearadmin.common.plugin.logging.aop.enums.LoggingType; +import com.pearadmin.common.plugin.logging.aop.enums.RequestMethod; import com.pearadmin.common.plugin.logging.async.LoggingFactory; import com.pearadmin.common.tools.SequenceUtil; +import com.pearadmin.common.tools.ServletUtil; import com.pearadmin.system.domain.SysLog; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -48,12 +50,21 @@ public class LoggingAspect { sysLog.setTitle(loggingAnnotation.title()); sysLog.setDescription(loggingAnnotation.describe()); sysLog.setBusinessType(loggingAnnotation.type()); - sysLog.setSuccess(true); sysLog.setLoggingType(LoggingType.OPERATE); + + sysLog.setOperateAddress(ServletUtil.getRemoteHost()); + sysLog.setMethod(ServletUtil.getRequestURI()); + sysLog.setRequestMethod(RequestMethod.valueOf(ServletUtil.getMethod())); + sysLog.setOperateUrl(ServletUtil.getRequestURI()); + sysLog.setBrowser(ServletUtil.getBrowser()); + sysLog.setRequestBody(ServletUtil.getQueryParam()); + sysLog.setSystemOs(ServletUtil.getSystem()); + + sysLog.setSuccess(true); result = joinPoint.proceed(); } catch (Exception exception) { - sysLog.setSuccess(false); sysLog.setErrorMsg(exception.getMessage()); + sysLog.setSuccess(false); throw exception; } finally { loggingFactory.record(sysLog); diff --git a/pear-common/src/main/java/com/pearadmin/system/service/impl/SysLogServiceImpl.java b/pear-common/src/main/java/com/pearadmin/system/service/impl/SysLogServiceImpl.java index 217c045bbbf928e45a21116a607ad5c107b26293..84e45ea3be638bec8c2c51942a3793652d8b6bd2 100644 --- a/pear-common/src/main/java/com/pearadmin/system/service/impl/SysLogServiceImpl.java +++ b/pear-common/src/main/java/com/pearadmin/system/service/impl/SysLogServiceImpl.java @@ -1,9 +1,7 @@ package com.pearadmin.system.service.impl; import com.pearadmin.common.plugin.logging.aop.enums.LoggingType; -import com.pearadmin.common.plugin.logging.aop.enums.RequestMethod; import com.pearadmin.common.tools.SecurityUtil; -import com.pearadmin.common.tools.ServletUtil; import com.pearadmin.system.domain.SysLog; import com.pearadmin.system.domain.SysUser; import com.pearadmin.system.mapper.SysLogMapper; @@ -27,16 +25,9 @@ public class SysLogServiceImpl implements ISysLogService { @Override public boolean save(SysLog sysLog) { - sysLog.setOperateAddress(ServletUtil.getRemoteHost()); - sysLog.setMethod(ServletUtil.getRequestURI()); - sysLog.setCreateTime(LocalDateTime.now()); - sysLog.setRequestMethod(RequestMethod.valueOf(ServletUtil.getMethod())); - sysLog.setOperateUrl(ServletUtil.getRequestURI()); - sysLog.setBrowser(ServletUtil.getBrowser()); - sysLog.setRequestBody(ServletUtil.getQueryParam()); - sysLog.setSystemOs(ServletUtil.getSystem()); SysUser currentUser = SecurityUtil.currentUser(); sysLog.setOperateName(null != currentUser ? currentUser.getUsername() : "未登录用户"); + sysLog.setCreateTime(LocalDateTime.now()); int result = sysLogMapper.insert(sysLog); return result > 0; } diff --git a/pear-entrance/src/main/java/com/pearadmin/PearEntranceApplication.java b/pear-entrance/src/main/java/com/pearadmin/PearEntranceApplication.java index f58388f864c22f2f083e9f07473e7ddd58d1cc0f..2ce1dce60788c99987bebaa213a78134265636ac 100644 --- a/pear-entrance/src/main/java/com/pearadmin/PearEntranceApplication.java +++ b/pear-entrance/src/main/java/com/pearadmin/PearEntranceApplication.java @@ -8,15 +8,16 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.Environment; +import org.springframework.scheduling.annotation.EnableAsync; import java.io.IOException; import java.net.InetAddress; -import java.net.UnknownHostException; /** * Spring Boot Application 启 动 类 */ @Slf4j +@EnableAsync @ServletComponentScan @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, org.activiti.spring.boot.SecurityAutoConfiguration.class, SecurityAutoConfiguration.class}) public class PearEntranceApplication {