diff --git a/diyfile-common/pom.xml b/diyfile-common/pom.xml index 4d11aed..c09833b 100644 --- a/diyfile-common/pom.xml +++ b/diyfile-common/pom.xml @@ -20,11 +20,6 @@ diyfile-doc ${revision} - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - com.baomidou diff --git a/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/UserServiceImpl.java b/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/UserServiceImpl.java index 0f61d58..5d6a837 100644 --- a/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/UserServiceImpl.java +++ b/diyfile-system/src/main/java/com/besscroft/diyfile/service/impl/UserServiceImpl.java @@ -48,6 +48,8 @@ public class UserServiceImpl extends ServiceImpl implements Us public SaTokenInfo login(String username, String password) { User user = this.baseMapper.selectByUsername(username); Assert.notNull(user, "账号或密码错误!"); + if (Objects.equals(user.getStatus(), SystemConstants.STATUS_NO)) + throw new DiyFileException(String.format("账号:%s 已被禁用,请联系管理员!", username)); log.info("用户发起登录请求:{}", username); if (!Objects.equals(SecureUtil.sha256(password), user.getPassword())) throw new DiyFileException("账号或密码错误!"); diff --git a/diyfile-system/src/main/resources/mapper/UserMapper.xml b/diyfile-system/src/main/resources/mapper/UserMapper.xml index 19ab7b5..7a61678 100644 --- a/diyfile-system/src/main/resources/mapper/UserMapper.xml +++ b/diyfile-system/src/main/resources/mapper/UserMapper.xml @@ -44,8 +44,6 @@ FROM user WHERE - status = 1 - AND del = 1 AND username = #{username} diff --git a/pom.xml b/pom.xml index af827ea..06038cb 100644 --- a/pom.xml +++ b/pom.xml @@ -31,12 +31,11 @@ 3.5.3.1 2.0.2 1.34.0 - 5.8.11 - 3.0.1 + 5.8.12 1.4.6 6.4.0 3.5.3 - 3.1.2 + 3.1.4 3.16.0 2.3.1 1.1.1 @@ -102,12 +101,6 @@ mysql-connector-java ${mysql.version} - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis.version} - com.baomidou