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

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

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

@@ -96,7 +96,7 @@
        String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());
        if (StringUtils.isNotBlank(tokenCache))  {
            //强制删除token，下线
            removeToken(tokenCache,user.getId());
//            removeToken(tokenCache,user.getId());
        }
        try {
            PartnerAuthenticationToken authRequest = new PartnerAuthenticationToken(username, password);
@@ -136,10 +136,17 @@
        if(user == null){
            throw new ValidationException("用户不存在");
        }
        PartnerDTO partnerDTO = partnerMapper.getCurrentPartner(user.getId());
        if (ObjectUtils.isEmpty(partnerDTO)) {
            throw new ValidationException("用户不存在");
        }
        if (partnerDTO.getIsEnabled() == false) {
            throw new ValidationException("用户已禁用，请联系管理员");
        }
        String tokenCache = stringCacheClient.get(TOKEN_KEY + SEPARATOR + user.getId());
        if (StringUtils.isNotBlank(tokenCache))  {
            //强制删除token，下线
            removeToken(tokenCache,user.getId());
//            removeToken(tokenCache,user.getId());
        }
        try {
            PhoneAuthenticationToken authRequest = new PhoneAuthenticationToken(tel, smsCode, Constants.USER_TYPE.partner.name());