Skip to content

Commit 4a485ad

Browse files
committed
1.将configuration配置换成json配置
1 parent 0d1a05b commit 4a485ad

3 files changed

Lines changed: 56 additions & 54 deletions

File tree

codeTools/x-RegexTester/src/main/java/com/xwintop/xJavaFxTool/controller/codeTools/RegexTesterController.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
package com.xwintop.xJavaFxTool.controller.codeTools;
1111

1212
import cn.hutool.core.swing.clipboard.ClipboardUtil;
13+
import com.alibaba.fastjson2.JSON;
14+
import com.alibaba.fastjson2.JSONObject;
1315
import com.xwintop.xJavaFxTool.view.codeTools.RegexTesterView;
1416
import com.xwintop.xcore.util.javafx.JavaFxViewUtil;
1517
import javafx.event.ActionEvent;
@@ -27,8 +29,6 @@
2729
import lombok.Getter;
2830
import lombok.Setter;
2931
import lombok.extern.slf4j.Slf4j;
30-
import org.apache.commons.configuration2.PropertiesConfiguration;
31-
import org.apache.commons.configuration2.builder.fluent.Configurations;
3232

3333
import java.net.URL;
3434
import java.util.HashMap;
@@ -60,13 +60,13 @@ public void initialize(URL location, ResourceBundle resources) {
6060
private void initView() throws Exception {
6161
examplesTableColumn0.setCellValueFactory(new MapValueFactory("column0"));
6262
examplesTableColumn1.setCellValueFactory(new MapValueFactory("column1"));
63-
PropertiesConfiguration pcfg = new Configurations().properties(RegexTesterController.class.getResource("/data/regexData.properties"));
64-
pcfg.getKeys().forEachRemaining((String key) -> {
65-
Map<String, String> map = new HashMap<String, String>();
63+
JSONObject pcfg = JSON.parseObject(RegexTesterController.class.getResourceAsStream("/data/regexData.json"));
64+
for (String key : pcfg.keySet()) {
65+
Map<String, String> map = new HashMap<>();
6666
map.put("column0", key);
6767
map.put("column1", pcfg.getString(key));
6868
examplesTableView.getItems().add(map);
69-
});
69+
}
7070
matchTableColumn0.setCellValueFactory(new MapValueFactory("column0"));
7171
matchTableColumn1.setCellValueFactory(new MapValueFactory("column1"));
7272
matchTableColumn2.setCellValueFactory(new MapValueFactory("column2"));
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"Email地址":"\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*",
3+
"HTML标记":"<(\\S*?)[^>]*>.*?</\\1>|<.*? />",
4+
"IP地址":"\\d+\\.\\d+\\.\\d+\\.\\d+",
5+
"m-n位的数字":"^d{m,n}$",
6+
"n位的数字":"^d{n}$",
7+
"xml文件":"^([a-zA-Z]+-?)+[a-zA-Z0-9]+\\.[x|X][m|M][l|L]$",
8+
"中国邮政编码":"[1-9]\\d{5}(?!\\d)",
9+
"中文字符":"[\\u4e00-\\u9fa5]",
10+
"双字节字符":"[^\\x00-\\xff]",
11+
"国内电话号码":"\\d{3}-\\d{8}|\\d{4}-\\d{7}",
12+
"图片引用地址":"\\<img.*src *= *['\"]*(\\S+)[\"'].*\\>",
13+
"域名":"[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(/.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+/.?",
14+
"多行文本":"<tr>([\\s\\S]*?)</tr>",
15+
"帐号是否合法":"^[a-zA-Z][a-zA-Z0-9_]{4,15}$ (字母开头,允许5-16字节,允许字母数字下划线)",
16+
"带1-2位小数的正数或负数":"^(-)?d+(.d{1,2})?$",
17+
"手机号码":"^(13[0-9]|14[5|7]|15[0|1|2|3|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])d{8}$",
18+
"数字":"^[0-9]*$",
19+
"整数":"^-?[1-9]\\d*$",
20+
"日期格式":"^d{4}-d{1,2}-d{1,2}",
21+
"有1~3位小数的正实数":"^[0-9]+(.[0-9]{1,3})?$",
22+
"有两位小数的正实数":"^[0-9]+(.[0-9]{2})?$",
23+
"正数、负数、和小数":"^(-|+)?d+(.d+)?$",
24+
"正整数":"^[1-9]\\d*$",
25+
"正浮点数":"^[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*$",
26+
"浮点数":"^-?([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0)$",
27+
"由26个英文字母的大写组成的字符串":"^[A-Z]+$",
28+
"由26个英文字母的小写组成的字符串":"^[a-z]+$",
29+
"由26个英文字母组成的字符串":"^[A-Za-z]+$",
30+
"由数字、26个英文字母或者下划线组成的字符串":"^\\w+$",
31+
"由数字和26个英文字母组成的字符串":"^[A-Za-z0-9]+$",
32+
"空白行":"\\n\\s*\\r",
33+
"空白行的正则表达式":"\\ns*\\r",
34+
"网址URL":"[a-zA-z]+://[^\\s]*",
35+
"腾讯QQ号":"[1-9][0-9]{4,}",
36+
"至少n位的数字":"^d{n,}$",
37+
"负整数":"^-[1-9]\\d*$",
38+
"负浮点数":"^-([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*)$",
39+
"身份证":"\\d{15}|\\d{18}",
40+
"身份证号(15位、18位数字),最后一位是校验位,可能为数字或字符X":"(^d{15}$)|(^d{18}$)|(^d{17}(d|X|x)$)",
41+
"链接地址":"href *= *['\"]*(\\S+)[\"']",
42+
"链接地址及标题":"\\<a href *= *['\"]*(\\S+)[\"'].*\\>(.[^\\<]*)?\\</a>",
43+
"零和非零开头的数字":"^(0|[1-9][0-9]*)$",
44+
"非正整数(负整数+0)":"^-[1-9]\\d*|0$",
45+
"非正浮点数(负浮点数+0)":"^(-([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*))|0?\\.0+|0$",
46+
"非负整数(正整数+0)":"^[1-9]\\d*|0$",
47+
"非负浮点数(正浮点数+0)":"^[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0$",
48+
"非零开头的最多带两位小数的数字":"^([1-9][0-9]*)+(.[0-9]{1,2})?$",
49+
"首尾空白字符":"^\\s*|\\s*$"
50+
}

codeTools/x-RegexTester/src/main/resources/data/regexData.properties

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)