清理无效的import

doc-admin/src/main/java/com/doc/web/controller/common/CaptchaController.java

@@ -1,16 +1,5 @@
 package com.doc.web.controller.common;
 
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.FastByteArrayOutputStream;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.google.code.kaptcha.Producer;
 import com.doc.common.config.RuoYiConfig;
 import com.doc.common.constant.CacheConstants;
 import com.doc.common.constant.Constants;
@@ -19,6 +8,17 @@ import com.doc.common.core.redis.RedisCache;
 import com.doc.common.utils.sign.Base64;
 import com.doc.common.utils.uuid.IdUtils;
 import com.doc.system.service.ISysConfigService;
+import com.google.code.kaptcha.Producer;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 验证码操作处理

doc-admin/src/main/java/com/doc/web/controller/monitor/ServerController.java

@@ -1,11 +1,11 @@
 package com.doc.web.controller.monitor;
 
+import com.doc.common.core.domain.AjaxResult;
+import com.doc.framework.web.domain.Server;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.doc.common.core.domain.AjaxResult;
-import com.doc.framework.web.domain.Server;
 
 /**
  * 服务器监控

doc-admin/src/main/java/com/doc/web/controller/system/SysDeptController.java

@@ -1,16 +1,12 @@
 package com.doc.web.controller.system;
 
-import com.doc.biz.domain.DocSpace;
 import com.doc.biz.service.IDocSpaceService;
 import com.doc.common.annotation.Log;
 import com.doc.common.constant.UserConstants;
 import com.doc.common.core.controller.BaseController;
 import com.doc.common.core.domain.AjaxResult;
 import com.doc.common.core.domain.entity.SysDept;
-import com.doc.common.core.domain.entity.SysUser;
 import com.doc.common.enums.BusinessType;
-import com.doc.common.enums.SpaceType;
-import com.doc.common.utils.SecurityUtils;
 import com.doc.common.utils.StringUtils;
 import com.doc.system.service.ISysConfigService;
 import com.doc.system.service.ISysDeptService;
@@ -20,7 +16,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**

doc-admin/src/main/java/com/doc/web/controller/tool/TestController.java

@@ -1,28 +1,16 @@
 package com.doc.web.controller.tool;
 
+import com.doc.common.core.controller.BaseController;
+import com.doc.common.core.domain.R;
+import com.doc.common.utils.StringUtils;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.*;
+
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-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.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.doc.common.core.controller.BaseController;
-import com.doc.common.core.domain.R;
-import com.doc.common.utils.StringUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
-
 /**
  * swagger 用户测试方法
  *

doc-admin/src/main/java/com/doc/web/vo/UserVO.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * 用户树

doc-biz/src/main/java/com/doc/biz/controller/DocFavoriteController.java

@@ -10,7 +10,9 @@ import com.doc.common.core.domain.AjaxResult;
 import com.doc.common.core.page.TableDataInfo;
 import com.doc.common.enums.BusinessType;
 import com.doc.common.utils.poi.ExcelUtil;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

doc-biz/src/main/java/com/doc/biz/controller/DocMsgController.java

@@ -1,145 +0,0 @@
-package com.doc.biz.controller;
-
-import com.alibaba.fastjson2.JSON;
-import com.doc.biz.domain.DocMsg;
-import com.doc.biz.service.IDocMsgService;
-import com.doc.common.annotation.Log;
-import com.doc.common.constant.CacheConstants;
-import com.doc.common.core.controller.BaseController;
-import com.doc.common.core.domain.AjaxResult;
-import com.doc.common.core.page.TableDataInfo;
-import com.doc.common.enums.BusinessType;
-import com.doc.common.utils.SecurityUtils;
-import com.doc.common.utils.poi.ExcelUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 消息管理Controller
- *
- * @author wukai
- * @date 2023-08-15
- */
-@Api(tags = "消息管理")
-@RestController
-@RequestMapping("/biz/msg")
-@Slf4j
-public class DocMsgController extends BaseController {
-    @Resource
-    private IDocMsgService docMsgService;
-    @Resource
-    private StringRedisTemplate stringRedisTemplate;
-
-    /**
-     * 发送消息
-     *
-     * @param msg 消息记录
-     * @return
-     */
-    @ApiOperation("发送消息")
-    @PostMapping("/send")
-    public AjaxResult send(@RequestBody DocMsg msg) {
-        msg.setFromUid(SecurityUtils.getUserId());
-        if (msg.getFromUid().equals(msg.getToUid())) {
-            return error("不允许给自己发送消息");
-        }
-        msg.setCreateTime(new Date());
-        try {
-            stringRedisTemplate.convertAndSend(CacheConstants.CHANNEL, JSON.toJSONString(msg));
-            docMsgService.insertDocMsg(msg);
-        } catch (Exception e) {
-            return error(e.getMessage());
-        }
-        return success("消息发送成功");
-    }
-
-    /**
-     * 消息记录
-     *
-     * @param to 用户ID
-     * @return
-     */
-    @ApiOperation("消息记录")
-    @GetMapping("/record/{to}")
-    public TableDataInfo record(@PathVariable Long to) {
-        startPage();
-        List<DocMsg> list = docMsgService.selectRecordList(SecurityUtils.getUserId(), to);
-        return getDataTable(list);
-    }
-
-    /**
-     * 查询消息管理列表
-     */
-    @ApiOperation("查询消息管理列表")
-    //@PreAuthorize("@ss.hasPermi('biz:msg:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocMsg docMsg) {
-        startPage();
-        List<DocMsg> list = docMsgService.selectDocMsgList(docMsg);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出消息管理列表
-     */
-    @ApiOperation("导出消息管理列表")
-    //@PreAuthorize("@ss.hasPermi('biz:msg:export')")
-    @Log(title = "消息管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, DocMsg docMsg) {
-        List<DocMsg> list = docMsgService.selectDocMsgList(docMsg);
-        ExcelUtil<DocMsg> util = new ExcelUtil<DocMsg>(DocMsg.class);
-        util.exportExcel(response, list, "消息管理数据");
-    }
-
-    /**
-     * 获取消息管理详细信息
-     */
-    @ApiOperation("获取消息管理详细信息")
-    //@PreAuthorize("@ss.hasPermi('biz:msg:query')")
-    @GetMapping(value = "/{msgId}")
-    public AjaxResult getInfo(@PathVariable("msgId") Long msgId) {
-        return success(docMsgService.selectDocMsgByMsgId(msgId));
-    }
-
-    /**
-     * 新增消息管理
-     */
-    @ApiOperation("新增消息管理")
-    //@PreAuthorize("@ss.hasPermi('biz:msg:add')")
-    @Log(title = "消息管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocMsg docMsg) {
-        return toAjax(docMsgService.insertDocMsg(docMsg));
-    }
-
-    /**
-     * 修改消息管理
-     */
-    @ApiOperation("修改消息管理")
-    //@PreAuthorize("@ss.hasPermi('biz:msg:edit')")
-    @Log(title = "消息管理", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocMsg docMsg) {
-        return toAjax(docMsgService.updateDocMsg(docMsg));
-    }
-
-    /**
-     * 删除消息管理
-     */
-    @ApiOperation("删除消息管理")
-    //@PreAuthorize("@ss.hasPermi('biz:msg:remove')")
-    @Log(title = "消息管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{msgIds}")
-    public AjaxResult remove(@PathVariable Long[] msgIds) {
-        return toAjax(docMsgService.deleteDocMsgByMsgIds(msgIds));
-    }
-}

