Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-05-31 f3aaa7ea7a0f56ff4a6f9faf057a6595ab3275a7

 ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -63,6 +63,11 @@
    public static final String LOGIN_TOKEN_KEY = "login_tokens:";

    /**
     * 防重提交 redis key
     */
    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";

    /**
     * 验证码有效期（分钟）
     */
    public static final Integer CAPTCHA_EXPIRATION = 2;