Merge remote-tracking branch 'origin/master'

2022-03-08 18:33:17 +08:00
parent eac73fc32c a61dbb37a9
commit 5835dad49a
45 changed files with 1368 additions and 635 deletions
@@ -0,0 +1,37 @@
+package com.jero.common.constant.enums;
+
+/**
+ * 中英文切换标识
+ * @description
+ * @date 2022/1/21 15:22
+ * @auth zhn
+ */
+public enum IsMustEnum {
+    YES("是","0"),
+    NO("否","1");
+
+
+    String name;
+    String value;
+
+    private IsMustEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}
@@ -646,5 +646,26 @@ public class DateUtils extends PropertyEditorSupport {
        calendar.setTime(getDate());
        return calendar.get(Calendar.YEAR);
    }
+    /***
+     * @Description: 判断多个日期是否都符合日期格式
+     * @Author: yangxuenan
+     * @Date: 2020/12/31 11:31
+     * @Param: [str]
+     * @Return: boolean
+     */
+    public static boolean isValidDate(String str){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String[] strArr = str.split(",");
+        for (String dateStr : strArr) {
+            String replace = dateStr.replace("/", "-");
+            try {
+                simpleDateFormat.setLenient(false);
+                simpleDateFormat.parse(replace);
+            } catch (Exception e){
+                return false;
+            }
+        }
+        return true;
+    }

-}
+}
@@ -71,6 +71,7 @@ public class ShiroConfig {
        }
        // 配置不会被拦截的链接 顺序判断
        filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录
+        filterChainDefinitionMap.put("/ocr/OcrRestful/ocrHandleResult", "anon"); //ocr回调接口
        filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
        filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除
        filterChainDefinitionMap.put("/sys/getRSAPublicKey", "anon"); //获取RSA公钥接口排除