doc-biz/src/main/java/com/doc/biz/controller/DocSpaceController.java

@@ -7,7 +7,6 @@ import com.doc.common.core.controller.BaseController;
 import com.doc.common.core.domain.AjaxResult;
 import com.doc.common.core.page.TableDataInfo;
 import com.doc.common.enums.BusinessType;
-import com.doc.common.enums.SpaceType;
 import com.doc.common.utils.SecurityUtils;
 import com.doc.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
@@ -17,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.security.Security;
 import java.util.List;
 
 /**

doc-biz/src/main/java/com/doc/biz/controller/ElasticSearchController.java

@@ -8,7 +8,6 @@ import com.doc.biz.service.IDocInfoService;
 import com.doc.biz.service.IDocSpaceService;
 import com.doc.biz.service.IEsDocInfoService;
 import com.doc.common.config.EsConfig;
-import com.doc.common.core.domain.AjaxResult;
 import com.doc.common.enums.SpaceType;
 import com.doc.common.utils.SecurityUtils;
 import io.swagger.annotations.Api;
@@ -16,9 +15,10 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 import org.springframework.data.elasticsearch.core.SearchHit;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;

doc-biz/src/main/java/com/doc/biz/controller/FileUploadController.java

@@ -3,22 +3,16 @@ package com.doc.biz.controller;
 import com.alibaba.fastjson2.JSON;
 import com.doc.biz.domain.DocMsg;
 import com.doc.biz.service.IMongoService;
-import com.doc.biz.vo.DocumentVO;
 import com.doc.common.core.controller.BaseController;
 import com.doc.common.core.domain.AjaxResult;
 import com.doc.common.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.yaml.snakeyaml.util.UriEncoder;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 文件上传

doc-biz/src/main/java/com/doc/biz/domain/DocActor.java

@@ -1,12 +1,12 @@
 package com.doc.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文档协作对象 doc_actor

doc-biz/src/main/java/com/doc/biz/domain/DocDir.java

@@ -1,12 +1,12 @@
 package com.doc.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.TreeEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.TreeEntity;
 
 /**
  * 文档目录管理对象 doc_dir

doc-biz/src/main/java/com/doc/biz/domain/DocDirUser.java

@@ -1,12 +1,12 @@
 package com.doc.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 组织目录成员对象 doc_dir_user

doc-biz/src/main/java/com/doc/biz/domain/DocFavorite.java

@@ -2,14 +2,12 @@ package com.doc.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
-
-import java.util.List;
 
 /**
  * 文件收藏对象 doc_favorite

doc-biz/src/main/java/com/doc/biz/domain/DocFavoriteLabel.java

@@ -1,12 +1,12 @@
 package com.doc.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文件收藏标签对象 doc_favorite_label

doc-biz/src/main/java/com/doc/biz/domain/DocInfo.java

@@ -1,12 +1,11 @@
 package com.doc.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文件基本信息表对象 doc_info

doc-biz/src/main/java/com/doc/biz/domain/DocMsg.java

@@ -1,89 +0,0 @@
-package com.doc.biz.domain;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
-
-/**
- * 消息管理对象 doc_msg
- *
- * @author wukai
- * @date 2023-08-22
- */
-@ApiModel(value = "DocMsg", description = "消息管理")
-public class DocMsg extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 消息ID */
-    @ApiModelProperty("消息ID")
-    @TableId
-    private Long msgId;
-
-    /** 发送方用户ID */
-    @ApiModelProperty("发送方用户ID")
-    @Excel(name = "发送方用户ID")
-    private Long fromUid;
-
-    /** 接受方用户ID */
-    @ApiModelProperty("接受方用户ID")
-    @Excel(name = "接受方用户ID")
-    private Long toUid;
-
-    /** 消息内容 */
-    @ApiModelProperty("消息内容")
-    @Excel(name = "消息内容")
-    private String content;
-
-    public void setMsgId(Long msgId)
-    {
-        this.msgId = msgId;
-    }
-
-    public Long getMsgId()
-    {
-        return msgId;
-    }
-    public void setFromUid(Long fromUid)
-    {
-        this.fromUid = fromUid;
-    }
-
-    public Long getFromUid()
-    {
-        return fromUid;
-    }
-    public void setToUid(Long toUid)
-    {
-        this.toUid = toUid;
-    }
-
-    public Long getToUid()
-    {
-        return toUid;
-    }
-    public void setContent(String content)
-    {
-        this.content = content;
-    }
-
-    public String getContent()
-    {
-        return content;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("msgId", getMsgId())
-            .append("from", getFromUid())
-            .append("to", getToUid())
-            .append("content", getContent())
-            .append("createTime", getCreateTime())
-            .toString();
-    }
-}

doc-biz/src/main/java/com/doc/biz/domain/DocRecent.java

@@ -1,12 +1,11 @@
 package com.doc.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 最近文件对象 doc_recent

doc-biz/src/main/java/com/doc/biz/domain/DocShare.java

@@ -1,12 +1,12 @@
 package com.doc.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文档分享对象 doc_share

doc-biz/src/main/java/com/doc/biz/domain/DocSpace.java

@@ -1,14 +1,14 @@
 package com.doc.biz.domain;
 
