Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

yuan

5 天以前 84b131de4a1deb526066fc0f7e7514ac43838bf8

 src/main/java/com/ruoyi/framework/security/service/SysLoginService.java

@@ -121,7 +121,7 @@
        boolean captchaEnabled = configService.selectCaptchaEnabled();

        if (captchaEnabled)

        {

            String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");

            String verifyKey = CacheConstants.PREFIX + CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");

            String captcha = redisCache.getCacheObject(verifyKey);

            if (captcha == null)

            {