0.3.17

2025-07-14 15:38:58 +08:00 · 2022-11-07 11:53:21 +08:00 · 2022-11-07 11:53:21 +08:00 · 5acc409192
commit 5acc409192
parent 3c2da62cb7
2 changed files with 133 additions and 75 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# 正则大全  ![已收录77条](https://img.shields.io/badge/已收录-77条-673ab7.svg) [![版本](https://badgen.net/vs-marketplace/v/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![安装量](https://badgen.net/vs-marketplace/i/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![下载量](https://badgen.net/vs-marketplace/d/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) ![MIT](https://img.shields.io/badge/license-MIT-F44336.svg) [![CircleCI](https://badgen.net/github/status/any86/any-rule/master/ci/circleci)](https://circleci.com/gh/any86/any-rule)
+# 正则大全  ![已收录84条](https://img.shields.io/badge/已收录-84条-673ab7.svg) [![版本](https://badgen.net/vs-marketplace/v/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![安装量](https://badgen.net/vs-marketplace/i/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) [![下载量](https://badgen.net/vs-marketplace/d/russell.any-rule)](https://marketplace.visualstudio.com/items?itemName=russell.any-rule) ![MIT](https://img.shields.io/badge/license-MIT-F44336.svg) [![CircleCI](https://badgen.net/github/status/any86/any-rule/master/ci/circleci)](https://circleci.com/gh/any86/any-rule)

 🦕支持**web** / **vscode** / **idea** / **Alfred Workflow**多平台

@ -68,7 +68,6 @@ vscode应用商店中搜索"**any-rule**".
 在此感谢大家对**any-rule**做出的贡献! 

 ## 🍔正则
-<<<<<<< HEAD

 ### 火车车次
 ```javascript
@ -162,7 +161,7 @@ vscode应用商店中搜索"**any-rule**".

 ### md5格式(32位)
 ```javascript
-/^([a-f\d]{32}|[A-F\d]{32})$/
+/^[a-fA-F0-9]{32}$/
 ```

 ### GUID/UUID
@ -202,12 +201,7 @@ vscode应用商店中搜索"**any-rule**".

 ### 数字/货币金额（支持负数、千分位分隔符）
 ```javascript
-/^-?\d+(,\d{3})*(\.\d{1,2})?$/
-```
-
-### 数字/货币金额 (只支持正数、不支持校验千分位分隔符)
-```javascript
-/(?:^[1-9]([0-9]+)?(?:\.[0-9]{1,2})?$)|(?:^(?:0)$)|(?:^[0-9]\.[0-9](?:[0-9])?$)/
+/^-?\d{1,3}(,\d{3})*(\.\d{1,2})?$/
 ```

 ### 银行卡号（10到30位, 覆盖对公/私账户, 参考[微信支付](https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=22_1)）
@ -242,7 +236,7 @@ vscode应用商店中搜索"**any-rule**".

 ### 手机号(mobile phone)中国(严谨), 根据工信部2019年最新公布的手机号段
 ```javascript
-/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/
+/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[1589]))\d{8}$/
 ```

 ### 手机号(mobile phone)中国(宽松), 只要是13,14,15,16,17,18,19开头即可
@ -255,11 +249,21 @@ vscode应用商店中搜索"**any-rule**".
 /^(?:(?:\+|00)86)?1\d{10}$/
 ```

-### date(日期)
+### 日期(宽松)
 ```javascript
 /^\d{1,4}(-)(1[0-2]|0?[1-9])\1(0?[1-9]|[1-2]\d|30|31)$/
 ```

+### 日期(严谨, 支持闰年判断)
+```javascript
+/^(([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))-02-29)$/
+```
+
+### 中国省
+```javascript
+/^浙江|上海|北京|天津|重庆|黑龙江|吉林|辽宁|内蒙古|河北|新疆|甘肃|青海|陕西|宁夏|河南|山东|山西|安徽|湖北|湖南|江苏|四川|贵州|云南|广西|西藏|江西|广东|福建|台湾|海南|香港|澳门$/
+```
+
 ### 可以被moment转化成功的时间 YYYYMMDD HH:mm:ss
 ```javascript
 /^\d{4}([/:-\S])(1[0-2]|0?[1-9])\1(0?[1-9]|[1-2]\d|30|31) (?:[01]\d|2[0-3]):[0-5]\d:[0-5]\d$/
@ -305,14 +309,14 @@ vscode应用商店中搜索"**any-rule**".
 /^(?:[\u3400-\u4DB5\u4E00-\u9FEA\uFA0E\uFA0F\uFA11\uFA13\uFA14\uFA1F\uFA21\uFA23\uFA24\uFA27-\uFA29]|[\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0])+$/
 ```

