添加文件处理模块

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOperLog.java

@@ -27,11 +27,9 @@ public class SysOperLog extends BaseEntity
     private Integer[] businessTypes;
 
     /** 请求方法 */
-    //@Excel(name = "请求方法")
     private String method;
 
     /** 请求方式 */
-    //@Excel(name = "请求方式")
     private String requestMethod;
 
     /** 操作类别（0其它 1后台用户 2手机端用户） */

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/config/MybatisPlusConfig.java

@@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 /**
  * Mybatis Plus 配置
  *
- * @author ruoyi
+ * @author xunmei
  */
 @EnableTransactionManagement(proxyTargetClass = true)
 @Configuration

soc-modules/soc-modules-file/src/main/resources/logback.xml

@@ -58,7 +58,7 @@
     </appender>
 
     <!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.xunmei" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

soc-modules/soc-modules-job/pom.xml

@@ -67,14 +67,14 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Log -->
+        <!-- xunmei Common Log -->
         <dependency>
             <groupId>com.xunmei</groupId>
             <artifactId>soc-common-log</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
-        <!-- RuoYi Common Swagger -->
+        <!-- xunmei Common Swagger -->
         <dependency>
             <groupId>com.xunmei</groupId>
             <artifactId>soc-common-swagger</artifactId>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/LogininforController.java

