Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

zqy

2025-08-02 068a2a5b8898ce2d4e59a4a9482d7236508cc35b

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

@@ -56,6 +56,10 @@
        {
            log.info("登录用户：{} 异常.", username);
            throw new ServiceException("对不起，您的账号：" + username + " 出现异常，请联系管理员");
        }else if(UserStatus.END.getCode().equals(user.getStatus()))
        {
            log.info("登录用户：{} 异常.", username);
            throw new ServiceException("对不起，您的账号：" + username + " 试用期已结束，请付费继续使用");
        }

        passwordService.validate(user);