mirror of
https://gitee.com/kekingcn/file-online-preview.git
synced 2026-03-15 05:33:52 +08:00
重构验证码生成方法 (#481)
This commit is contained in:
@@ -2,9 +2,9 @@ package cn.keking.web.controller;
|
||||
|
||||
import cn.keking.config.ConfigConstants;
|
||||
import cn.keking.model.ReturnResponse;
|
||||
import cn.keking.utils.CaptchaUtil;
|
||||
import cn.keking.utils.DateUtils;
|
||||
import cn.keking.utils.KkFileUtils;
|
||||
import cn.keking.utils.CaptchaUtil;
|
||||
import cn.keking.utils.RarUtils;
|
||||
import cn.keking.utils.WebUtils;
|
||||
import org.slf4j.Logger;
|
||||
@@ -22,16 +22,21 @@ import javax.imageio.ImageIO;
|
||||
import javax.servlet.ServletOutputStream;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.awt.image.RenderedImage;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
import static cn.keking.utils.CaptchaUtil.*;
|
||||
import static cn.keking.utils.CaptchaUtil.captcha_code;
|
||||
import static cn.keking.utils.CaptchaUtil.captcha_generate_time;
|
||||
|
||||
/**
|
||||
* @author yudian-it
|
||||
@@ -104,22 +109,19 @@ public class FileController {
|
||||
long captchaGenerateTime = WebUtils.getLongSessionAttr(request, captcha_generate_time);
|
||||
long timeDifference = DateUtils.calculateCurrentTimeDifference(captchaGenerateTime);
|
||||
|
||||
Map<String, Object> codeMap;
|
||||
|
||||
// 验证码为空,且生成验证码超过50秒,重新生成验证码
|
||||
if (timeDifference > 50 && ObjectUtils.isEmpty(captchaCode)) {
|
||||
codeMap = CaptchaUtil.generateCaptcha(null);
|
||||
captchaCode = CaptchaUtil.generateCaptchaCode();
|
||||
// 更新验证码
|
||||
request.getSession().setAttribute(captcha_code, codeMap.get(captcha_code).toString());
|
||||
request.getSession().setAttribute(captcha_generate_time, DateUtils.getCurrentSecond());
|
||||
WebUtils.setSessionAttr(request, captcha_code, captchaCode);
|
||||
WebUtils.setSessionAttr(request, captcha_generate_time, DateUtils.getCurrentSecond());
|
||||
} else {
|
||||
captchaCode = ObjectUtils.isEmpty(captchaCode) ? "wait" : captchaCode;
|
||||
codeMap = CaptchaUtil.generateCaptcha(captchaCode);
|
||||
}
|
||||
|
||||
ServletOutputStream sos = response.getOutputStream();
|
||||
ImageIO.write((RenderedImage) codeMap.get(captcha_code_pic), "jpeg", sos);
|
||||
sos.close();
|
||||
ServletOutputStream outputStream = response.getOutputStream();
|
||||
ImageIO.write(CaptchaUtil.generateCaptchaPic(captchaCode), "jpeg", outputStream);
|
||||
outputStream.close();
|
||||
}
|
||||
|
||||
@GetMapping("/listFiles")
|
||||
|
||||
Reference in New Issue
Block a user