@@ -0,0 +1,103 @@
+package com.xunmei.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.common.security.annotation.InnerAuth;
+import com.xunmei.system.api.domain.SysLogininfor;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.springframework.web.bind.annotation.*;
+import com.xunmei.system.service.ILogininforService;
+import com.xunmei.system.domain.Logininfor;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import static com.xunmei.common.core.web.domain.AjaxResult.success;
+import static com.xunmei.common.core.web.domain.AjaxResult.error;
+import javax.annotation.Resource;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * LogininforController 前端控制器
+ * </p>
+ *
+ * @author gaoxiong
+ * @since 2023-08-04
+ */
+@Api(tags = {"LogininforController"})
+@RestController
+@RequestMapping("/logininfor")
+public class LogininforController {
+
+    private Logger log = LoggerFactory.getLogger(getClass());
+    @Resource
+    private ILogininforService logininforService;
+
+
+    @ApiOperation(value = "新增系统访问记录")
+    @InnerAuth
+    @PostMapping
+    public AjaxResult add(@RequestBody Logininfor logininfor){
+        try {
+            logininforService.add(logininfor);
+            return success();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "删除系统访问记录")
+    @RequiresPermissions("system:logininfor:delete")
+    @DeleteMapping("/{id}")
+    public AjaxResult delete(@PathVariable("id") Long id){
+        try {
+            return logininforService.delete(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "更新系统访问记录")
+    @RequiresPermissions("system:logininfor:update")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody Logininfor logininfor){
+        try {
+            return logininforService.updateData(logininfor);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "查询系统访问记录分页数据")
+    @RequiresPermissions("system:logininfor:findByPage")
+    @GetMapping("/findByPage")
+    public AjaxResult findListByPage(Page<Logininfor> page,Logininfor logininfor){
+        try {
+            return logininforService.findListByPage(page, logininfor);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "id查询系统访问记录")
+    @RequiresPermissions("system:logininfor:findById")
+    @GetMapping("/{id}")
+    public AjaxResult findById(@PathVariable Long id){
+        try {
+            return logininforService.findById(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/OperLogController.java

@@ -0,0 +1,100 @@
+package com.xunmei.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.common.security.annotation.InnerAuth;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.springframework.web.bind.annotation.*;
+import com.xunmei.system.service.IOperLogService;
+import com.xunmei.system.domain.OperLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import static com.xunmei.common.core.web.domain.AjaxResult.success;
+import static com.xunmei.common.core.web.domain.AjaxResult.error;
+import javax.annotation.Resource;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * OperLogController 前端控制器
+ * </p>
+ *
+ * @author gaoxiong
+ * @since 2023-08-04
+ */
+@Api(tags = {"OperLogController"})
+@RestController
+@RequestMapping("/operLog")
+public class OperLogController {
+
+    private Logger log = LoggerFactory.getLogger(getClass());
+    @Resource
+    private IOperLogService operLogService;
+
+
+    @ApiOperation(value = "新增操作日志记录")
+    @InnerAuth
+    @PostMapping
+    public AjaxResult add(@RequestBody OperLog operLog){
+        try {
+            return operLogService.add(operLog);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "删除操作日志记录")
+    @RequiresPermissions("system:operLog:delete")
+    @DeleteMapping("/{id}")
+    public AjaxResult delete(@PathVariable("id") Long id){
+        try {
+            return operLogService.delete(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "更新操作日志记录")
+    @RequiresPermissions("system:operLog:update")
+    @PutMapping("/update")
+    public AjaxResult update(@RequestBody OperLog operLog){
+        try {
+            return operLogService.updateData(operLog);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "查询操作日志记录分页数据")
+    @RequiresPermissions("system:operLog:findByPage")
+    @GetMapping("/findByPage")
+    public AjaxResult findListByPage(Page<OperLog> page,OperLog operLog){
+        try {
+            return operLogService.findListByPage(page, operLog);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+    @ApiOperation(value = "id查询操作日志记录")
+    @RequiresPermissions("system:operLog:findById")
+    @GetMapping("/{id}")
+    public AjaxResult findById(@PathVariable Long id){
+        try {
+            return operLogService.findById(id);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return error();
+        }
+    }
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/Logininfor.java

@@ -0,0 +1,51 @@
+package com.xunmei.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 系统访问记录
+ * </p>
+ *
+ * @author gaoxiong
+ * @since 2023-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_logininfor")
+@ApiModel(value="Logininfor对象", description="系统访问记录")
+public class Logininfor implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "访问ID")
+    @TableId(value = "info_id", type = IdType.AUTO)
+    private Long infoId;
+
+    @ApiModelProperty(value = "用户账号")
+    private String userName;
+
+    @ApiModelProperty(value = "登录IP地址")
+    private String ipaddr;
+
+    @ApiModelProperty(value = "登录状态（0成功 1失败）")
+    private String status;
+
+    @ApiModelProperty(value = "提示信息")
+    private String msg;
+
+    @ApiModelProperty(value = "访问时间")
+    private Date accessTime;
+
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/OperLog.java

@@ -0,0 +1,84 @@
+package com.xunmei.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 操作日志记录
+ * </p>
+ *
+ * @author gaoxiong
+ * @since 2023-08-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_oper_log")
+@ApiModel(value="OperLog对象", description="操作日志记录")
+public class OperLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "日志主键")
+    @TableId(value = "oper_id", type = IdType.AUTO)
+    private Long operId;
+
+    @ApiModelProperty(value = "模块标题")
+    private String title;
+
+    @ApiModelProperty(value = "业务类型（0其它 1新增 2修改 3删除）")
+    private Integer businessType;
+
+    @ApiModelProperty(value = "方法名称")
+    private String method;
+
+    @ApiModelProperty(value = "请求方式")
+    private String requestMethod;
+
+    @ApiModelProperty(value = "操作类别（0其它 1后台用户 2手机端用户）")
+    private Integer operatorType;
+
+    @ApiModelProperty(value = "操作人员")
+    private String operName;
+
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+
+    @ApiModelProperty(value = "请求URL")
+    private String operUrl;
+
+    @ApiModelProperty(value = "主机地址")
+    private String operIp;
+
+    @ApiModelProperty(value = "操作地点")
+    private String operLocation;
+
+    @ApiModelProperty(value = "请求参数")
+    private String operParam;
+
+    @ApiModelProperty(value = "返回参数")
+    private String jsonResult;
+
+    @ApiModelProperty(value = "操作状态（0正常 1异常）")
+    private Integer status;
+
+    @ApiModelProperty(value = "错误消息")
+    private String errorMsg;
+
+    @ApiModelProperty(value = "操作时间")
+    private Date operTime;
+
+    @ApiModelProperty(value = "消耗时间")
+    private Long costTime;
+
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/LogininforMapper.java

@@ -0,0 +1,16 @@
+package com.xunmei.system.mapper;
+
+import com.xunmei.system.domain.Logininfor;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统访问记录 Mapper 接口
+ * </p>
+ *
+ * @author gaoxiong
+ * @since 2023-08-04
+ */
+public interface LogininforMapper extends BaseMapper<Logininfor> {
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/OperLogMapper.java

@@ -0,0 +1,16 @@
+package com.xunmei.system.mapper;
+
+import com.xunmei.system.domain.OperLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 操作日志记录 Mapper 接口
+ * </p>
+ *
+ * @author gaoxiong
+ * @since 2023-08-04
+ */
+public interface OperLogMapper extends BaseMapper<OperLog> {
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ILogininforService.java

@@ -0,0 +1,60 @@
+package com.xunmei.system.service;
+
+import com.xunmei.system.api.domain.SysLogininfor;
+import com.xunmei.system.domain.Logininfor;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+
+/**
+ * <p>
+ * 系统访问记录 服务类
+ * </p>
+ *
+ * @author gaoxiong
+ * @since 2023-08-04
+ */
+public interface ILogininforService extends IService<Logininfor> {
+
+    /**
+     * 查询系统访问记录分页数据
+     *
+     * @param page      页码
+     * @param logininfor 每页条数
+     * @return AjaxResult
+     */
+    AjaxResult findListByPage(Page<Logininfor> page,Logininfor logininfor);
+
+    /**
+     * 添加系统访问记录
+     *
+     * @param logininfor 系统访问记录
+     * @return JsonBean
+     */
+    AjaxResult add(Logininfor logininfor);
+
+    /**
+     * 删除系统访问记录
+     *
+     * @param id 主键
+     * @return AjaxResult
+     */
+    AjaxResult delete(Long id);
+
+    /**
+     * 修改系统访问记录
+     *
+     * @param logininfor 系统访问记录
+     * @return AjaxResult
+     */
+    AjaxResult updateData(Logininfor logininfor);
+
+    /**
+     * id查询数据
+     *
+     * @param id id
+     * @return AjaxResult
+     */
+    AjaxResult findById(Long id);
+
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/IOperLogService.java

@@ -0,0 +1,58 @@
+package com.xunmei.system.service;
+
+import com.xunmei.system.domain.OperLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.domain.AjaxResult;
+
+/**
+ * <p>
+ * 操作日志记录 服务类
+ * </p>
+ *
+ * @author gaoxiong
+ * @since 2023-08-04
+ */
+public interface IOperLogService extends IService<OperLog> {
+
+    /**
+     * 查询操作日志记录分页数据
+     *
+     * @param page      页码
+     * @param operLog 每页条数
+     * @return AjaxResult
+     */
+    AjaxResult findListByPage(Page<OperLog> page,OperLog operLog);
+
+    /**
+     * 添加操作日志记录
+     *
+     * @param operLog 操作日志记录
+     * @return JsonBean
+     */
+    AjaxResult add(OperLog operLog);
+
+    /**
+     * 删除操作日志记录
+     *
+     * @param id 主键
+     * @return AjaxResult
+     */
+    AjaxResult delete(Long id);
+
+    /**
+     * 修改操作日志记录
+     *
+     * @param operLog 操作日志记录
+     * @return AjaxResult
+     */
+    AjaxResult updateData(OperLog operLog);
+
+    /**
+     * id查询数据
+     *
+     * @param id id
+     * @return AjaxResult
+     */
+    AjaxResult findById(Long id);
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/LogininforServiceImpl.java

@@ -0,0 +1,49 @@
+package com.xunmei.system.service.impl;
+
+import com.xunmei.system.domain.Logininfor;
+import com.xunmei.system.mapper.LogininforMapper;
+import com.xunmei.system.service.ILogininforService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import static com.xunmei.common.core.web.domain.AjaxResult.success;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * <p>
+ * 系统访问记录 服务实现类
+ * </p>
+ *
+ * @author gaoxiong
+ * @since 2023-08-04
+ */
+@Service
+public class LogininforServiceImpl extends ServiceImpl<LogininforMapper, Logininfor> implements ILogininforService {
+
+    @Override
+    public AjaxResult findListByPage(Page<Logininfor> page,Logininfor logininfor){
+    QueryWrapper<Logininfor> where = new QueryWrapper<>(logininfor);
+        return success(baseMapper.selectPage(page,where));
+    }
+
+    @Override
+    public AjaxResult add(Logininfor logininfor){
+        return success(baseMapper.insert(logininfor));
+    }
+
+    @Override
+    public AjaxResult delete(Long id){
+        return success(baseMapper.deleteById(id));
+    }
+
+    @Override
+    public AjaxResult updateData(Logininfor logininfor){
+        return success(baseMapper.updateById(logininfor));
+    }
+
+    @Override
+    public AjaxResult findById(Long id){
+        return success(baseMapper.selectById(id));
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/OperLogServiceImpl.java

@@ -0,0 +1,49 @@
+package com.xunmei.system.service.impl;
+
+import com.xunmei.system.domain.OperLog;
+import com.xunmei.system.mapper.OperLogMapper;
+import com.xunmei.system.service.IOperLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import static com.xunmei.common.core.web.domain.AjaxResult.success;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * <p>
+ * 操作日志记录 服务实现类
+ * </p>
+ *
+ * @author gaoxiong
+ * @since 2023-08-04
+ */
+@Service
+public class OperLogServiceImpl extends ServiceImpl<OperLogMapper, OperLog> implements IOperLogService {
+
+    @Override
+    public AjaxResult findListByPage(Page<OperLog> page,OperLog operLog){
+    QueryWrapper<OperLog> where = new QueryWrapper<>(operLog);
+        return success(baseMapper.selectPage(page,where));
+    }
+
+    @Override
+    public AjaxResult add(OperLog operLog){
+        return success(baseMapper.insert(operLog));
+    }
+
+    @Override
+    public AjaxResult delete(Long id){
+        return success(baseMapper.deleteById(id));
+    }
+
+    @Override
+    public AjaxResult updateData(OperLog operLog){
+        return success(baseMapper.updateById(operLog));
+    }
+
+    @Override
+    public AjaxResult findById(Long id){
+        return success(baseMapper.selectById(id));
+    }
+}

soc-modules/soc-modules-system/src/main/resources/mapper/system/LogininforMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.system.mapper.LogininforMapper">
+
+        <!-- 通用查询映射结果 -->
+        <resultMap id="BaseResultMap" type="com.xunmei.system.domain.Logininfor">
+                    <id column="info_id" property="infoId"/>
+                    <result column="user_name" property="userName"/>
+                    <result column="ipaddr" property="ipaddr"/>
+                    <result column="status" property="status"/>
+                    <result column="msg" property="msg"/>
+                    <result column="access_time" property="accessTime"/>
+        </resultMap>
+
+        <!-- 通用查询结果列 -->
+        <sql id="Base_Column_List">
+            info_id, user_name, ipaddr, status, msg, access_time
+        </sql>
+
+</mapper>

soc-modules/soc-modules-system/src/main/resources/mapper/system/OperLogMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xunmei.system.mapper.OperLogMapper">
+
+        <!-- 通用查询映射结果 -->
+        <resultMap id="BaseResultMap" type="com.xunmei.system.domain.OperLog">
+                    <id column="oper_id" property="operId"/>
+                    <result column="title" property="title"/>
+                    <result column="business_type" property="businessType"/>
+                    <result column="method" property="method"/>
+                    <result column="request_method" property="requestMethod"/>
+                    <result column="operator_type" property="operatorType"/>
+                    <result column="oper_name" property="operName"/>
+                    <result column="dept_name" property="deptName"/>
+                    <result column="oper_url" property="operUrl"/>
+                    <result column="oper_ip" property="operIp"/>
+                    <result column="oper_location" property="operLocation"/>
+                    <result column="oper_param" property="operParam"/>
+                    <result column="json_result" property="jsonResult"/>
+                    <result column="status" property="status"/>
+                    <result column="error_msg" property="errorMsg"/>
+                    <result column="oper_time" property="operTime"/>
+                    <result column="cost_time" property="costTime"/>
+        </resultMap>
+
+        <!-- 通用查询结果列 -->
+        <sql id="Base_Column_List">
+            oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time, cost_time
+        </sql>
+
+</mapper>