Merge remote-tracking branch 'origin/master-v2'

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

 src/main/java/com/mzl/flower/web/login/SupplierLoginController.java

@@ -88,10 +88,7 @@
            throw new ValidationException("用户不存在");
        }
        SupplierDTO supplierDTO = supplierMapper.getCurrentSupplier(user.getId());
        if (ObjectUtils.isEmpty(supplierDTO)) {
            throw new ValidationException("用户不存在");
        }
        if (supplierDTO.getIsEnabled() == false) {
        if (supplierDTO != null && supplierDTO.getIsEnabled() == false) {
            throw new ValidationException("用户已禁用，请联系管理员");
        }
        String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());
@@ -137,6 +134,13 @@
        if(user == null){
            throw new ValidationException("用户不存在");
        }
        SupplierDTO supplierDTO = supplierMapper.getCurrentSupplier(user.getId());
        if (ObjectUtils.isEmpty(supplierDTO)) {
            throw new ValidationException("用户不存在");
        }
        if (supplierDTO.getIsEnabled() == false) {
            throw new ValidationException("用户已禁用，请联系管理员");
        }
        String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());
        if (StringUtils.isNotBlank(tokenCache))  {
            //强制删除token，下线