【优化】全局代码格式化，优化导包

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/cache/CacheOperator.java

@@ -40,7 +40,7 @@ public interface CacheOperator<T> {
    /**
     * 添加缓存
     *
     * @param key 键
     * @param key   键
     * @param value 值
     * @author stylefeng
     * @date 2020/7/8 22:06
@@ -50,8 +50,8 @@ public interface CacheOperator<T> {
    /**
     * 添加缓存（带过期时间，单位是秒）
     *
     * @param key 键
     * @param value 值
     * @param key            键
     * @param value          值
     * @param timeoutSeconds 过期时间，单位秒
     * @author stylefeng
     * @date 2020/7/8 22:07

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/exception/enums/abs/AbstractBaseExceptionEnum.java

@@ -1,4 +1,3 @@
/*
Copyright [2020] [https://www.stylefeng.cn]
@@ -50,5 +49,5 @@ public interface AbstractBaseExceptionEnum {
     * @date 2020/7/9 14:28
     */
    String getMessage();
    
}

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/pojo/base/node/BaseTreeNode.java

@@ -54,7 +54,7 @@ public interface BaseTreeNode {
    Long getPid();
    /**
     *  设置children
     * 设置children
     *
     * @param children 子节点集合
     * @author xuyuxiang

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/pojo/base/param/BaseParam.java

@@ -68,186 +68,223 @@ public class BaseParam implements Serializable {
    /**
     * 参数校验分组：分页
     */
    public @interface page {}
    public @interface page {
    }
    /**
     * 参数校验分组：列表
     */
    public @interface list {}
    public @interface list {
    }
    /**
     * 参数校验分组：下拉
     */
    public @interface dropDown {}
    public @interface dropDown {
    }
    /**
     * 参数校验分组：增加
     */
    public @interface add {}
    public @interface add {
    }
    /**
     * 参数校验分组：编辑
     */
    public @interface edit {}
    public @interface edit {
    }
    /**
     * 参数校验分组：更新信息
     */
    public @interface updateInfo {}
    public @interface updateInfo {
    }
    /**
     * 参数校验分组：修改密码
     */
    public @interface updatePwd {}
    public @interface updatePwd {
    }
    /**
     * 参数校验分组：重置密码
     */
    public @interface resetPwd {}
    public @interface resetPwd {
    }
    /**
     * 参数校验分组：修改头像
     */
    public @interface updateAvatar{}
    public @interface updateAvatar {
    }
    /**
     * 参数校验分组：删除
     */
    public @interface delete {}
    public @interface delete {
    }
    /**
     * 参数校验分组：详情
     */
    public @interface detail {}
    public @interface detail {
    }
    /**
     * 参数校验分组：授权角色
     */
    public @interface grantRole {}
    public @interface grantRole {
    }
    /**
     * 参数校验分组：授权菜单
     */
    public @interface grantMenu {}
    public @interface grantMenu {
    }
    /**
     * 参数校验分组：授权数据
     */
    public @interface grantData {}
    public @interface grantData {
    }
    /**
     * 参数校验分组：强退
     */
    public @interface force {}
    public @interface force {
    }
    /**
     * 参数校验分组：停用
     */
    public @interface stop {}
    public @interface stop {
    }
    /**
     * 参数校验分组：启用
     */
    public @interface start {}
    public @interface start {
    }
    /**
     * 参数校验分组：部署
     */
    public @interface deploy {}
    public @interface deploy {
    }
    /**
     * 参数校验分组：挂起
     */
    public @interface suspend {}
    public @interface suspend {
    }
    /**
     * 参数校验分组：激活
     */
    public @interface active {}
    public @interface active {
    }
    /**
     * 参数校验分组：调试
     */
    public @interface debug {}
    public @interface debug {
    }
    /**
     * 参数校验分组：委托
     */
    public @interface entrust {}
    public @interface entrust {
    }
    /**
     * 参数校验分组：转办
     */
    public @interface turn {}
    public @interface turn {
    }
    /**
     * 参数校验分组：追踪
     */
    public @interface trace {}
    public @interface trace {
    }
    /**
     * 参数校验分组：跳转
     */
    public @interface jump {}
    public @interface jump {
    }
    /**
     * 参数校验分组：同意
     */
    public @interface agree {}
    public @interface agree {
    }
    /**
     * 参数校验分组：退回
     */
    public @interface back {}
    public @interface back {
    }
    /**
     * 参数校验分组：终止
     */
    public @interface end {}
    public @interface end {
    }
    /**
     * 参数校验分组：导出
     */
    public @interface export {}
    public @interface export {
    }
    /**
     * 参数校验分组：映射
     */
    public @interface mapping {}
    public @interface mapping {
    }
    /**
     * 参数校验分组：切换
     */
    public @interface change {}
    public @interface change {
    }
    /**
     * 参数校验分组：历史审批记录
     */
    public @interface commentHistory {}
    public @interface commentHistory {
    }
    /**
     * 参数校验分组：修改状态
     */
    public @interface changeStatus {}
    public @interface changeStatus {
    }
    /**
     * 参数校验分组：传阅
     */
    public @interface circulate {}
    public @interface circulate {
    }
    /**
     * 参数校验分组：加签
     */
    public @interface addSign {}
    public @interface addSign {
    }
    /**
     * 参数校验分组：减签
     */
    public @interface deleteSign {}
    public @interface deleteSign {
    }
    /**
     * 参数校验分组：添加节点
     */
    public @interface addNode {}
    public @interface addNode {
    }
}

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/pojo/node/LoginMenuTreeNode.java