-### 小数
+### 小数(支持科学计数)
 ```javascript
-/^\d+\.\d+$/
+/^[+-]?(\d+([.]\d*)?([eE][+-]?\d+)?|[.]\d+([eE][+-]?\d+)?)$/
 ```

-### 数字
+### 只包含数字
 ```javascript
-/^\d{1,}$/
+/^\d+$/
 ```

 ### html标签(宽松匹配)
@ -320,6 +324,11 @@ vscode应用商店中搜索"**any-rule**".
 /<(\w+)[^>]*>(.*?<\/\1>)?/
 ```

+### 匹配中文汉字和中文标点
+```javascript
+/[\u4e00-\u9fa5|\u3002|\uff1f|\uff01|\uff0c|\u3001|\uff1b|\uff1a|\u201c|\u201d|\u2018|\u2019|\uff08|\uff09|\u300a|\u300b|\u3008|\u3009|\u3010|\u3011|\u300e|\u300f|\u300c|\u300d|\ufe43|\ufe44|\u3014|\u3015|\u2026|\u2014|\uff5e|\ufe4f|\uffe5]/
+```
+
 ### qq号格式正确
 ```javascript
 /^[1-9][0-9]{4,10}$/
@ -352,7 +361,7 @@ vscode应用商店中搜索"**any-rule**".

 ### 用户名校验，4到16位（字母，数字，下划线，减号）
 ```javascript
-/^[a-zA-Z0-9_-]{4,16}$/
+/^[\w-]{4,16}$/
 ```

 ### ip-v4[:端口]
@ -397,7 +406,7 @@ vscode应用商店中搜索"**any-rule**".

 ### mac地址
 ```javascript
-/^((([a-f0-9]{2}:){5})|(([a-f0-9]{2}-){5}))[a-f0-9]{2}$/i
+/^(([a-f0-9][0,2,4,6,8,a,c,e]:([a-f0-9]{2}:){4})|([a-f0-9][0,2,4,6,8,a,c,e]-([a-f0-9]{2}-){4}))[a-f0-9]{2}$/i
 ```

 ### 匹配连续重复的字符
@ -430,6 +439,11 @@ vscode应用商店中搜索"**any-rule**".
 /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W_!@#$%^&*`~()-+=]+$)(?![a-z0-9]+$)(?![a-z\W_!@#$%^&*`~()-+=]+$)(?![0-9\W_!@#$%^&*`~()-+=]+$)[a-zA-Z0-9\W_!@#$%^&*`~()-+=]/
 ```

+### ASCII码表中的全部的特殊字符
+```javascript
+/[\x21-\x2F\x3A-\x40\x5B-\x60\x7B-\x7E]+/
+```
+
 ### 正整数，不包含0
 ```javascript
 /^\+?[1-9]\d*$/
@ -442,15 +456,35 @@ vscode应用商店中搜索"**any-rule**".

 ### 整数
 ```javascript
-/^-?[0-9]\d*$/
+/^(?:0|(?:-?[1-9]\d*))$/
 ```

 ### 浮点数
 ```javascript
-/^(-?\d+)(\.\d+)?$/
+/^(-?[1-9]\d*\.\d+|-?0\.\d*[1-9]\d*|0\.0+)$/
+```
+
+### 浮点数(严格)
+```javascript
+/^(-?[1-9]\d*\.\d+|-?0\.\d*[1-9])$/
 ```

 ### email(支持中文邮箱)
 ```javascript
 /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
 ```
+
+### 域名(非网址, 不包含协议)
+```javascript
+/^([0-9a-zA-Z-]{1,}\.)+([a-zA-Z]{2,})$/
+```
+
+### 军官/士兵证
+```javascript
+/^[\u4E00-\u9FA5](字第)([0-9a-zA-Z]{4,8})(号?)$/
+```
+
+### 户口薄
+```javascript
+/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+```
--- a/package.json
+++ b/package.json
@ -3,7 +3,7 @@
    "publisher": "russell",
    "displayName": "any-rule",
    "description": "你要的\"正则\"都在这!",
