将 mall-spring-boot-starter-web 接入新的 system-service 服务

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/convert/systemlog/SystemLogConvert.java

@@ -0,0 +1,34 @@
+package cn.iocoder.mall.systemservice.convert.systemlog;
+
+import cn.iocoder.mall.systemservice.dal.mysql.dataobject.systemlog.AccessLogDO;
+import cn.iocoder.mall.systemservice.dal.mysql.dataobject.systemlog.ExceptionLogDO;
+import cn.iocoder.mall.systemservice.rpc.systemlog.dto.AccessLogAddDTO;
+import cn.iocoder.mall.systemservice.rpc.systemlog.dto.ExceptionLogAddDTO;
+import cn.iocoder.mall.systemservice.service.systemlog.bo.AccessLogAddBO;
+import cn.iocoder.mall.systemservice.service.systemlog.bo.ExceptionLogAddBO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface SystemLogConvert {
+
+    SystemLogConvert INSTANCE = Mappers.getMapper(SystemLogConvert.class);
+
+    AccessLogDO convert(AccessLogAddBO bean);
+
+    ExceptionLogDO convert(ExceptionLogAddBO bean);
+
+    AccessLogAddBO convert(AccessLogAddDTO bean);
+
+    ExceptionLogAddBO convert(ExceptionLogAddDTO bean);
+
+//    AccessLogDO convert(AccessLogAddDTO bean);
+//
+//    ExceptionLogDO convert(ExceptionLogAddDTO bean);
+//
+//    @Mapping(source = "records", target = "list")
+//    PageResult<AccessLogBO> convertPage(IPage<AccessLogDO> page);
+//
+//    AccessLogBO convert(AccessLogDO bean);
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/dal/mysql/dataobject/systemlog/AccessLogDO.java

@@ -0,0 +1,89 @@
+package cn.iocoder.mall.systemservice.dal.mysql.dataobject.systemlog;
+
+import cn.iocoder.common.framework.enums.UserTypeEnum;
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.mall.mybatis.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 访问日志 DO
+ */
+@TableName("system_access_log")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class AccessLogDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    private Integer id;
+    /**
+     * 用户编号
+     */
+    private Integer userId;
+    /**
+     * 用户类型
+     *
+     * 枚举 {@link UserTypeEnum}
+     */
+    private Integer userType;
+    /**
+     * 链路追踪编号
+     *
+     * 一般来说，通过链路追踪编号，可以将访问日志，错误日志，链路追踪日志，logger 打印日志等，结合在一起，从而进行排错。
+     */
+    private String traceId;
+    /**
+     * 应用名
+     *
+     * 目前读取 `spring.application.name` 配置项
+     */
+    private String applicationName;
+    /**
+     * 访问地址
+     */
+    private String uri;
+    /**
+     * 参数
+     */
+    private String queryString;
+    /**
+     * http 方法
+     */
+    private String method;
+    /**
+     * userAgent
+     */
+    private String userAgent;
+    /**
+     * ip
+     */
+    private String ip;
+    /**
+     * 请求时间
+     */
+    private Date startTime;
+    /**
+     * 响应时长 -- 毫秒级
+     */
+    private Integer responseTime;
+    /**
+     * 错误码
+     *
+     * 目前的结果，是使用 {@link CommonResult#getCode()} 属性
+     */
+    private Integer errorCode;
+    /**
+     * 错误提示
+     *
+     * 目前的结果，是使用 {@link CommonResult#getMessage()} 属性
+     */
+    private String errorMessage;
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/dal/mysql/dataobject/systemlog/ExceptionLogDO.java

@@ -0,0 +1,120 @@
+package cn.iocoder.mall.systemservice.dal.mysql.dataobject.systemlog;
+
+import cn.iocoder.common.framework.enums.UserTypeEnum;
+import cn.iocoder.mall.mybatis.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 异常日志 DO
+ */
+@TableName("system_exception_log")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class ExceptionLogDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    private Integer id;
+    /**
+     * 用户编号
+     */
+    private Integer userId;
+    /**
+     * 用户类型
+     *
+     * 枚举 {@link UserTypeEnum}
+     */
+    private Integer userType;
+    /**
+     * 链路追踪编号
+     *
+     * 一般来说，通过链路追踪编号，可以将访问日志，错误日志，链路追踪日志，logger 打印日志等，结合在一起，从而进行排错。
+     */
+    private String traceId;
+    /**
+     * 应用名
+     *
+     * 目前读取 spring.application.name
+     */
+    private String applicationName;
+    /**
+     * 访问地址
+     */
+    private String uri;
+    /**
+     * 参数
+     */
+    private String queryString;
+    /**
+     * http 方法
+     */
+    private String method;
+    /**
+     * userAgent
+     */
+    private String userAgent;
+    /**
+     * ip
+     */
+    private String ip;
+    /**
+     * 异常发生时间
+     */
+    private Date exceptionTime;
+    /**
+     * 异常名
+     *
+     * {@link Throwable#getClass()} 的类全名
+     */
+    private String exceptionName;
+    /**
+     * 异常导致的消息
+     *
+     * {@link cn.iocoder.common.framework.util.ExceptionUtil#getMessage(Throwable)}
+     */
+    private String exceptionMessage;
+    /**
+     * 异常导致的根消息
+     *
+     * {@link cn.iocoder.common.framework.util.ExceptionUtil#getRootCauseMessage(Throwable)}
+     */
+    private String exceptionRootCauseMessage;
+    /**
+     * 异常的栈轨迹
+     *
+     * {@link cn.iocoder.common.framework.util.ExceptionUtil#getServiceException(Exception)}
+     */
+    private String exceptionStackTrace;
+    /**
+     * 异常发生的类全名
+     *
+     * {@link StackTraceElement#getClassName()}
+     */
+    private String exceptionClassName;
+    /**
+     * 异常发生的类文件
+     *
+     * {@link StackTraceElement#getFileName()}
+     */
+    private String exceptionFileName;
+    /**
+     * 异常发生的方法名
+     *
+     * {@link StackTraceElement#getMethodName()}
+     */
+    private String exceptionMethodName;
+    /**
+     * 异常发生的方法所在行
+     *
+     * {@link StackTraceElement#getLineNumber()}
+     */
+    private Integer exceptionLineNumber;
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/dal/mysql/mapper/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.mall.systemservice.dal.mysql.mapper;

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/dal/mysql/mapper/systemlog/AccessLogMapper.java

@@ -0,0 +1,15 @@
+package cn.iocoder.mall.systemservice.dal.mysql.mapper.systemlog;
+
+import cn.iocoder.mall.systemservice.dal.mysql.dataobject.systemlog.AccessLogDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface AccessLogMapper extends BaseMapper<AccessLogDO> {
+
+//    default IPage<AccessLogDO> selectPage(AccessLogPageDTO accessLogPageDTO) {
+//        return selectPage(new Page<>(accessLogPageDTO.getPageNo(), accessLogPageDTO.getPageSize()),
+//                new QueryWrapperX<AccessLogDO>().eqIfPresent("account_id", accessLogPageDTO.getAccountId()));
+//    }
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/dal/mysql/mapper/systemlog/ExceptionLogMapper.java

@@ -0,0 +1,10 @@
+package cn.iocoder.mall.systemservice.dal.mysql.mapper.systemlog;
+
+import cn.iocoder.mall.systemservice.dal.mysql.dataobject.systemlog.ExceptionLogDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ExceptionLogMapper extends BaseMapper<ExceptionLogDO> {
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/manager/systemlog/SystemLogManager.java

@@ -0,0 +1,24 @@
+package cn.iocoder.mall.systemservice.manager.systemlog;
+
+import cn.iocoder.mall.systemservice.convert.systemlog.SystemLogConvert;
+import cn.iocoder.mall.systemservice.rpc.systemlog.dto.AccessLogAddDTO;
+import cn.iocoder.mall.systemservice.rpc.systemlog.dto.ExceptionLogAddDTO;
+import cn.iocoder.mall.systemservice.service.systemlog.SystemLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SystemLogManager {
+
+    @Autowired
+    private SystemLogService systemLogService;
+
+    public void addAccessLog(AccessLogAddDTO accessLogAddDTO) {
+        systemLogService.addAccessLog(SystemLogConvert.INSTANCE.convert(accessLogAddDTO));
+    }
+
+    public void addExceptionLog(ExceptionLogAddDTO exceptionLogAddDTO) {
+        systemLogService.addExceptionLog(SystemLogConvert.INSTANCE.convert(exceptionLogAddDTO));
+    }
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/rpc/systemlog/SystemLogRPCImpl.java

@@ -0,0 +1,28 @@
+package cn.iocoder.mall.systemservice.rpc.systemlog;
+
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.mall.systemservice.manager.systemlog.SystemLogManager;
+import cn.iocoder.mall.systemservice.rpc.systemlog.dto.AccessLogAddDTO;
+import cn.iocoder.mall.systemservice.rpc.systemlog.dto.ExceptionLogAddDTO;
+import org.apache.dubbo.config.annotation.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@Service(version = "${dubbo.provider.SystemLogRPC.version}", validation = "false")
+public class SystemLogRPCImpl implements SystemLogRPC {
+
+    @Autowired
+    private SystemLogManager systemLogManager;
+
+    @Override
+    public CommonResult<Boolean> addAccessLog(AccessLogAddDTO accessLogAddDTO) {
+        systemLogManager.addAccessLog(accessLogAddDTO);
+        return CommonResult.success(true);
+    }
+
+    @Override
+    public CommonResult<Boolean> addExceptionLog(ExceptionLogAddDTO exceptionLogAddDTO) {
+        systemLogManager.addExceptionLog(exceptionLogAddDTO);
+        return CommonResult.success(true);
+    }
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/admin/AdminService.java

@@ -36,4 +36,8 @@ public class AdminService {
         return AdminConvert.INSTANCE.convert(adminDO);
     }
 
+//    public PageResult<AdminBO> getAdminPage(AdminPageDTO pageDTO) {
+//        return AdminConvert.INSTANCE.convertPage(adminMapper.selectPage(pageDTO));
+//    }
+
 }

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/systemlog/SystemLogService.java

@@ -0,0 +1,39 @@
+package cn.iocoder.mall.systemservice.service.systemlog;
+
+import cn.iocoder.mall.systemservice.convert.systemlog.SystemLogConvert;
+import cn.iocoder.mall.systemservice.dal.mysql.dataobject.systemlog.AccessLogDO;
+import cn.iocoder.mall.systemservice.dal.mysql.dataobject.systemlog.ExceptionLogDO;
+import cn.iocoder.mall.systemservice.dal.mysql.mapper.systemlog.AccessLogMapper;
+import cn.iocoder.mall.systemservice.dal.mysql.mapper.systemlog.ExceptionLogMapper;
+import cn.iocoder.mall.systemservice.service.systemlog.bo.AccessLogAddBO;
+import cn.iocoder.mall.systemservice.service.systemlog.bo.ExceptionLogAddBO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SystemLogService {
+
+    @Autowired
+    private AccessLogMapper accessLogMapper;
+    @Autowired
+    private ExceptionLogMapper exceptionLogMapper;
+
+    public void addAccessLog(AccessLogAddBO accessLogAddBO) {
+        AccessLogDO logDO = SystemLogConvert.INSTANCE.convert(accessLogAddBO);
+        accessLogMapper.insert(logDO);
+    }
+
+    public void addExceptionLog(ExceptionLogAddBO exceptionLogAddBO) {
+        ExceptionLogDO logDO = SystemLogConvert.INSTANCE.convert(exceptionLogAddBO);
+        exceptionLogMapper.insert(logDO);
+    }
+
+//    @Override
+//    @SuppressWarnings("Duplicates")
+//    public PageResult<AccessLogBO> getAccessLogPage(AccessLogPageDTO accessLogPageDTO) {
+//        PageResult<AccessLogBO> accessLogPageBOPageResult = SystemLogConvert.INSTANCE.convertPage(
+//                accessLogMapper.selectPage(accessLogPageDTO)); // TODO FROM 芋艿 to 2447007062：可以考虑直接 return，简洁 + IDEA 不告警；
+//        return accessLogPageBOPageResult;
+//    }
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/systemlog/bo/AccessLogAddBO.java

@@ -0,0 +1,55 @@
+package cn.iocoder.mall.systemservice.service.systemlog.bo;
+
+import cn.iocoder.common.framework.enums.UserTypeEnum;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 访问日志添加 BO
+ */
+@Data
+@Accessors(chain = true)
+public class AccessLogAddBO implements Serializable {
+
+    /**
+     * 账号编号
+     */
+    private Integer userId;
+    /**
+     * 用户类型
+     *
+     * 枚举 {@link UserTypeEnum}
+     */
+    private Integer userType;
+    /**
+     * 链路编号
+     */
+    private String traceId;
+    @NotNull(message = "应用名不能为空")
+    private String applicationName;
+    @NotNull(message = "访问地址不能为空")
+    private String uri;
+    @NotNull(message = "请求参数不能为空")
+    private String queryString;
+    @NotNull(message = "http 请求方法不能为空")
+    private String method;
+    @NotNull(message = "User-Agent 不能为空")
+    private String userAgent;
+    @NotNull(message = "ip 不能为空")
+    private String ip;
+    @NotNull(message = "请求时间不能为空")
+    private Date startTime;
+    @NotNull(message = "响应时长不能为空")
+    private Integer responseTime;
+    @NotNull(message = "错误码不能为空")
+    private Integer errorCode;
+    /**
+     * 错误提示
+     */
+    private String errorMessage;
+
+}

system-service-project/system-service-app/src/main/java/cn/iocoder/mall/systemservice/service/systemlog/bo/ExceptionLogAddBO.java

@@ -0,0 +1,63 @@
+package cn.iocoder.mall.systemservice.service.systemlog.bo;
+
+import cn.iocoder.common.framework.enums.UserTypeEnum;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 异常日志添加 BO
+ */
+@Data
+@Accessors(chain = true)
+public class ExceptionLogAddBO implements Serializable {
+
+    /**
+     * 账号编号
+     */
+    private Integer userId;
+    /**
+     * 用户类型
+     *
+     * 枚举 {@link UserTypeEnum}
+     */
+    private Integer userType;
+    /**
+     * 链路编号
+     */
+    private String traceId;
+    @NotNull(message = "应用名不能为空")
+    private String applicationName;
+    @NotNull(message = "访问地址不能为空")
+    private String uri;
+    @NotNull(message = "请求参数不能为空")
+    private String queryString;
+    @NotNull(message = "http 请求方法不能为空")
+    private String method;
+    @NotNull(message = "User-Agent 不能为空")
+    private String userAgent;
+    @NotNull(message = "ip 不能为空")
+    private String ip;
+    @NotNull(message = "异常时间不能为空")
+    private Date exceptionTime;
+    @NotNull(message = "异常名不能为空")
+    private String exceptionName;
+    @NotNull(message = "异常发生的类全名不能为空")
+    private String exceptionClassName;
+    @NotNull(message = "异常发生的类文件不能为空")
+    private String exceptionFileName;
+    @NotNull(message = "异常发生的方法名不能为空")
+    private String exceptionMethodName;
+    @NotNull(message = "异常发生的方法所在行不能为空")
+    private Integer exceptionLineNumber;
+    @NotNull(message = "异常的栈轨迹不能为空")
+    private String exceptionStackTrace;
+    @NotNull(message = "异常导致的根消息不能为空")
+    private String exceptionRootCauseMessage;
+    @NotNull(message = "异常导致的消息不能为空")
+    private String exceptionMessage;
+
+}