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

huliguo

2 天以前 a966dafb8877552267a94fe8c544c5ea72cf5650

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/CodeFactoryUtil.java

@@ -200,8 +200,8 @@
        String suffixNumber = "0001";
        if(getRedisService().hasKey(prefix)){
            suffixNumberInt = getRedisService().getCacheObject(prefix);
            suffixNumber = toFillZeroSuffixNumber(suffixNumberInt,ORDER_LENGTH);
            suffixNumberInt = suffixNumberInt + 1;
            suffixNumber = toFillZeroSuffixNumber(suffixNumberInt,ORDER_LENGTH);
            getRedisService().setCacheObject(prefix, suffixNumberInt, 24L, TimeUnit.HOURS);
        }else{
            getRedisService().setCacheObject(prefix, 1, 24L, TimeUnit.HOURS);