-    "version": "0.3.16",
+    "version": "0.3.17",
    "keywords": [
        "vscode",
        "typescript",
@ -183,211 +183,235 @@
            },
            {
                "command": "extension.rule27",
-                "title": "$(rocket) zz: 数字/货币金额 (只支持正数、不支持校验千分位分隔符)"
-            },
-            {
-                "command": "extension.rule28",
                "title": "$(rocket) zz: 银行卡号（10到30位, 覆盖对公/私账户, 参考[微信支付](https://pay.weixin.qq.com/wiki/doc/api/xiaowei.php?chapter=22_1)）"
            },
            {
-                "command": "extension.rule29",
+                "command": "extension.rule28",
                "title": "$(rocket) zz: 中文姓名"
            },
            {
-                "command": "extension.rule30",
+                "command": "extension.rule29",
                "title": "$(rocket) zz: 英文姓名"
            },
            {
-                "command": "extension.rule31",
+                "command": "extension.rule30",
                "title": "$(rocket) zz: 车牌号(新能源)"
            },
            {
-                "command": "extension.rule32",
+                "command": "extension.rule31",
                "title": "$(rocket) zz: 车牌号(非新能源)"
            },
            {
-                "command": "extension.rule33",
+                "command": "extension.rule32",
                "title": "$(rocket) zz: 车牌号(新能源+非新能源)"
            },
            {
-                "command": "extension.rule34",
+                "command": "extension.rule33",
                "title": "$(rocket) zz: 手机号(mobile phone)中国(严谨), 根据工信部2019年最新公布的手机号段"
            },
            {
-                "command": "extension.rule35",
+                "command": "extension.rule34",
                "title": "$(rocket) zz: 手机号(mobile phone)中国(宽松), 只要是13,14,15,16,17,18,19开头即可"
            },
            {
-                "command": "extension.rule36",
+                "command": "extension.rule35",
                "title": "$(rocket) zz: 手机号(mobile phone)中国(最宽松), 只要是1开头即可, 如果你的手机号是用来接收短信, 优先建议选择这一条"
            },
            {
-                "command": "extension.rule37",
+                "command": "extension.rule36",
                "title": "$(rocket) zz: 日期(宽松)"
            },
            {
-                "command": "extension.rule38",
+                "command": "extension.rule37",
                "title": "$(rocket) zz: 日期(严谨, 支持闰年判断)"
            },
            {
-                "command": "extension.rule39",
+                "command": "extension.rule38",
                "title": "$(rocket) zz: 中国省"
            },
            {
-                "command": "extension.rule40",
+                "command": "extension.rule39",
                "title": "$(rocket) zz: 可以被moment转化成功的时间 YYYYMMDD HH:mm:ss"
            },
            {
-                "command": "extension.rule41",
+                "command": "extension.rule40",
                "title": "$(rocket) zz: email(邮箱)"
            },
            {
-                "command": "extension.rule42",
+                "command": "extension.rule41",
                "title": "$(rocket) zz: 座机(tel phone)电话(国内),如: 0341-86091234"
            },
            {
-                "command": "extension.rule43",
+                "command": "extension.rule42",
                "title": "$(rocket) zz: 身份证号(1代,15位数字)"
            },
            {
-                "command": "extension.rule44",
+                "command": "extension.rule43",
                "title": "$(rocket) zz: 身份证号(2代,18位数字),最后一位是校验位,可能为数字或字符X"
            },
            {
-                "command": "extension.rule45",
+                "command": "extension.rule44",
                "title": "$(rocket) zz: 身份证号, 支持1/2代(15位/18位数字)"
            },
            {
-                "command": "extension.rule46",
+                "command": "extension.rule45",
                "title": "$(rocket) zz: 护照（包含香港、澳门）"
            },
            {
-                "command": "extension.rule47",
+                "command": "extension.rule46",
                "title": "$(rocket) zz: 帐号是否合法(字母开头，允许5-16字节，允许字母数字下划线组合"
            },
            {
-                "command": "extension.rule48",
+                "command": "extension.rule47",
                "title": "$(rocket) zz: 中文/汉字"
            },
            {
-                "command": "extension.rule49",
-                "title": "$(rocket) zz: 小数"
+                "command": "extension.rule48",
+                "title": "$(rocket) zz: 小数(支持科学计数)"
            },
            {
-                "command": "extension.rule50",
+                "command": "extension.rule49",
                "title": "$(rocket) zz: 只包含数字"
            },
            {
-                "command": "extension.rule51",
+                "command": "extension.rule50",
                "title": "$(rocket) zz: html标签(宽松匹配)"
            },
            {
-                "command": "extension.rule52",
+                "command": "extension.rule51",
                "title": "$(rocket) zz: 匹配中文汉字和中文标点"
            },