@@ -79,7 +79,7 @@ public class LoginMenuTreeNode {
     * 路由元信息内部类
     */
    @Data
    public class Meta{
    public class Meta {
        /**
         * 路由标题, 用于显示面包屑, 页面标题 *推荐设置

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/pojo/page/PageResult.java

@@ -28,6 +28,7 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.PageUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;
import java.io.Serializable;
import java.util.List;

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/pojo/response/ResponseData.java

@@ -23,6 +23,7 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
 */
package cn.stylefeng.guns.core.pojo.response;
import lombok.Data;
/**

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/util/PoiUtil.java

@@ -57,12 +57,11 @@ public class PoiUtil {
    /**
     * 使用流的方式导出excel
     *
     * @author xuyuxiang
     * @date 2020/7/1 10:00
     *
     * @param excelName 要导出的文件名称，如GunsUsers.xls
     * @param pojoClass Excel实体类
     * @param data 要导出的数据集合
     * @param data      要导出的数据集合
     * @author xuyuxiang
     * @date 2020/7/1 10:00
     */
    public static void exportExcelWithStream(String excelName, Class<?> pojoClass, Collection<?> data) {
        try {
@@ -83,12 +82,11 @@ public class PoiUtil {
    /**
     * 使用文件的方式导出excel
     *
     * @param filePath  文件路径，如 d:/demo/demo.xls
     * @param pojoClass Excel实体类
     * @param data      要导出的数据集合
     * @author xuyuxiang
     * @date 2020/7/1 9:58
     *
     * @param filePath 文件路径，如 d:/demo/demo.xls
     * @param pojoClass Excel实体类
     * @param data 要导出的数据集合
     */
    public static void exportExcelWithFile(String filePath, Class pojoClass, Collection data) {
@@ -109,13 +107,12 @@ public class PoiUtil {
    /**
     * 根据文件路径来导入Excel
     *
     * @param filePath   文件路径
     * @param titleRows  表标题的行数
     * @param headerRows 表头行数
     * @param pojoClass  Excel实体类
     * @author xuyuxiang
     * @date 2020/7/1 9:58
     *
     * @param filePath 文件路径
     * @param titleRows 表标题的行数
     * @param headerRows 表头行数
     * @param pojoClass Excel实体类
     */
    public static <T> List<T> importExcel(String filePath, Integer titleRows, Integer headerRows, Class<T> pojoClass) {
        //判断文件是否存在
@@ -133,20 +130,19 @@ public class PoiUtil {
        }
        return list;
    }
    /**
     * 根据接收的Excel文件来导入Excel,并封装成实体类
     *
     * @param file       上传的文件
     * @param titleRows  表标题的行数
     * @param headerRows 表头行数
     * @param pojoClass  Excel实体类
     * @author xuyuxiang
     * @date 2020/7/1 9:57
     *
     * @param file 上传的文件
     * @param titleRows 表标题的行数
     * @param headerRows 表头行数
     * @param pojoClass Excel实体类
     *
     */
    public static <T> List<T> importExcel(MultipartFile file, Integer titleRows, Integer headerRows, Class<T> pojoClass) {
        if(ObjectUtil.isNull(file)) {
        if (ObjectUtil.isNull(file)) {
            return null;
        }
        ImportParams params = new ImportParams();

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/util/UaUtil.java

@@ -84,9 +84,9 @@ public class UaUtil {
        String userAgentStr = ServletUtil.getHeaderIgnoreCase(request, CommonConstant.USER_AGENT);
        UserAgent userAgent = UserAgentUtil.parse(userAgentStr);
        //判空
        if(ObjectUtil.isNotEmpty(userAgentStr)) {
        if (ObjectUtil.isNotEmpty(userAgentStr)) {
            //如果根本没获取到浏览器
            if(CommonConstant.UNKNOWN.equals(userAgent.getBrowser().getName())) {
            if (CommonConstant.UNKNOWN.equals(userAgent.getBrowser().getName())) {
                //则将ua设置为浏览器
                userAgent.setBrowser(new Browser(userAgentStr, null, ""));
            }

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/enums/AdminTypeEnum.java

@@ -38,7 +38,7 @@ public enum AdminTypeEnum {
    /**
     * 超级管理员
     */
    SUPER_ADMIN(1,"超级管理员"),
    SUPER_ADMIN(1, "超级管理员"),
    /**
     * 非管理员

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/enums/DataScopeTypeEnum.java

@@ -38,12 +38,12 @@ public enum DataScopeTypeEnum {
    /**
     * 全部数据
     */
    ALL(1,"全部数据"),
    ALL(1, "全部数据"),
    /**
     * 本部门及以下数据
     */
    DEPT_WITH_CHILD(2,"本部门及以下数据"),
    DEPT_WITH_CHILD(2, "本部门及以下数据"),
    /**
     * 本部门数据

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/enums/LogSuccessStatusEnum.java

@@ -38,12 +38,12 @@ public enum LogSuccessStatusEnum {
    /**
     * 失败
     */
    FAIL("N","失败"),
    FAIL("N", "失败"),
    /**
     * 成功
     */
    SUCCESS("Y","成功");
    SUCCESS("Y", "成功");
    private final String code;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/enums/MenuOpenTypeEnum.java

@@ -38,22 +38,22 @@ public enum MenuOpenTypeEnum {
    /**
     * 无
     */
    NONE(0,"无"),
    NONE(0, "无"),
    /**
     * 组件
     */
    COMPONENT(1,"组件"),
    COMPONENT(1, "组件"),
    /**
     * 内链
     */
    INNER(2,"内链"),
    INNER(2, "内链"),
    /**
     * 外链
     */
    OUTER(3,"外链");
    OUTER(3, "外链");
    private final Integer code;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/enums/MenuTypeEnum.java

@@ -38,17 +38,17 @@ public enum MenuTypeEnum {
    /**
     * 目录
     */
    DIR(0,"目录"),
    DIR(0, "目录"),
    /**
     * 菜单
     */
    MENU(1,"菜单"),
    MENU(1, "菜单"),
    /**
     * 按钮
     */
    BTN(2,"按钮");
    BTN(2, "按钮");
    private final Integer code;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/enums/MenuWeightEnum.java

@@ -38,7 +38,7 @@ public enum MenuWeightEnum {
    /**
     * 系统权重
     */
    SUPER_ADMIN_WEIGHT(1,"系统权重"),
    SUPER_ADMIN_WEIGHT(1, "系统权重"),
    /**
     * 业务权重

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/jwt/JwtTokenUtil.java

@@ -52,12 +52,12 @@ public class JwtTokenUtil {
        DateTime expirationDate = DateUtil.offsetMillisecond(new Date(),
                Convert.toInt(ConstantContextHolder.getTokenExpireSec()) * 1000);
        return Jwts.builder()
                    .setClaims(BeanUtil.beanToMap(jwtPayLoad))
                    .setSubject(jwtPayLoad.getUserId().toString())
                    .setIssuedAt(new Date())
                    .setExpiration(expirationDate)
                    .signWith(SignatureAlgorithm.HS512, ConstantContextHolder.getJwtSecret())
                    .compact();
                .setClaims(BeanUtil.beanToMap(jwtPayLoad))
                .setSubject(jwtPayLoad.getUserId().toString())
                .setIssuedAt(new Date())
                .setExpiration(expirationDate)
                .signWith(SignatureAlgorithm.HS512, ConstantContextHolder.getJwtSecret())
                .compact();
    }
    /**
@@ -94,7 +94,7 @@ public class JwtTokenUtil {
        try {
            getClaimsFromToken(token);
            return true;
        }catch (JwtException jwtException) {
        } catch (JwtException jwtException) {
            return false;
        }
    }

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/log/factory/LogFactory.java

@@ -27,9 +27,9 @@ package cn.stylefeng.guns.sys.core.log.factory;
import cn.hutool.core.date.DateTime;
import cn.stylefeng.guns.core.annotion.BusinessLog;
import cn.stylefeng.guns.core.consts.SymbolConstant;
import cn.stylefeng.guns.core.util.JoinPointUtil;
import cn.stylefeng.guns.sys.core.enums.LogSuccessStatusEnum;
import cn.stylefeng.guns.sys.core.enums.VisLogTypeEnum;
import cn.stylefeng.guns.core.util.JoinPointUtil;
import cn.stylefeng.guns.sys.modular.log.entity.SysOpLog;
import cn.stylefeng.guns.sys.modular.log.entity.SysVisLog;
import org.aspectj.lang.JoinPoint;
@@ -58,10 +58,10 @@ public class LogFactory {
        sysVisLog.setVisTime(DateTime.now());
        sysVisLog.setAccount(account);
        if(LogSuccessStatusEnum.SUCCESS.getCode().equals(successCode)){
        if (LogSuccessStatusEnum.SUCCESS.getCode().equals(successCode)) {
            sysVisLog.setMessage(VisLogTypeEnum.LOGIN.getMessage() + LogSuccessStatusEnum.SUCCESS.getMessage());
        }
        if(LogSuccessStatusEnum.FAIL.getCode().equals(successCode)){
        if (LogSuccessStatusEnum.FAIL.getCode().equals(successCode)) {
            sysVisLog.setMessage(VisLogTypeEnum.LOGIN.getMessage() +
                    LogSuccessStatusEnum.FAIL.getMessage() + SymbolConstant.COLON + failMessage);
        }

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/app/enums/SysAppExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.app.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/app/service/SysAppService.java

@@ -110,7 +110,7 @@ public interface SysAppService extends IService<SysApp> {
    /**
     * 设为默认应用
     *
     * @param sysAppParam  设为默认应用参数
     * @param sysAppParam 设为默认应用参数
     * @author xuyuxiang
     * @date 2020/6/29 16:49
     */

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/auth/context/LoginContextSpringSecurityImpl.java

@@ -30,11 +30,11 @@ import cn.hutool.core.util.StrUtil;
import cn.stylefeng.guns.core.consts.CommonConstant;
import cn.stylefeng.guns.core.consts.SymbolConstant;
import cn.stylefeng.guns.core.context.login.LoginContext;
import cn.stylefeng.guns.sys.core.enums.AdminTypeEnum;
import cn.stylefeng.guns.core.exception.AuthException;
import cn.stylefeng.guns.core.exception.enums.AuthExceptionEnum;
import cn.stylefeng.guns.core.pojo.login.LoginEmpInfo;
import cn.stylefeng.guns.core.pojo.login.SysLoginUser;
import cn.stylefeng.guns.sys.core.enums.AdminTypeEnum;
import cn.stylefeng.guns.sys.modular.auth.service.AuthService;
import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.core.Authentication;
@@ -56,7 +56,7 @@ public class LoginContextSpringSecurityImpl implements LoginContext {
    @Resource
    private AuthService authService;
    private LoginContextSpringSecurityImpl(){
    private LoginContextSpringSecurityImpl() {
    }
@@ -151,7 +151,7 @@ public class LoginContextSpringSecurityImpl implements LoginContext {
        List<String> loginUserRoleCodeList = this.getLoginUserRoleCodeList();
        String[] roleCodeArr = StrUtil.split(roleCodes, SymbolConstant.COMMA);
        for (String roleCode : roleCodeArr) {
            if(loginUserRoleCodeList.contains(roleCode)) {
            if (loginUserRoleCodeList.contains(roleCode)) {
                flag = true;
                break;
            }
@@ -183,7 +183,7 @@ public class LoginContextSpringSecurityImpl implements LoginContext {
        List<String> loginUserRoleCodeList = this.getLoginUserRoleCodeList();
        String[] roleCodeArr = StrUtil.split(roleCodes, SymbolConstant.COMMA);
        for (String roleCode : roleCodeArr) {
            if(!loginUserRoleCodeList.contains(roleCode)) {
            if (!loginUserRoleCodeList.contains(roleCode)) {
                flag = false;
                break;
            }
@@ -200,7 +200,7 @@ public class LoginContextSpringSecurityImpl implements LoginContext {
    private boolean isAdmin(Integer adminTypeCode) {
        Integer adminType = this.getSysLoginUser().getAdminType();
        boolean flag = false;
        if(adminType.equals(adminTypeCode)) {
        if (adminType.equals(adminTypeCode)) {
            flag = true;
        }
        return flag;
@@ -226,8 +226,8 @@ public class LoginContextSpringSecurityImpl implements LoginContext {
    @Override
    public Long getSysLoginUserOrgId() {
        LoginEmpInfo loginEmpInfo = this.getSysLoginUser().getLoginEmpInfo();
        if(ObjectUtil.isNotNull(loginEmpInfo)) {
            if(ObjectUtil.isNotEmpty(loginEmpInfo.getOrgId())) {
        if (ObjectUtil.isNotNull(loginEmpInfo)) {
            if (ObjectUtil.isNotEmpty(loginEmpInfo.getOrgId())) {
                return loginEmpInfo.getOrgId();
            }
        }
@@ -256,6 +256,6 @@ public class LoginContextSpringSecurityImpl implements LoginContext {
    private List<String> getLoginUserRoleCodeList() {
        List<String> roleCodeList = CollectionUtil.newArrayList();
        this.getSysLoginUser().getRoles().forEach(dict -> roleCodeList.add(dict.getStr(CommonConstant.CODE)));
       return roleCodeList;
        return roleCodeList;
    }
}

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/consts/enums/SysConfigExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.consts.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/dict/enums/SysDictDataExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.dict.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/dict/enums/SysDictTypeExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.dict.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/dict/service/impl/SysDictTypeServiceImpl.java

@@ -65,7 +65,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
        //构造条件
        LambdaQueryWrapper<SysDictType> queryWrapper = new LambdaQueryWrapper<>();
        if(ObjectUtil.isNotNull(sysDictTypeParam)) {
        if (ObjectUtil.isNotNull(sysDictTypeParam)) {
            //根据字典类型名称模糊查询
            if (ObjectUtil.isNotEmpty(sysDictTypeParam.getName())) {
                queryWrapper.like(SysDictType::getName, sysDictTypeParam.getName());
@@ -102,7 +102,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
        LambdaQueryWrapper<SysDictType> queryWrapper = new LambdaQueryWrapper<SysDictType>()
                .eq(SysDictType::getCode, sysDictTypeParam.getCode());
        SysDictType sysDictType=this.getOne(queryWrapper);
        SysDictType sysDictType = this.getOne(queryWrapper);
        if (ObjectUtil.isNull(sysDictType)) {
            throw new ServiceException(SysDictTypeExceptionEnum.DICT_TYPE_NOT_EXIST);
        }

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/email/controler/EmailController.java

@@ -59,24 +59,24 @@ public class EmailController {
    /**
     * 发送邮件
     *
     * @author stylefeng,xuyuxiang
     * @author stylefeng, xuyuxiang
     * @date 2020/6/9 23:02
     */
    @PostMapping("/email/sendEmail")
    @BusinessLog(title = "发送邮件", opType = LogAnnotionOpTypeEnum.OTHER)
    public ResponseData sendEmail(@RequestBody SendMailParam sendMailParam) {
        String to = sendMailParam.getTo();
        if(ObjectUtil.isEmpty(to)) {
        if (ObjectUtil.isEmpty(to)) {
            throw new ServiceException(SysEmailExceptionEnum.EMAIL_TO_EMPTY);
        }
        String title = sendMailParam.getTitle();
        if(ObjectUtil.isEmpty(title)) {
        if (ObjectUtil.isEmpty(title)) {
            throw new ServiceException(SysEmailExceptionEnum.EMAIL_TITLE_EMPTY);
        }
        String content = sendMailParam.getContent();
        if(ObjectUtil.isEmpty(content)) {
        if (ObjectUtil.isEmpty(content)) {
            throw new ServiceException(SysEmailExceptionEnum.EMAIL_CONTENT_EMPTY);
        }
        try {
@@ -91,24 +91,24 @@ public class EmailController {
    /**
     * 发送邮件(html)
     *
     * @author stylefeng,xuyuxiang
     * @author stylefeng, xuyuxiang
     * @date 2020/6/9 23:02
     */
    @PostMapping("/email/sendEmailHtml")
    @BusinessLog(title = "发送邮件", opType = LogAnnotionOpTypeEnum.OTHER)
    public ResponseData sendEmailHtml(@RequestBody SendMailParam sendMailParam) {
        String to = sendMailParam.getTo();
        if(ObjectUtil.isEmpty(to)) {
        if (ObjectUtil.isEmpty(to)) {
            throw new ServiceException(SysEmailExceptionEnum.EMAIL_TO_EMPTY);
        }
        String title = sendMailParam.getTitle();
        if(ObjectUtil.isEmpty(title)) {
        if (ObjectUtil.isEmpty(title)) {
            throw new ServiceException(SysEmailExceptionEnum.EMAIL_TITLE_EMPTY);
        }
        String content = sendMailParam.getContent();
        if(ObjectUtil.isEmpty(content)) {
        if (ObjectUtil.isEmpty(content)) {
            throw new ServiceException(SysEmailExceptionEnum.EMAIL_CONTENT_EMPTY);
        }
        try {

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/email/enums/SysEmailExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.email.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/emp/service/SysEmpExtOrgPosService.java

@@ -41,7 +41,7 @@ public interface SysEmpExtOrgPosService extends IService<SysEmpExtOrgPos> {
    /**
     * 保存或编辑附属机构相关信息
     *
     * @param empId 员工id（用户id）
     * @param empId     员工id（用户id）
     * @param extIdList 附属机构职位信息集合，格式：[{"orgId":1234, "posId":5678}]
     * @author xuyuxiang
     * @date 2020/4/2 8:59
@@ -51,14 +51,14 @@ public interface SysEmpExtOrgPosService extends IService<SysEmpExtOrgPos> {
    /**
     * 获取附属机构和职位信息
     *
     * @param empId 员工id（用户id）
     * @param empId    员工id（用户id）
     * @param isFillId 是否需要返回id信息
     * @return 增强版hashMap，格式：[{"orgId":123, "orgCode":"yfb", "orgName":"研发部", "posId":456, "posCode":"zjl", "posName":"总经理"}]
     * @author xuyuxiang
     * @date 2020/4/2 20:07
     */
    List<Dict> getEmpExtOrgPosDictList(Long empId, boolean isFillId);
    
    /**
     * 根据机构id判断该附属机构下是否有员工
     *

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/emp/service/SysEmpPosService.java

@@ -41,7 +41,7 @@ public interface SysEmpPosService extends IService<SysEmpPos> {
    /**
     * 保存职位相关信息
     *
     * @param empId 员工id（用户id）
     * @param empId     员工id（用户id）
     * @param posIdList 职位id集合
     * @author xuyuxiang
     * @date 2020/4/2 9:00
@@ -51,7 +51,7 @@ public interface SysEmpPosService extends IService<SysEmpPos> {
    /**
     * 获取所属职位信息
     *
     * @param empId 员工id（用户id）
     * @param empId    员工id（用户id）
     * @param isFillId 是否需要返回id信息
     * @return 增强版hashMap，格式：[{"posId":456, "posCode":"zjl", "posName":"总经理"}]
     * @author xuyuxiang

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/emp/service/SysEmpService.java

@@ -70,13 +70,13 @@ public interface SysEmpService extends IService<SysEmp> {
    /**
     * 修改员工相关机构信息
     *
     * @param orgId 机构id
     * @param orgId   机构id
     * @param orgName 机构名称
     * @author xuyuxiang
     * @date 2020/6/23 9:57
     */
    void updateEmpOrgInfo(Long orgId, String orgName);
    
    /**
     * 根据机构id判断该机构下是否有员工
     *

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/file/controller/SysFileInfoController.java

@@ -66,7 +66,7 @@ public class SysFileInfoController {
    /**
     * 下载文件
     *
     * @author stylefeng,xuyuxiang
     * @author stylefeng, xuyuxiang
     * @date 2020/6/9 21:53
     */
    @GetMapping("/sysFileInfo/download")
@@ -78,7 +78,7 @@ public class SysFileInfoController {
    /**
     * 文件预览
     *
     * @author stylefeng,xuyuxiang
     * @author stylefeng, xuyuxiang
     * @date 2020/6/9 22:07
     */
    @GetMapping("/sysFileInfo/preview")

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/file/enums/SysFileInfoExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.file.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/file/service/SysFileInfoService.java

@@ -132,7 +132,7 @@ public interface SysFileInfoService extends IService<SysFileInfo> {
     * 文件预览
     *
     * @param sysFileInfoParam 文件预览参数
     * @param response 响应结果
     * @param response         响应结果
     * @author xuyuxiang
     * @date 2020/7/7 11:23
     */
@@ -142,7 +142,7 @@ public interface SysFileInfoService extends IService<SysFileInfo> {
     * 文件下载
     *
     * @param sysFileInfoParam 文件下载参数
     * @param response 响应结果
     * @param response         响应结果
     * @author xuyuxiang
     * @date 2020/7/7 12:09
     */

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/file/util/DownloadUtil.java

@@ -25,7 +25,7 @@ public class DownloadUtil {
    private static final Log log = Log.get();
    public static void download( String fileName, byte[] fileBytes,HttpServletResponse response) {
    public static void download(String fileName, byte[] fileBytes, HttpServletResponse response) {
        try {
            response.reset();
            response.setHeader("Content-Disposition", "attachment; filename=\"" + URLUtil.encode(fileName) + "\"");
@@ -41,7 +41,7 @@ public class DownloadUtil {
    /**
     * 下载文件
     *
     * @param file 要下载的文件
     * @param file     要下载的文件
     * @param response 相应
     * @author xuyuxiang
     * @date 2020/8/5 21:46

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/log/entity/SysOpLog.java

@@ -121,7 +121,7 @@ public class SysOpLog {
    /**
     * 操作时间
     */
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date opTime;
    /**

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/log/entity/SysVisLog.java

@@ -91,7 +91,7 @@ public class SysVisLog {
    /**
     * 访问时间
     */
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date visTime;
    /**

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/menu/enums/SysMenuExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.menu.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/menu/service/SysMenuService.java

@@ -53,7 +53,7 @@ public interface SysMenuService extends IService<SysMenu> {
    /**
     * 获取用户AntDesign菜单相关信息，前端使用
     *
     * @param userId 用户id
     * @param userId  用户id
     * @param appCode 应用编码
     * @return AntDesign菜单信息结果集
     * @author yubaoshan
@@ -130,6 +130,7 @@ public interface SysMenuService extends IService<SysMenu> {
    /**
     * 获取系统菜单树，用于给角色授权时选择
     *
     * @param sysMenuParam 查询参数
     * @return 菜单树列表
     * @author xuyuxiang

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/monitor/controller/SysOnlineUserController.java

@@ -73,7 +73,7 @@ public class SysOnlineUserController {
    @Permission
    @PostMapping("/sysOnlineUser/forceExist")
    @BusinessLog(title = "系统在线用户_强退", opType = LogAnnotionOpTypeEnum.FORCE)
    public ResponseData forceExist(@RequestBody  @Validated(SysOnlineUserParam.force.class) SysOnlineUserParam sysOnlineUserParam) {
    public ResponseData forceExist(@RequestBody @Validated(SysOnlineUserParam.force.class) SysOnlineUserParam sysOnlineUserParam) {
        sysOnlineUserService.forceExist(sysOnlineUserParam);
        return new SuccessResponseData();
    }

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/monitor/result/SysMachineResult.java

@@ -36,7 +36,7 @@ import java.io.Serializable;
 * @date 2020/6/5 15:02
 */
@Data
public class SysMachineResult  implements Serializable {
public class SysMachineResult implements Serializable {
    private static final long serialVersionUID = 1L;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/monitor/service/SysMachineService.java

@@ -33,7 +33,7 @@ import cn.stylefeng.guns.sys.modular.monitor.result.SysMachineResult;
 * @date 2020/6/5 14:39
 */
public interface SysMachineService {
    
    /**
     * 系统属性监控
     *

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/notice/entity/SysNoticeUser.java

@@ -24,7 +24,9 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
 */
package cn.stylefeng.guns.sys.modular.notice.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/notice/enums/SysNoticeExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.notice.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/notice/mapper/SysNoticeMapper.java

@@ -42,7 +42,7 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
    /**
     * 查询当前登陆用户已收公告
     *
     * @param page 分页参数
     * @param page         分页参数
     * @param queryWrapper 查询参数
     * @return 查询分页结果
     * @author xuyuxiang

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/notice/result/SysNoticeDetailResult.java

@@ -83,13 +83,13 @@ public class SysNoticeDetailResult {
    /**
     * 发布时间
     */
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date publicTime;
    /**
     * 撤回时间
     */
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date cancelTime;
    /**

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/notice/service/SysNoticeUserService.java

@@ -40,7 +40,7 @@ public interface SysNoticeUserService extends IService<SysNoticeUser> {
    /**
     * 添加
     *
     * @param noticeId 通知公告id
     * @param noticeId         通知公告id
     * @param noticeUserIdList 通知到的用户id集合
     * @param noticeUserStatus 阅读状态
     * @author xuyuxiang
@@ -51,7 +51,7 @@ public interface SysNoticeUserService extends IService<SysNoticeUser> {
    /**
     * 编辑
     *
     * @param noticeId 通知公告id
     * @param noticeId         通知公告id
     * @param noticeUserIdList 通知到的用户id集合
     * @param noticeUserStatus 阅读状态
     * @author xuyuxiang
@@ -73,8 +73,8 @@ public interface SysNoticeUserService extends IService<SysNoticeUser> {
     * 设为已读
     *
     * @param noticeId 通知公告id
     * @param userId 用户id
     * @param status 阅读状态
     * @param userId   用户id
     * @param status   阅读状态
     * @author xuyuxiang
     * @date 2020/6/29 12:05
     */

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/notice/service/impl/SysNoticeServiceImpl.java

@@ -29,12 +29,12 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.guns.core.context.login.LoginContextHolder;
import cn.stylefeng.guns.sys.core.enums.NoticeStatusEnum;
import cn.stylefeng.guns.sys.core.enums.NoticeUserStatusEnum;
import cn.stylefeng.guns.core.exception.ServiceException;
import cn.stylefeng.guns.core.factory.PageFactory;
import cn.stylefeng.guns.core.pojo.login.SysLoginUser;
import cn.stylefeng.guns.core.pojo.page.PageResult;
import cn.stylefeng.guns.sys.core.enums.NoticeStatusEnum;
import cn.stylefeng.guns.sys.core.enums.NoticeUserStatusEnum;
import cn.stylefeng.guns.sys.modular.notice.entity.SysNotice;
import cn.stylefeng.guns.sys.modular.notice.entity.SysNoticeUser;
import cn.stylefeng.guns.sys.modular.notice.enums.SysNoticeExceptionEnum;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/org/enums/SysOrgExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.org.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/pos/enums/SysPosExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.pos.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/role/enums/SysRoleExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.role.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/role/service/SysRoleMenuService.java

@@ -37,7 +37,7 @@ import java.util.List;
 * @date 2020/3/13 15:50
 */
public interface SysRoleMenuService extends IService<SysRoleMenu> {
    
    /**
     * 获取角色的菜单id集合
     *

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/role/service/SysRoleService.java

@@ -138,7 +138,7 @@ public interface SysRoleService extends IService<SysRole> {
     * 根据角色id集合获取数据范围id集合
     *
     * @param roleIdList 角色id集合
     * @param orgId 机构id
     * @param orgId      机构id
     * @return 数据范围id集合
     * @author xuyuxiang
     * @date 2020/4/5 17:41

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/sms/entity/SysSms.java

@@ -87,6 +87,6 @@ public class SysSms extends BaseEntity implements Serializable {
    /**
     * 失效时间
     */
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date invalidTime;
}

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/sms/enums/SmsSendExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.sms.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/sms/service/SysSmsInfoService.java

@@ -45,7 +45,7 @@ public interface SysSmsInfoService extends IService<SysSms> {
     * 存储短信验证信息
     *
     * @param sysSmsSendParam 发送参数
     * @param validateCode 验证码
     * @param validateCode    验证码
     * @return 短信记录id
     * @author stylefeng
     * @date 2018/7/6 16:47
@@ -55,7 +55,7 @@ public interface SysSmsInfoService extends IService<SysSms> {
    /**
     * 更新短息发送状态
     *
     * @param smsId 短信记录id
     * @param smsId             短信记录id
     * @param smsSendStatusEnum 发送状态枚举
     * @author stylefeng
     * @date 2018/7/6 17:12

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/timer/entity/SysTimers.java

@@ -26,7 +26,6 @@ package cn.stylefeng.guns.sys.modular.timer.entity;
import cn.stylefeng.guns.core.pojo.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/timer/enums/exp/SysTimersExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.timer.enums.exp;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/timer/service/TimerExeService.java

@@ -57,5 +57,5 @@ public interface TimerExeService {
     * @date 2020/7/1 14:08
     */
    void stopTimer(String taskId);
    
}

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/user/entity/SysUser.java

@@ -82,7 +82,7 @@ public class SysUser extends BaseEntity {
    /**
     * 生日
     */
    @Excel(name = "生日", databaseFormat="yyyy-MM-dd HH:mm:ss", format = "yyyy-MM-dd", width = 20)
    @Excel(name = "生日", databaseFormat = "yyyy-MM-dd HH:mm:ss", format = "yyyy-MM-dd", width = 20)
    private Date birthday;
    /**
@@ -118,7 +118,7 @@ public class SysUser extends BaseEntity {
    /**
     * 最后登陆时间
     */
    @Excel(name = "最后登陆时间", databaseFormat="yyyy-MM-dd HH:mm:ss", format = "yyyy-MM-dd HH:mm:ss", width = 30)
    @Excel(name = "最后登陆时间", databaseFormat = "yyyy-MM-dd HH:mm:ss", format = "yyyy-MM-dd HH:mm:ss", width = 30)
    private Date lastLoginTime;
    /**

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/user/enums/SysUserExceptionEnum.java

@@ -25,7 +25,6 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.user.enums;
import cn.stylefeng.guns.core.annotion.ExpEnumType;
import cn.stylefeng.guns.core.consts.ExpEnumConstant;
import cn.stylefeng.guns.core.exception.enums.abs.AbstractBaseExceptionEnum;
import cn.stylefeng.guns.core.factory.ExpEnumCodeFactory;
import cn.stylefeng.guns.sys.core.consts.SysExpEnumConstant;

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/user/factory/SysUserFactory.java

@@ -26,8 +26,8 @@ package cn.stylefeng.guns.sys.modular.user.factory;
import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.guns.core.context.constant.ConstantContextHolder;
import cn.stylefeng.guns.sys.core.enums.AdminTypeEnum;
import cn.stylefeng.guns.core.enums.CommonStatusEnum;
import cn.stylefeng.guns.sys.core.enums.AdminTypeEnum;
import cn.stylefeng.guns.sys.core.enums.SexEnum;
import cn.stylefeng.guns.sys.modular.user.entity.SysUser;
import org.springframework.security.crypto.bcrypt.BCrypt;
@@ -60,18 +60,18 @@ public class SysUserFactory {
     */
    public static void fillBaseUserInfo(SysUser sysUser) {
        //密码为空则设置密码
        if(ObjectUtil.isEmpty(sysUser.getPassword())) {
        if (ObjectUtil.isEmpty(sysUser.getPassword())) {
            //没有密码则设置默认密码
            String password = ConstantContextHolder.getDefaultPassWord();
            //设置密码为Md5加密后的密码
            sysUser.setPassword(BCrypt.hashpw(password, BCrypt.gensalt()));
        }
        if(ObjectUtil.isEmpty(sysUser.getAvatar())) {
        if (ObjectUtil.isEmpty(sysUser.getAvatar())) {
            sysUser.setAvatar(null);
        }
        if(ObjectUtil.isEmpty(sysUser.getSex())) {
        if (ObjectUtil.isEmpty(sysUser.getSex())) {
            sysUser.setSex(SexEnum.NONE.getCode());
        }

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/user/mapper/SysUserMapper.java

@@ -44,7 +44,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
    /**
     * 获取用户分页列表
     *
     * @param page 分页参数
     * @param page         分页参数
     * @param queryWrapper 查询参数
     * @return 查询分页结果
     * @author xuyuxiang

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/user/service/SysUserService.java

@@ -157,7 +157,7 @@ public interface SysUserService extends IService<SysUser> {
     * 获取用户的数据范围（组织机构id集合）
     *
     * @param userId 用户id
     * @param orgId 组织机构id
     * @param orgId  组织机构id
     * @return 数据范围id集合（组织机构id集合）
     * @author xuyuxiang
     * @date 2020/4/5 17:23

guns-main/src/test/java/cn/stylefeng/guns/core/Test.java

@@ -30,7 +30,7 @@ package cn.stylefeng.guns.core;
 * @author xuyuxiang
 * @date 2020/3/16 11:25
 */
public class Test extends BaseJunit{
public class Test extends BaseJunit {
    @org.junit.Test
    public void test() {

guns-main/src/test/java/cn/stylefeng/guns/core/Test2.java

@@ -26,6 +26,7 @@ package cn.stylefeng.guns.core;
/**
 * 纯test
 *
 * @author xuyuxiang
 * @date 2020/5/2014:29
 */