优化公共方法

ruoyi-ui/src/utils/validate.js

@@ -53,11 +53,14 @@ export function validUsername(str) {
  * @param {string} url
  * @returns {Boolean}
  */
-export function validURL(url) {
+export const validURL = (str) => {
-  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
+  try {
-  return reg.test(url)
+    const u = new URL(str);
-}
+    return /^(https?|ftp):/.test(u.protocol); // 只允许 http/https/ftp
-
+  } catch {
+    return false;
+  }
+};
 /**
  * @param {string} str
  * @returns {Boolean}
@@ -90,8 +93,9 @@ export function validAlphabets(str) {
  * @returns {Boolean}
  */
 export function validEmail(email) {
-  const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  if (typeof email !== 'string' || email.length > 320) return false;
-  return reg.test(email)
+  // 官方简化版，支持引号、域名字面量、IPv4
+  return /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(email);
 }
 
 /**