+            {
+                "command": "extension.rule52",
+                "title": "$(rocket) zz: qq号格式正确"
+            },
            {
                "command": "extension.rule53",
-                "title": "$(rocket) zz: 大写英文字母"
+                "title": "$(rocket) zz: 数字和字母组成"
            },
            {
                "command": "extension.rule54",
+                "title": "$(rocket) zz: 英文字母"
+            },
+            {
+                "command": "extension.rule55",
+                "title": "$(rocket) zz: 小写英文字母组成"
+            },
+            {
+                "command": "extension.rule56",
+                "title": "$(rocket) zz: 大写英文字母"
+            },
+            {
+                "command": "extension.rule57",
                "title": "$(rocket) zz: 密码强度校验，最少6位，包括至少1个大写字母，1个小写字母，1个数字，1个特殊字符"
            },
            {
-                "command": "extension.rule59",
+                "command": "extension.rule58",
                "title": "$(rocket) zz: 用户名校验，4到16位（字母，数字，下划线，减号）"
            },
            {
-                "command": "extension.rule60",
+                "command": "extension.rule59",
                "title": "$(rocket) zz: ip-v4[:端口]"
            },
            {
-                "command": "extension.rule61",
+                "command": "extension.rule60",
                "title": "$(rocket) zz: ip-v6[:端口]"
            },
            {
-                "command": "extension.rule62",
+                "command": "extension.rule61",
                "title": "$(rocket) zz: 16进制颜色"
            },
            {
-                "command": "extension.rule63",
+                "command": "extension.rule62",
                "title": "$(rocket) zz: 微信号(wx)，6至20位，以字母开头，字母，数字，减号，下划线"
            },
            {
-                "command": "extension.rule64",
+                "command": "extension.rule63",
                "title": "$(rocket) zz: 邮政编码(中国)"
            },
            {
-                "command": "extension.rule65",
+                "command": "extension.rule64",
                "title": "$(rocket) zz: 中文和数字"
            },
            {
-                "command": "extension.rule66",
+                "command": "extension.rule65",
                "title": "$(rocket) zz: 不能包含字母"
            },
            {
-                "command": "extension.rule67",
+                "command": "extension.rule66",
                "title": "$(rocket) zz: java包名"
            },
            {
-                "command": "extension.rule68",
+                "command": "extension.rule67",
                "title": "$(rocket) zz: mac地址"
            },
            {
-                "command": "extension.rule69",
+                "command": "extension.rule68",
                "title": "$(rocket) zz: 匹配连续重复的字符"
            },
            {
-                "command": "extension.rule70",
+                "command": "extension.rule69",
                "title": "$(rocket) zz: 数字和英文字母组成，并且同时含有数字和英文字母"
            },
            {
-                "command": "extension.rule71",
+                "command": "extension.rule70",
                "title": "$(rocket) zz: 香港身份证 "
            },
            {
-                "command": "extension.rule72",
+                "command": "extension.rule71",
                "title": "$(rocket) zz: 澳门身份证 "
            },
            {
-                "command": "extension.rule73",
+                "command": "extension.rule72",
                "title": "$(rocket) zz: 台湾身份证 "
            },
            {
-                "command": "extension.rule74",
+                "command": "extension.rule73",
                "title": "$(rocket) zz: 大写字母，小写字母，数字，特殊符号 `@#$%^&*`~()-+=` 中任意3项密码"
            },
            {
-                "command": "extension.rule75",
+                "command": "extension.rule74",
                "title": "$(rocket) zz: ASCII码表中的全部的特殊字符"
            },
            {
-                "command": "extension.rule76",
+                "command": "extension.rule75",
                "title": "$(rocket) zz: 正整数，不包含0"
            },
            {
-                "command": "extension.rule77",
+                "command": "extension.rule76",
                "title": "$(rocket) zz: 负整数，不包含0"
            },
            {
-                "command": "extension.rule78",
+                "command": "extension.rule77",
                "title": "$(rocket) zz: 整数"
            },
            {
-                "command": "extension.rule79",
+                "command": "extension.rule78",
                "title": "$(rocket) zz: 浮点数"
            },
            {
-                "command": "extension.rule80",
+                "command": "extension.rule79",
                "title": "$(rocket) zz: 浮点数(严格)"
            },
            {
-                "command": "extension.rule81",
+                "command": "extension.rule80",
                "title": "$(rocket) zz: email(支持中文邮箱)"
            },
+            {
+                "command": "extension.rule81",
+                "title": "$(rocket) zz: 域名(非网址, 不包含协议)"
+            },
+            {
+                "command": "extension.rule82",
+                "title": "$(rocket) zz: 军官/士兵证"
+            },
+            {
+                "command": "extension.rule83",
+                "title": "$(rocket) zz: 户口薄"
+            },
            {
                "command": "extension.rule.callByMenu",
-                "title": "🦕正则大全(83条)"
+                "title": "🦕正则大全(84条)"
            }
        ]
    },
@ -412,4 +436,4 @@
        "axios": "^0.19.2",
        "transliteration": "^2.1.8"
    }
-}
+}