-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
 
 /**
  * 文档空间管理对象 doc_space

doc-biz/src/main/java/com/doc/biz/domain/DocSpaceExpansion.java

@@ -1,14 +1,14 @@
 package com.doc.biz.domain;
 
-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
 
 /**
  * 空间扩容管理对象 doc_space_expansion

doc-biz/src/main/java/com/doc/biz/domain/DocTransfer.java

@@ -1,12 +1,11 @@
 package com.doc.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文件传输对象 doc_transfer

doc-biz/src/main/java/com/doc/biz/domain/DocVersion.java

@@ -1,12 +1,12 @@
 package com.doc.biz.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文档版本信息对象 doc_version

doc-biz/src/main/java/com/doc/biz/mapper/DocMsgMapper.java

@@ -1,72 +0,0 @@
-package com.doc.biz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.doc.biz.domain.DocMsg;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 消息管理Mapper接口
- *
- * @author wukai
- * @date 2023-08-15
- */
-public interface DocMsgMapper extends BaseMapper<DocMsg> {
-    /**
-     * 查询消息管理
-     *
-     * @param msgId 消息管理主键
-     * @return 消息管理
-     */
-    public DocMsg selectDocMsgByMsgId(Long msgId);
-
-    /**
-     * 查询消息管理列表
-     *
-     * @param docMsg 消息管理
-     * @return 消息管理集合
-     */
-    public List<DocMsg> selectDocMsgList(DocMsg docMsg);
-
-    /**
-     * 新增消息管理
-     *
-     * @param docMsg 消息管理
-     * @return 结果
-     */
-    public int insertDocMsg(DocMsg docMsg);
-
-    /**
-     * 修改消息管理
-     *
-     * @param docMsg 消息管理
-     * @return 结果
-     */
-    public int updateDocMsg(DocMsg docMsg);
-
-    /**
-     * 删除消息管理
-     *
-     * @param msgId 消息管理主键
-     * @return 结果
-     */
-    public int deleteDocMsgByMsgId(Long msgId);
-
-    /**
-     * 批量删除消息管理
-     *
-     * @param msgIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteDocMsgByMsgIds(Long[] msgIds);
-
-    /**
-     * 查询聊天记录
-     *
-     * @param from 当前用户ID
-     * @param to   对方用户ID
-     * @return
-     */
-    List<DocMsg> selectRecordList(@Param("from") Long from, @Param("to") Long to);
-}

doc-biz/src/main/java/com/doc/biz/service/IDocMsgService.java

@@ -1,70 +0,0 @@
-package com.doc.biz.service;
-
-import com.doc.biz.domain.DocMsg;
-
-import java.util.List;
-
-/**
- * 消息管理Service接口
- *
- * @author wukai
- * @date 2023-08-15
- */
-public interface IDocMsgService {
-    /**
-     * 查询消息管理
-     *
-     * @param msgId 消息管理主键
-     * @return 消息管理
-     */
-    public DocMsg selectDocMsgByMsgId(Long msgId);
-
-    /**
-     * 查询消息管理列表
-     *
-     * @param docMsg 消息管理
-     * @return 消息管理集合
-     */
-    public List<DocMsg> selectDocMsgList(DocMsg docMsg);
-
-    /**
-     * 新增消息管理
-     *
-     * @param docMsg 消息管理
-     * @return 结果
-     */
-    public int insertDocMsg(DocMsg docMsg);
-
-    /**
-     * 修改消息管理
-     *
-     * @param docMsg 消息管理
-     * @return 结果
-     */
-    public int updateDocMsg(DocMsg docMsg);
-
-    /**
-     * 批量删除消息管理
-     *
-     * @param msgIds 需要删除的消息管理主键集合
-     * @return 结果
-     */
-    public int deleteDocMsgByMsgIds(Long[] msgIds);
-
-    /**
-     * 删除消息管理信息
-     *
-     * @param msgId 消息管理主键
-     * @return 结果
-     */
-    public int deleteDocMsgByMsgId(Long msgId);
-
-    /**
-     * 查询聊天记录
-     *
-     * @param from 当前用户ID
-     * @param to     对方用户ID
-     * @return
-     */
-    List<DocMsg> selectRecordList(Long from, Long to);
-}

doc-biz/src/main/java/com/doc/biz/service/IEsDocInfoService.java

@@ -7,7 +7,6 @@ import org.springframework.data.elasticsearch.annotations.HighlightField;
 import org.springframework.data.elasticsearch.core.SearchHit;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
-import java.io.InputStream;
 import java.util.List;
 
 

doc-biz/src/main/java/com/doc/biz/service/impl/DocMsgServiceImpl.java

@@ -1,100 +0,0 @@
-package com.doc.biz.service.impl;
-
-import com.doc.biz.domain.DocMsg;
-import com.doc.biz.mapper.DocMsgMapper;
-import com.doc.biz.service.IDocMsgService;
-import com.doc.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 消息管理Service业务层处理
- *
- * @author wukai
- * @date 2023-08-15
- */
-@Service
-public class DocMsgServiceImpl implements IDocMsgService {
-    @Resource
-    private DocMsgMapper docMsgMapper;
-
-    /**
-     * 查询消息管理
-     *
-     * @param msgId 消息管理主键
-     * @return 消息管理
-     */
-    @Override
-    public DocMsg selectDocMsgByMsgId(Long msgId) {
-        return docMsgMapper.selectDocMsgByMsgId(msgId);
-    }
-
-    /**
-     * 查询消息管理列表
-     *
-     * @param docMsg 消息管理
-     * @return 消息管理
-     */
-    @Override
-    public List<DocMsg> selectDocMsgList(DocMsg docMsg) {
-        return docMsgMapper.selectDocMsgList(docMsg);
-    }
-
-    /**
-     * 新增消息管理
-     *
-     * @param docMsg 消息管理
-     * @return 结果
-     */
-    @Override
-    public int insertDocMsg(DocMsg docMsg) {
-        return docMsgMapper.insertDocMsg(docMsg);
-    }
-
-    /**
-     * 修改消息管理
-     *
-     * @param docMsg 消息管理
-     * @return 结果
-     */
-    @Override
-    public int updateDocMsg(DocMsg docMsg) {
-        return docMsgMapper.updateDocMsg(docMsg);
-    }
-
-    /**
-     * 批量删除消息管理
-     *
-     * @param msgIds 需要删除的消息管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDocMsgByMsgIds(Long[] msgIds) {
-        return docMsgMapper.deleteDocMsgByMsgIds(msgIds);
-    }
-
-    /**
-     * 删除消息管理信息
-     *
-     * @param msgId 消息管理主键
-     * @return 结果
-     */
-    @Override
-    public int deleteDocMsgByMsgId(Long msgId) {
-        return docMsgMapper.deleteDocMsgByMsgId(msgId);
-    }
-
-    /**
-     * 查询聊天记录
-     *
-     * @param from 当前用户ID
-     * @param to   对方用户ID
-     * @return
-     */
-    @Override
-    public List<DocMsg> selectRecordList(Long from, Long to) {
-        return docMsgMapper.selectRecordList(from, to);
-    }
-}

