From 95c01301f65379e7634e4619bf4c49186aa5be41 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 07 二月 2025 14:19:28 +0800
Subject: [PATCH] !644 同步修复一些问题 Merge pull request !644 from 疯狂的狮子Li/dev
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java
index b13c057..77eed8c 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java
@@ -14,36 +14,41 @@
/**
* 瀛楀吀绫诲瀷蹇呴』浠ュ瓧姣嶅紑澶达紝涓斿彧鑳戒负锛堝皬鍐欏瓧姣嶏紝鏁板瓧锛屼笅婊戠嚎锛�
*/
- public static final String DICTIONARY_TYPE = "^[a-z][a-z0-9_]*$";
+ String DICTIONARY_TYPE = "^[a-z][a-z0-9_]*$";
+
+ /**
+ * 鏉冮檺鏍囪瘑蹇呴』绗﹀悎 tool:build:list 鏍煎紡锛屾垨鑰呯┖瀛楃涓�
+ */
+ String PERMISSION_STRING = "^(|^[a-zA-Z0-9_]+:[a-zA-Z0-9_]+:[a-zA-Z0-9_]+)$";
/**
* 韬唤璇佸彿鐮侊紙鍚�6浣嶏級
*/
- public static final String ID_CARD_LAST_6 = "^(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$";
+ String ID_CARD_LAST_6 = "^(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$";
/**
* QQ鍙风爜
*/
- public static final String QQ_NUMBER = "^[1-9][0-9]\\d{4,9}$";
+ String QQ_NUMBER = "^[1-9][0-9]\\d{4,9}$";
/**
* 閭斂缂栫爜
*/
- public static final String POSTAL_CODE = "^[1-9]\\d{5}$";
+ String POSTAL_CODE = "^[1-9]\\d{5}$";
/**
* 娉ㄥ唽璐﹀彿
*/
- public static final String ACCOUNT = "^[a-zA-Z][a-zA-Z0-9_]{4,15}$";
+ String ACCOUNT = "^[a-zA-Z][a-zA-Z0-9_]{4,15}$";
/**
* 瀵嗙爜锛氬寘鍚嚦灏�8涓瓧绗︼紝鍖呮嫭澶у啓瀛楁瘝銆佸皬鍐欏瓧姣嶃�佹暟瀛楀拰鐗规畩瀛楃
*/
- public static final String PASSWORD = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[@$!%*?&])[A-Za-z\\d@$!%*?&]{8,}$";
+ String PASSWORD = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[@$!%*?&])[A-Za-z\\d@$!%*?&]{8,}$";
/**
* 閫氱敤鐘舵�侊紙0琛ㄧず姝ｅ父锛�1琛ㄧず鍋滅敤锛�
*/
- public static final String STATUS = "^[01]$";
+ String STATUS = "^[01]$";
}
--
Gitblit v1.9.3