徐玉祥 4 lat temu
rodzic
commit
c2b14dafc9

+ 2 - 2
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/log/LogManager.java

@ -32,7 +32,7 @@ public class LogManager {
    /**
     * 异步操作记录日志的线程池
     */
    private static ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(10, new ScheduledExecutorFactoryBean());
    private static final ScheduledThreadPoolExecutor EXECUTOR = new ScheduledThreadPoolExecutor(10, new ScheduledExecutorFactoryBean());
    private LogManager() {
    }
@ -58,7 +58,7 @@ public class LogManager {
        //日志记录操作延时
        int operateDelayTime = 10;
        executor.schedule(task, operateDelayTime, TimeUnit.MILLISECONDS);
        EXECUTOR.schedule(task, operateDelayTime, TimeUnit.MILLISECONDS);
    }
    /**

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

@ -20,11 +20,11 @@ import java.util.TimerTask;
 */
public class LogTaskFactory {
    private static Log log = Log.get();
    private static final Log log = Log.get();
    private static SysVisLogService sysVisLogService = SpringUtil.getBean(SysVisLogService.class);
    private static final SysVisLogService sysVisLogService = SpringUtil.getBean(SysVisLogService.class);
    private static SysOpLogService sysOpLogService = SpringUtil.getBean(SysOpLogService.class);
    private static final SysOpLogService sysOpLogService = SpringUtil.getBean(SysOpLogService.class);
    /**
     * 登录日志

+ 1 - 1
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/redis/FastJson2JsonRedisSerializer.java

@ -17,7 +17,7 @@ import java.nio.charset.Charset;
 */
public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
    private Class<T> clazz;
    private final Class<T> clazz;
    static {
        ParserConfig.getGlobalInstance().setAutoTypeSupport(true);

+ 5 - 5
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/auth/factory/LoginUserFactory.java

@ -30,15 +30,15 @@ import java.util.List;
 */
public class LoginUserFactory {
    private static SysUserService sysUserService = SpringUtil.getBean(SysUserService.class);
    private static final SysUserService sysUserService = SpringUtil.getBean(SysUserService.class);
    private static SysEmpService sysEmpService = SpringUtil.getBean(SysEmpService.class);
    private static final SysEmpService sysEmpService = SpringUtil.getBean(SysEmpService.class);
    private static SysAppService sysAppService = SpringUtil.getBean(SysAppService.class);
    private static final SysAppService sysAppService = SpringUtil.getBean(SysAppService.class);
    private static SysMenuService sysMenuService = SpringUtil.getBean(SysMenuService.class);
    private static final SysMenuService sysMenuService = SpringUtil.getBean(SysMenuService.class);
    private static SysRoleService sysRoleService = SpringUtil.getBean(SysRoleService.class);
    private static final SysRoleService sysRoleService = SpringUtil.getBean(SysRoleService.class);
    /**
     * 填充登录用户相关信息

+ 0 - 5
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/auth/service/impl/AuthServiceImpl.java

@ -43,11 +43,6 @@ import java.util.Map;
@Service
public class AuthServiceImpl implements AuthService, UserDetailsService {
    /**
     * 默认登录有效时间 2小时
     */
    private static final Long LOGIN_EXPIRED_HOURS = 2L;
    @Resource
    private SysUserService sysUserService;

+ 1 - 2
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/dict/service/impl/SysDictDataServiceImpl.java

@ -168,8 +168,7 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
        //更新枚举,更新只能更新未删除状态的
        LambdaUpdateWrapper<SysDictData> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper
                .eq(SysDictData::getId, id)
        updateWrapper.eq(SysDictData::getId, id)
                .and(i -> i.ne(SysDictData::getStatus, CommonStatusEnum.DELETED.getCode()))
                .set(SysDictData::getStatus, status);
        boolean update = this.update(updateWrapper);

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

@ -150,8 +150,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
        //更新枚举,更新只能更新未删除状态的
        LambdaUpdateWrapper<SysDictType> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper
                .eq(SysDictType::getId, id)
        updateWrapper.eq(SysDictType::getId, id)
                .and(i -> i.ne(SysDictType::getStatus, CommonStatusEnum.DELETED.getCode()))
                .set(SysDictType::getStatus, status);
        boolean update = this.update(updateWrapper);

+ 1 - 5
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/menu/service/impl/SysMenuServiceImpl.java

@ -146,11 +146,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
            mateItem.setTitle(sysMenu.getName());
            mateItem.setLink(sysMenu.getLink());
            //是否可见
            if (YesOrNotEnum.N.getCode().equals(sysMenu.getVisible())) {
                mateItem.setShow(false);
            } else {
                mateItem.setShow(true);
            }
            mateItem.setShow(!YesOrNotEnum.N.getCode().equals(sysMenu.getVisible()));
            //设置的首页,默认打开此链接
            loginMenuTreeNode.setRedirect(sysMenu.getRedirect());
            //是否是外链

+ 1 - 2
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/user/service/impl/SysUserServiceImpl.java

@ -312,8 +312,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
        //更新枚举,更新只能更新未删除状态的
        LambdaUpdateWrapper<SysUser> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper
                .eq(SysUser::getId, id)
        updateWrapper.eq(SysUser::getId, id)
                .and(i -> i.ne(SysUser::getStatus, CommonStatusEnum.DELETED.getCode()))
                .set(SysUser::getStatus, status);
        boolean update = this.update(updateWrapper);