doc-biz/src/main/java/com/doc/biz/ws/ChatMessageListener.java

@@ -1,13 +1,10 @@
 package com.doc.biz.ws;
 
-import com.doc.biz.domain.DocMsg;
 import com.doc.chat.domain.ChatMsg;
 import com.doc.common.utils.StringUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.connection.MessageListener;
 import org.springframework.data.redis.core.RedisTemplate;

doc-biz/src/main/java/com/doc/chat/controller/ChatMsgController.java

@@ -1,35 +1,25 @@
 package com.doc.chat.controller;
 
-import java.util.Date;
-import java.util.List;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.fastjson2.JSON;
-import com.doc.biz.domain.DocMsg;
-import com.doc.common.constant.CacheConstants;
-import com.doc.common.constant.Constants;
-import com.doc.common.utils.SecurityUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.doc.chat.domain.ChatMsg;
+import com.doc.chat.service.IChatMsgService;
 import com.doc.common.annotation.Log;
+import com.doc.common.constant.CacheConstants;
 import com.doc.common.core.controller.BaseController;
 import com.doc.common.core.domain.AjaxResult;
+import com.doc.common.core.page.TableDataInfo;
 import com.doc.common.enums.BusinessType;
-import com.doc.chat.domain.ChatMsg;
-import com.doc.chat.service.IChatMsgService;
+import com.doc.common.utils.SecurityUtils;
 import com.doc.common.utils.poi.ExcelUtil;
-import com.doc.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 聊天消息管理Controller

doc-biz/src/main/java/com/doc/chat/domain/ChatMsg.java

@@ -3,12 +3,12 @@ package com.doc.chat.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.doc.biz.domain.DocInfo;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 import java.util.List;
 

doc-biz/src/main/java/com/doc/chat/mapper/ChatMsgMapper.java

@@ -1,10 +1,10 @@
 package com.doc.chat.mapper;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.doc.chat.domain.ChatMsg;
 
+import java.util.List;
+
 /**
  * 聊天消息管理;Mapper接口
  *

doc-biz/src/main/java/com/doc/chat/service/IChatMsgService.java

@@ -1,9 +1,9 @@
 package com.doc.chat.service;
 
-import java.util.List;
-
 import com.doc.chat.domain.ChatMsg;
 
+import java.util.List;
+
 /**
  * 聊天消息管理;Service接口
  *

doc-biz/src/main/java/com/doc/chat/service/impl/ChatMsgServiceImpl.java

@@ -1,17 +1,16 @@
 package com.doc.chat.service.impl;
 
-import java.util.List;
-import java.util.Map;
-
+import com.doc.chat.domain.ChatMsg;
+import com.doc.chat.mapper.ChatMsgMapper;
+import com.doc.chat.service.IChatMsgService;
 import com.doc.common.core.domain.entity.SysUser;
 import com.doc.common.utils.DateUtils;
 import com.doc.system.service.ISysUserService;
 import org.springframework.stereotype.Service;
-import com.doc.chat.mapper.ChatMsgMapper;
-import com.doc.chat.domain.ChatMsg;
-import com.doc.chat.service.IChatMsgService;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 聊天消息管理Service业务层处理

doc-biz/src/main/resources/mapper/biz/DocMsgMapper.xml

@@ -1,80 +0,0 @@
-<?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.doc.biz.mapper.DocMsgMapper">
-
-    <resultMap type="DocMsg" id="DocMsgResult">
-        <result property="msgId" column="MSG_ID"/>
-        <result property="fromUid" column="FROM_UID"/>
-        <result property="toUid" column="TO_UID"/>
-        <result property="content" column="CONTENT"/>
-        <result property="createTime" column="CREATE_TIME"/>
-    </resultMap>
-
-    <sql id="selectDocMsgVo">
-        select MSG_ID, FROM_UID, TO_UID, CONTENT, CREATE_TIME
-        from doc_msg
-    </sql>
-
-    <select id="selectDocMsgList" parameterType="DocMsg" resultMap="DocMsgResult">
-        <include refid="selectDocMsgVo"/>
-        <where>
-            <if test="fromUid != null ">and FROM = #{fromUid}</if>
-            <if test="toUid != null ">and TO = #{toUid}</if>
-            <if test="content != null  and content != ''">and CONTENT = #{content}</if>
-            <if test="createTime != null ">and CREATE_TIME = #{createTime}</if>
-        </where>
-    </select>
-
-    <select id="selectDocMsgByMsgId" parameterType="Long" resultMap="DocMsgResult">
-        <include refid="selectDocMsgVo"/>
-        where MSG_ID = #{msgId}
-    </select>
-    <select id="selectRecordList" resultType="com.doc.biz.domain.DocMsg">
-        <include refid="selectDocMsgVo"/>
-        where (FROM_UID = #{from} and TO_UID = #{to})
-        or (FROM_UID = #{to} and TO_UID = #{from})
-        order by CREATE_TIME desc
-    </select>
-
-    <insert id="insertDocMsg" parameterType="DocMsg" useGeneratedKeys="true" keyProperty="msgId">
-        insert into doc_msg
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="fromUid != null">FROM_UID,</if>
-            <if test="toUid != null">TO_UID,</if>
-            <if test="content != null">CONTENT,</if>
-            <if test="createTime != null">CREATE_TIME,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="fromUid != null">#{fromUid},</if>
-            <if test="toUid != null">#{toUid},</if>
-            <if test="content != null">#{content},</if>
-            <if test="createTime != null">#{createTime},</if>
-        </trim>
-    </insert>
-
-    <update id="updateDocMsg" parameterType="DocMsg">
-        update doc_msg
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="fromUid != null">FROM_UID = #{fromUid},</if>
-            <if test="toUid != null">TO_UID = #{toUid},</if>
-            <if test="content != null">CONTENT = #{content},</if>
-            <if test="createTime != null">CREATE_TIME = #{createTime},</if>
-        </trim>
-        where MSG_ID = #{msgId}
-    </update>
-
-    <delete id="deleteDocMsgByMsgId" parameterType="Long">
-        delete
-        from doc_msg
-        where MSG_ID = #{msgId}
-    </delete>
-
-    <delete id="deleteDocMsgByMsgIds" parameterType="String">
-        delete from doc_msg where MSG_ID in
-        <foreach item="msgId" collection="array" open="(" separator="," close=")">
-            #{msgId}
-        </foreach>
-    </delete>
-</mapper>

doc-common/src/main/java/com/doc/common/annotation/Anonymous.java

@@ -1,10 +1,6 @@
 package com.doc.common.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * 匿名访问不鉴权注解

doc-common/src/main/java/com/doc/common/annotation/DataScope.java

@@ -1,10 +1,6 @@
 package com.doc.common.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * 数据权限过滤注解

doc-common/src/main/java/com/doc/common/annotation/DataSource.java

@@ -1,13 +1,9 @@
 package com.doc.common.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import com.doc.common.enums.DataSourceType;
 
+import java.lang.annotation.*;
+
 /**
  * 自定义多数据源切换注解
  *

doc-common/src/main/java/com/doc/common/annotation/Excel.java

@@ -1,13 +1,14 @@
 package com.doc.common.annotation;
 
+import com.doc.common.utils.poi.ExcelHandlerAdapter;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.math.BigDecimal;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import com.doc.common.utils.poi.ExcelHandlerAdapter;
 
 /**
  * 自定义导出Excel数据注解

doc-common/src/main/java/com/doc/common/annotation/Log.java

@@ -1,13 +1,10 @@
 package com.doc.common.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import com.doc.common.enums.BusinessType;
 import com.doc.common.enums.OperatorType;
 
+import java.lang.annotation.*;
+
 /**
  * 自定义操作日志记录注解
  * 

doc-common/src/main/java/com/doc/common/annotation/RateLimiter.java

@@ -1,13 +1,10 @@
 package com.doc.common.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import com.doc.common.constant.CacheConstants;
 import com.doc.common.enums.LimitType;
 
+import java.lang.annotation.*;
+
 /**
  * 限流注解
  * 

doc-common/src/main/java/com/doc/common/annotation/RepeatSubmit.java

@@ -1,11 +1,6 @@
 package com.doc.common.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * 自定义注解防止表单重复提交

doc-common/src/main/java/com/doc/common/core/controller/BaseController.java

@@ -1,14 +1,5 @@
 package com.doc.common.core.controller;
 
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.doc.common.constant.HttpStatus;
 import com.doc.common.core.domain.AjaxResult;
 import com.doc.common.core.domain.model.LoginUser;
@@ -20,6 +11,16 @@ import com.doc.common.utils.PageUtils;
 import com.doc.common.utils.SecurityUtils;
 import com.doc.common.utils.StringUtils;
 import com.doc.common.utils.sql.SqlUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+
+import java.beans.PropertyEditorSupport;
+import java.util.Date;
+import java.util.List;
 
 /**
  * web层通用数据处理

doc-common/src/main/java/com/doc/common/core/domain/AjaxResult.java

@@ -1,10 +1,11 @@
 package com.doc.common.core.domain;
 
-import java.util.HashMap;
-import java.util.Objects;
 import com.doc.common.constant.HttpStatus;
 import com.doc.common.utils.StringUtils;
 
+import java.util.HashMap;
+import java.util.Objects;
+
 /**
  * 操作消息提醒
  * 

doc-common/src/main/java/com/doc/common/core/domain/BaseEntity.java

@@ -1,15 +1,15 @@
 package com.doc.common.core.domain;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Entity基类
  * 

doc-common/src/main/java/com/doc/common/core/domain/R.java

@@ -1,8 +1,9 @@
 package com.doc.common.core.domain;
 
-import java.io.Serializable;
 import com.doc.common.constant.HttpStatus;
 
+import java.io.Serializable;
+
 /**
  * 响应信息主体
  *

doc-common/src/main/java/com/doc/common/core/domain/TreeSelect.java

@@ -1,11 +1,12 @@
 package com.doc.common.core.domain;
 
+import com.doc.common.core.domain.entity.SysDept;
+import com.doc.common.core.domain.entity.SysMenu;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.doc.common.core.domain.entity.SysDept;
-import com.doc.common.core.domain.entity.SysMenu;
 
 /**
  * Treeselect树结构实体类

doc-common/src/main/java/com/doc/common/core/domain/entity/SysDept.java

@@ -1,14 +1,15 @@
 package com.doc.common.core.domain.entity;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.doc.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.core.domain.BaseEntity;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 部门表 sys_dept

doc-common/src/main/java/com/doc/common/core/domain/entity/SysDictData.java

@@ -1,13 +1,14 @@
 package com.doc.common.core.domain.entity;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.doc.common.annotation.Excel;
 import com.doc.common.annotation.Excel.ColumnType;
 import com.doc.common.constant.UserConstants;
 import com.doc.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 
 /**
  * 字典数据表 sys_dict_data

doc-common/src/main/java/com/doc/common/core/domain/entity/SysDictType.java

@@ -1,13 +1,14 @@
 package com.doc.common.core.domain.entity;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.doc.common.annotation.Excel;
 import com.doc.common.annotation.Excel.ColumnType;
 import com.doc.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 
 /**
  * 字典类型表 sys_dict_type

doc-common/src/main/java/com/doc/common/core/domain/entity/SysMenu.java

@@ -1,13 +1,14 @@
 package com.doc.common.core.domain.entity;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.doc.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.core.domain.BaseEntity;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 菜单权限表 sys_menu

doc-common/src/main/java/com/doc/common/core/domain/entity/SysRole.java

@@ -1,14 +1,15 @@
 package com.doc.common.core.domain.entity;
 
-import java.util.Set;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.doc.common.annotation.Excel;
 import com.doc.common.annotation.Excel.ColumnType;
 import com.doc.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Set;
 
 /**
  * 角色表 sys_role

doc-common/src/main/java/com/doc/common/core/domain/entity/SysUser.java

@@ -1,18 +1,20 @@
 package com.doc.common.core.domain.entity;
 
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-
 import com.baomidou.mybatisplus.annotation.TableField;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.doc.common.annotation.Excel;
 import com.doc.common.annotation.Excel.ColumnType;
 import com.doc.common.annotation.Excel.Type;
 import com.doc.common.annotation.Excels;
 import com.doc.common.core.domain.BaseEntity;
 import com.doc.common.xss.Xss;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 用户对象 sys_user

doc-common/src/main/java/com/doc/common/core/domain/model/LoginUser.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.annotation.JSONField;
 import com.doc.common.core.domain.entity.SysUser;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
+
 import java.util.Collection;
 import java.util.Set;
 

doc-common/src/main/java/com/doc/common/core/text/CharsetKit.java

@@ -1,8 +1,9 @@
 package com.doc.common.core.text;
 
+import com.doc.common.utils.StringUtils;
+
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import com.doc.common.utils.StringUtils;
 
 /**
  * 字符集工具类

doc-common/src/main/java/com/doc/common/core/text/Convert.java

@@ -1,13 +1,14 @@
 package com.doc.common.core.text;
 
+import com.doc.common.utils.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.text.NumberFormat;
 import java.util.Set;
-import com.doc.common.utils.StringUtils;
-import org.apache.commons.lang3.ArrayUtils;
 
 /**
  * 类型转换器

doc-common/src/main/java/com/doc/common/enums/HttpMethod.java

@@ -1,8 +1,9 @@
 package com.doc.common.enums;
 
+import org.springframework.lang.Nullable;
+
 import java.util.HashMap;
 import java.util.Map;
-import org.springframework.lang.Nullable;
 
 /**
  * 请求方式

doc-common/src/main/java/com/doc/common/filter/RepeatableFilter.java

@@ -1,15 +1,11 @@
 package com.doc.common.filter;
 
-import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.http.MediaType;
 import com.doc.common.utils.StringUtils;
+import org.springframework.http.MediaType;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 
 /**
  * Repeatable 过滤器

doc-common/src/main/java/com/doc/common/filter/RepeatedlyRequestWrapper.java

@@ -1,16 +1,17 @@
 package com.doc.common.filter;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import com.doc.common.constant.Constants;
+import com.doc.common.utils.http.HttpHelper;
+
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
-import com.doc.common.utils.http.HttpHelper;
-import com.doc.common.constant.Constants;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 
 /**
  * 构建可重复读取inputStream的request

doc-common/src/main/java/com/doc/common/filter/XssFilter.java

@@ -1,18 +1,14 @@
 package com.doc.common.filter;
 
+import com.doc.common.enums.HttpMethod;
+import com.doc.common.utils.StringUtils;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.doc.common.utils.StringUtils;
-import com.doc.common.enums.HttpMethod;
 
 /**
  * 防止XSS攻击的过滤器

doc-common/src/main/java/com/doc/common/filter/XssHttpServletRequestWrapper.java

@@ -1,16 +1,17 @@
 package com.doc.common.filter;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
+import com.doc.common.utils.StringUtils;
+import com.doc.common.utils.html.EscapeUtil;
+import org.apache.commons.io.IOUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.commons.io.IOUtils;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import com.doc.common.utils.StringUtils;
-import com.doc.common.utils.html.EscapeUtil;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 
 /**
  * XSS过滤处理

doc-common/src/main/java/com/doc/common/utils/DateUtils.java

@@ -1,15 +1,12 @@
 package com.doc.common.utils;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.util.Date;
-import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
  * 时间工具类

doc-common/src/main/java/com/doc/common/utils/DictUtils.java

@@ -1,13 +1,14 @@
 package com.doc.common.utils;
 
-import java.util.Collection;
-import java.util.List;
 import com.alibaba.fastjson2.JSONArray;
 import com.doc.common.constant.CacheConstants;
 import com.doc.common.core.domain.entity.SysDictData;
 import com.doc.common.core.redis.RedisCache;
 import com.doc.common.utils.spring.SpringUtils;
 
+import java.util.Collection;
+import java.util.List;
+
 /**
  * 字典工具类
  * 

doc-common/src/main/java/com/doc/common/utils/ExceptionUtil.java

@@ -1,8 +1,9 @@
 package com.doc.common.utils;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 
 /**
  * 错误信息处理类。

doc-common/src/main/java/com/doc/common/utils/FileContentUtils.java

@@ -4,9 +4,9 @@ import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.extractor.WordExtractor;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 

doc-common/src/main/java/com/doc/common/utils/MessageUtils.java

@@ -1,8 +1,8 @@
 package com.doc.common.utils;
 
+import com.doc.common.utils.spring.SpringUtils;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
-import com.doc.common.utils.spring.SpringUtils;
 
 /**
  * 获取i18n资源文件

doc-common/src/main/java/com/doc/common/utils/PageUtils.java

@@ -1,9 +1,9 @@
 package com.doc.common.utils;
 
-import com.github.pagehelper.PageHelper;
 import com.doc.common.core.page.PageDomain;
 import com.doc.common.core.page.TableSupport;
 import com.doc.common.utils.sql.SqlUtil;
+import com.github.pagehelper.PageHelper;
 
 /**
  * 分页工具类

doc-common/src/main/java/com/doc/common/utils/SecurityUtils.java

@@ -1,11 +1,11 @@
 package com.doc.common.utils;
 
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import com.doc.common.constant.HttpStatus;
 import com.doc.common.core.domain.model.LoginUser;
 import com.doc.common.exception.ServiceException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 /**
  * 安全服务工具类

doc-common/src/main/java/com/doc/common/utils/ServletUtils.java

@@ -1,5 +1,15 @@
 package com.doc.common.utils;
 
+import com.doc.common.constant.Constants;
+import com.doc.common.core.text.Convert;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -7,15 +17,6 @@ import java.net.URLEncoder;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import com.doc.common.constant.Constants;
-import com.doc.common.core.text.Convert;
 
 /**
  * 客户端工具类

doc-common/src/main/java/com/doc/common/utils/StringUtils.java

@@ -1,14 +1,10 @@
 package com.doc.common.utils;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.springframework.util.AntPathMatcher;
 import com.doc.common.constant.Constants;
 import com.doc.common.core.text.StrFormatter;
+import org.springframework.util.AntPathMatcher;
+
+import java.util.*;
 
 /**
  * 字符串工具类

doc-common/src/main/java/com/doc/common/utils/Threads.java

@@ -1,13 +1,10 @@
 package com.doc.common.utils;
 
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.*;
+
 /**
  * 线程相关工具类.
  * 

doc-common/src/main/java/com/doc/common/utils/bean/BeanValidators.java

@@ -1,9 +1,9 @@
 package com.doc.common.utils.bean;
 
-import java.util.Set;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.validation.Validator;
+import java.util.Set;
 
 /**
  * bean对象属性验证

doc-common/src/main/java/com/doc/common/utils/file/FileTypeUtils.java

@@ -1,8 +1,9 @@
 package com.doc.common.utils.file;
 
-import java.io.File;
 import org.apache.commons.lang3.StringUtils;
 
+import java.io.File;
+
 /**
  * 文件类型工具类
  *

doc-common/src/main/java/com/doc/common/utils/file/FileUploadUtils.java

@@ -1,11 +1,5 @@
 package com.doc.common.utils.file;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.Objects;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.web.multipart.MultipartFile;
 import com.doc.common.config.RuoYiConfig;
 import com.doc.common.constant.Constants;
 import com.doc.common.exception.file.FileNameLengthLimitExceededException;
@@ -14,6 +8,13 @@ import com.doc.common.exception.file.InvalidExtensionException;
 import com.doc.common.utils.DateUtils;
 import com.doc.common.utils.StringUtils;
 import com.doc.common.utils.uuid.Seq;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Objects;
 
 /**
  * 文件上传工具类

doc-common/src/main/java/com/doc/common/utils/file/FileUtils.java

@@ -1,23 +1,18 @@
 package com.doc.common.utils.file;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ArrayUtils;
 import com.doc.common.config.RuoYiConfig;
 import com.doc.common.utils.DateUtils;
 import com.doc.common.utils.StringUtils;
 import com.doc.common.utils.uuid.IdUtils;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 
 /**
  * 文件处理工具类

doc-common/src/main/java/com/doc/common/utils/file/ImageUtils.java

@@ -1,17 +1,18 @@
 package com.doc.common.utils.file;
 
+import com.doc.common.config.RuoYiConfig;
+import com.doc.common.constant.Constants;
+import com.doc.common.utils.StringUtils;
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Arrays;
-import org.apache.poi.util.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.doc.common.config.RuoYiConfig;
-import com.doc.common.constant.Constants;
-import com.doc.common.utils.StringUtils;
 
 /**
  * 图片处理工具类

doc-common/src/main/java/com/doc/common/utils/html/HTMLFilter.java

@@ -1,10 +1,6 @@
 package com.doc.common.utils.html;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Matcher;

doc-common/src/main/java/com/doc/common/utils/http/HttpHelper.java

@@ -1,14 +1,15 @@
 package com.doc.common.utils.http;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.ServletRequest;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import javax.servlet.ServletRequest;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * 通用http工具封装

doc-common/src/main/java/com/doc/common/utils/http/HttpUtils.java

@@ -1,26 +1,18 @@
 package com.doc.common.utils.http;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
+import com.doc.common.constant.Constants;
+import com.doc.common.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.*;
+import java.io.*;
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.X509Certificate;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.doc.common.constant.Constants;
-import com.doc.common.utils.StringUtils;
 
 /**
  * 通用http发送方法

doc-common/src/main/java/com/doc/common/utils/ip/AddressUtils.java

@@ -1,13 +1,13 @@
 package com.doc.common.utils.ip;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.doc.common.config.RuoYiConfig;
 import com.doc.common.constant.Constants;
 import com.doc.common.utils.StringUtils;
 import com.doc.common.utils.http.HttpUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 获取地址类

doc-common/src/main/java/com/doc/common/utils/ip/IpUtils.java

@@ -1,11 +1,12 @@
 package com.doc.common.utils.ip;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import javax.servlet.http.HttpServletRequest;
 import com.doc.common.utils.ServletUtils;
 import com.doc.common.utils.StringUtils;
 
+import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 /**
  * 获取IP方法
  * 

doc-common/src/main/java/com/doc/common/utils/poi/ExcelUtil.java

@@ -1,74 +1,5 @@
 package com.doc.common.utils.poi;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.RegExUtils;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFPicture;
-import org.apache.poi.hssf.usermodel.HSSFPictureData;
-import org.apache.poi.hssf.usermodel.HSSFShape;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ooxml.POIXMLDocumentPart;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.apache.poi.xssf.usermodel.XSSFDrawing;
-import org.apache.poi.xssf.usermodel.XSSFPicture;
-import org.apache.poi.xssf.usermodel.XSSFShape;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import com.doc.common.annotation.Excel;
 import com.doc.common.annotation.Excel.ColumnType;
 import com.doc.common.annotation.Excel.Type;
@@ -84,6 +15,32 @@ import com.doc.common.utils.file.FileTypeUtils;
 import com.doc.common.utils.file.FileUtils;
 import com.doc.common.utils.file.ImageUtils;
 import com.doc.common.utils.reflect.ReflectUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.RegExUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ooxml.POIXMLDocumentPart;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.*;
+import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Excel相关处理

doc-common/src/main/java/com/doc/common/utils/reflect/ReflectUtils.java

@@ -1,19 +1,15 @@
 package com.doc.common.utils.reflect;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Date;
+import com.doc.common.core.text.Convert;
+import com.doc.common.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.doc.common.core.text.Convert;
-import com.doc.common.utils.DateUtils;
+
+import java.lang.reflect.*;
+import java.util.Date;
 
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.

doc-common/src/main/java/com/doc/common/utils/sign/Md5Utils.java

@@ -1,14 +1,14 @@
 package com.doc.common.utils.sign;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Md5加密方法
  *

doc-common/src/main/java/com/doc/common/utils/spring/SpringUtils.java

@@ -1,5 +1,6 @@
 package com.doc.common.utils.spring;
 
+import com.doc.common.utils.StringUtils;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -8,7 +9,6 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
-import com.doc.common.utils.StringUtils;
 
 /**
  * spring工具类 方便在非spring管理环境中获取bean

doc-common/src/main/java/com/doc/common/utils/uuid/Seq.java

@@ -1,9 +1,10 @@
 package com.doc.common.utils.uuid;
 
-import java.util.concurrent.atomic.AtomicInteger;
 import com.doc.common.utils.DateUtils;
 import com.doc.common.utils.StringUtils;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * @author ruoyi 序列生成类
  */

doc-common/src/main/java/com/doc/common/utils/uuid/UUID.java

@@ -1,11 +1,12 @@
 package com.doc.common.utils.uuid;
 
+import com.doc.common.exception.UtilException;
+
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
-import com.doc.common.exception.UtilException;
 
 /**
  * 提供通用唯一识别码（universally unique identifier）（UUID）实现

doc-common/src/main/java/com/doc/common/xss/XssValidator.java

@@ -1,6 +1,7 @@
 package com.doc.common.xss;
 
 import com.doc.common.utils.StringUtils;
+
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 import java.util.regex.Matcher;

doc-framework/src/main/java/com/doc/framework/aspectj/DataScopeAspect.java

@@ -1,11 +1,5 @@
 package com.doc.framework.aspectj;
 
-import java.util.ArrayList;
-import java.util.List;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.springframework.stereotype.Component;
 import com.doc.common.annotation.DataScope;
 import com.doc.common.core.domain.BaseEntity;
 import com.doc.common.core.domain.entity.SysRole;
@@ -15,6 +9,13 @@ import com.doc.common.core.text.Convert;
 import com.doc.common.utils.SecurityUtils;
 import com.doc.common.utils.StringUtils;
 import com.doc.framework.security.context.PermissionContextHolder;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 数据过滤处理

doc-framework/src/main/java/com/doc/framework/aspectj/DataSourceAspect.java

@@ -1,6 +1,8 @@
 package com.doc.framework.aspectj;
 
-import java.util.Objects;
+import com.doc.common.annotation.DataSource;
+import com.doc.common.utils.StringUtils;
+import com.doc.framework.datasource.DynamicDataSourceContextHolder;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -11,9 +13,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-import com.doc.common.annotation.DataSource;
-import com.doc.common.utils.StringUtils;
-import com.doc.framework.datasource.DynamicDataSourceContextHolder;
+
+import java.util.Objects;
 
 /**
  * 多数据源处理

doc-framework/src/main/java/com/doc/framework/aspectj/LogAspect.java

@@ -1,21 +1,5 @@
 package com.doc.framework.aspectj;
 
-import java.util.Collection;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.NamedThreadLocal;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.multipart.MultipartFile;
 import com.alibaba.fastjson2.JSON;
 import com.doc.common.annotation.Log;
 import com.doc.common.core.domain.model.LoginUser;
@@ -29,6 +13,23 @@ import com.doc.common.utils.ip.IpUtils;
 import com.doc.framework.manager.AsyncManager;
 import com.doc.framework.manager.factory.AsyncFactory;
 import com.doc.system.domain.SysOperLog;
+import org.apache.commons.lang3.ArrayUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.NamedThreadLocal;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collection;
+import java.util.Map;
 
 /**
  * 操作日志记录处理

doc-framework/src/main/java/com/doc/framework/config/ApplicationConfig.java

@@ -1,12 +1,13 @@
 package com.doc.framework.config;
 
-import java.util.TimeZone;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
+import java.util.TimeZone;
+
 /**
  * 程序注解配置
  *

doc-framework/src/main/java/com/doc/framework/config/CaptchaConfig.java

@@ -1,10 +1,12 @@
 package com.doc.framework.config;
 
-import java.util.Properties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import com.google.code.kaptcha.impl.DefaultKaptcha;
 import com.google.code.kaptcha.util.Config;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+
 import static com.google.code.kaptcha.Constants.*;
 
 /**

doc-framework/src/main/java/com/doc/framework/config/DruidConfig.java

@@ -1,20 +1,5 @@
 package com.doc.framework.config;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.sql.DataSource;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
@@ -23,6 +8,18 @@ import com.doc.common.enums.DataSourceType;
 import com.doc.common.utils.spring.SpringUtils;
 import com.doc.framework.config.properties.DruidProperties;
 import com.doc.framework.datasource.DynamicDataSource;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import javax.servlet.*;
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * druid 配置多数据源

doc-framework/src/main/java/com/doc/framework/config/FastJson2JsonRedisSerializer.java

@@ -1,11 +1,12 @@
 package com.doc.framework.config;
 
-import java.nio.charset.Charset;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.SerializationException;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONReader;
 import com.alibaba.fastjson2.JSONWriter;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.SerializationException;
+
+import java.nio.charset.Charset;
 
 /**
  * Redis使用FastJson序列化

doc-framework/src/main/java/com/doc/framework/config/FilterConfig.java

@@ -1,16 +1,17 @@
 package com.doc.framework.config;
 
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.DispatcherType;
+import com.doc.common.filter.RepeatableFilter;
+import com.doc.common.filter.XssFilter;
+import com.doc.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.doc.common.filter.RepeatableFilter;
-import com.doc.common.filter.XssFilter;
-import com.doc.common.utils.StringUtils;
+
+import javax.servlet.DispatcherType;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Filter配置

doc-framework/src/main/java/com/doc/framework/config/KaptchaTextCreator.java

@@ -1,8 +1,9 @@
 package com.doc.framework.config;
 
-import java.util.Random;
 import com.google.code.kaptcha.text.impl.DefaultTextCreator;
 
+import java.util.Random;
+
 /**
  * 验证码文本生成器
  *

doc-framework/src/main/java/com/doc/framework/config/ServerConfig.java

@@ -1,8 +1,9 @@
 package com.doc.framework.config;
 
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.stereotype.Component;
 import com.doc.common.utils.ServletUtils;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * 服务相关配置

doc-framework/src/main/java/com/doc/framework/config/ThreadPoolConfig.java

@@ -5,6 +5,7 @@ import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadPoolExecutor;

doc-framework/src/main/java/com/doc/framework/config/properties/DruidProperties.java

@@ -1,8 +1,8 @@
 package com.doc.framework.config.properties;
 
+import com.alibaba.druid.pool.DruidDataSource;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
-import com.alibaba.druid.pool.DruidDataSource;
 
 /**
  * druid 配置属性

doc-framework/src/main/java/com/doc/framework/config/properties/PermitAllUrlProperties.java

@@ -1,11 +1,6 @@
 package com.doc.framework.config.properties;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Pattern;
+import com.doc.common.annotation.Anonymous;
 import org.apache.commons.lang3.RegExUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
@@ -16,7 +11,9 @@ import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
-import com.doc.common.annotation.Anonymous;
+
+import java.util.*;
+import java.util.regex.Pattern;
 
 /**
  * 设置Anonymous注解允许匿名访问的url