Skip to content

Commit d2b2725

Browse files
sparrowzoosparrowzoo
committed
modify result
1 parent 9ee9329 commit d2b2725

File tree

18 files changed

+35
-35
lines changed

18 files changed

+35
-35
lines changed

Diff for: ‎sparrow-aop/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<parent>
66
<artifactId>sparrow-bom</artifactId>
77
<groupId>com.sparrowzoo</groupId>
8-
<version>1.0.4-RELEASE</version>
8+
<version>1.0.5-SNAPSHOT</version>
99
<relativePath/>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
12-
<version>1.0.4-RELEASE</version>
12+
<version>1.0.5-SNAPSHOT</version>
1313
<artifactId>sparrow-aop</artifactId>
1414
<properties>
1515
<curator.version>2.10.0</curator.version>

Diff for: ‎sparrow-container/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<parent>
2323
<artifactId>sparrow-bom</artifactId>
2424
<groupId>com.sparrowzoo</groupId>
25-
<version>1.0.4-RELEASE</version>
25+
<version>1.0.5-SNAPSHOT</version>
2626
<relativePath/>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929
<artifactId>sparrow-container</artifactId>
30-
<version>1.0.4-RELEASE</version>
30+
<version>1.0.5-SNAPSHOT</version>
3131
<dependencies>
3232
<dependency>
3333
<groupId>com.sparrowzoo</groupId>

Diff for: ‎sparrow-data-source/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<parent>
2323
<artifactId>sparrow-bom</artifactId>
2424
<groupId>com.sparrowzoo</groupId>
25-
<version>1.0.4-RELEASE</version>
25+
<version>1.0.5-SNAPSHOT</version>
2626
<relativePath/>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
29-
<version>1.0.4-RELEASE</version>
29+
<version>1.0.5-SNAPSHOT</version>
3030
<artifactId>sparrow-data-source</artifactId>
3131

3232
<dependencies>

Diff for: ‎sparrow-json/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<parent>
2323
<artifactId>sparrow-bom</artifactId>
2424
<groupId>com.sparrowzoo</groupId>
25-
<version>1.0.4-RELEASE</version>
25+
<version>1.0.5-SNAPSHOT</version>
2626
<relativePath/>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
29-
<version>1.0.4-RELEASE</version>
29+
<version>1.0.5-SNAPSHOT</version>
3030

3131
<artifactId>sparrow-json</artifactId>
3232
<dependencies>

Diff for: ‎sparrow-loader/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<parent>
2323
<artifactId>sparrow-bom</artifactId>
2424
<groupId>com.sparrowzoo</groupId>
25-
<version>1.0.4-RELEASE</version>
25+
<version>1.0.5-SNAPSHOT</version>
2626
<relativePath/>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929
<artifactId>sparrow-loader</artifactId>
30-
<version>1.0.4-RELEASE</version>
30+
<version>1.0.5-SNAPSHOT</version>
3131
<dependencies>
3232
<dependency>
3333
<groupId>com.sparrowzoo</groupId>

Diff for: ‎sparrow-log/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>sparrow-bom</artifactId>
77
<groupId>com.sparrowzoo</groupId>
8-
<version>1.0.4-RELEASE</version>
8+
<version>1.0.5-SNAPSHOT</version>
99
<relativePath/>
1010

1111
</parent>
1212
<modelVersion>4.0.0</modelVersion>
13-
<version>1.0.4-RELEASE</version>
13+
<version>1.0.5-SNAPSHOT</version>
1414
<artifactId>sparrow-log</artifactId>
1515
<dependencies>
1616
<dependency>

Diff for: ‎sparrow-markdown/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<parent>
66
<artifactId>sparrow-bom</artifactId>
77
<groupId>com.sparrowzoo</groupId>
8-
<version>1.0.4-RELEASE</version>
8+
<version>1.0.5-SNAPSHOT</version>
99
<relativePath/>
1010

1111
</parent>
1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>sparrow-markdown</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.0.4-RELEASE</version>
15+
<version>1.0.5-SNAPSHOT</version>
1616

1717
<dependencies>
1818
<dependency>

Diff for: ‎sparrow-mvc-thymeleaf/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<parent>
2323
<groupId>com.sparrowzoo</groupId>
2424
<artifactId>sparrow-bom</artifactId>
25-
<version>1.0.4-RELEASE</version>
25+
<version>1.0.5-SNAPSHOT</version>
2626
<relativePath/>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929
<artifactId>sparrow-mvc-thymeleaf</artifactId>
30-
<version>1.0.4-RELEASE</version>
30+
<version>1.0.5-SNAPSHOT</version>
3131
<properties>
3232
<maven.compiler.source>8</maven.compiler.source>
3333
<maven.compiler.target>8</maven.compiler.target>

Diff for: ‎sparrow-mvc/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<parent>
2222
<groupId>com.sparrowzoo</groupId>
2323
<artifactId>sparrow-bom</artifactId>
24-
<version>1.0.4-RELEASE</version>
24+
<version>1.0.5-SNAPSHOT</version>
2525
<relativePath/>
2626
</parent>
2727
<artifactId>sparrow-mvc</artifactId>
28-
<version>1.0.4-RELEASE</version>
28+
<version>1.0.5-SNAPSHOT</version>
2929
<dependencies>
3030
<dependency>
3131
<groupId>com.sparrowzoo</groupId>

Diff for: ‎sparrow-orm/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<parent>
2323
<artifactId>sparrow-bom</artifactId>
2424
<groupId>com.sparrowzoo</groupId>
25-
<version>1.0.4-RELEASE</version>
25+
<version>1.0.5-SNAPSHOT</version>
2626
<relativePath/>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

3030
<artifactId>sparrow-orm</artifactId>
31-
<version>1.0.4-RELEASE</version>
31+
<version>1.0.5-SNAPSHOT</version>
3232
<dependencies>
3333
<dependency>
3434
<groupId>com.sparrowzoo</groupId>

Diff for: ‎sparrow-protocol-dao/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>sparrow-bom</artifactId>
77
<groupId>com.sparrowzoo</groupId>
8-
<version>1.0.4-RELEASE</version>
8+
<version>1.0.5-SNAPSHOT</version>
99
<relativePath/>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
1212
<artifactId>sparrow-protocol-dao</artifactId>
13-
<version>1.0.4-RELEASE</version>
13+
<version>1.0.5-SNAPSHOT</version>
1414
<properties>
1515
<maven.compiler.source>8</maven.compiler.source>
1616
<maven.compiler.target>8</maven.compiler.target>

Diff for: ‎sparrow-protocol-mq/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>sparrow-bom</artifactId>
77
<groupId>com.sparrowzoo</groupId>
8-
<version>1.0.4-RELEASE</version>
8+
<version>1.0.5-SNAPSHOT</version>
99
<relativePath/>
1010

1111
</parent>
1212
<modelVersion>4.0.0</modelVersion>
13-
<version>1.0.4-RELEASE</version>
13+
<version>1.0.5-SNAPSHOT</version>
1414

1515
<artifactId>sparrow-protocol-mq</artifactId>
1616

Diff for: ‎sparrow-protocol/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<parent>
66
<artifactId>sparrow-bom</artifactId>
77
<groupId>com.sparrowzoo</groupId>
8-
<version>1.0.4-RELEASE</version>
8+
<version>1.0.5-SNAPSHOT</version>
99
<relativePath/>
1010
</parent>
1111
<packaging>jar</packaging>
1212
<modelVersion>4.0.0</modelVersion>
1313
<artifactId>sparrow-protocol</artifactId>
14-
<version>1.0.4-RELEASE</version>
14+
<version>1.0.5-SNAPSHOT</version>
1515

1616
<build>
1717
<plugins>

Diff for: ‎sparrow-registry/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<parent>
66
<artifactId>sparrow-bom</artifactId>
77
<groupId>com.sparrowzoo</groupId>
8-
<version>1.0.4-RELEASE</version>
8+
<version>1.0.5-SNAPSHOT</version>
99
<relativePath/>
1010

1111
</parent>
1212
<modelVersion>4.0.0</modelVersion>
13-
<version>1.0.4-RELEASE</version>
13+
<version>1.0.5-SNAPSHOT</version>
1414
<artifactId>sparrow-registry</artifactId>
1515
<properties>
1616
<curator.version>2.10.0</curator.version>

Diff for: ‎sparrow-rocketmq-client/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<parent>
2323
<artifactId>sparrow-bom</artifactId>
2424
<groupId>com.sparrowzoo</groupId>
25-
<version>1.0.4-RELEASE</version>
25+
<version>1.0.5-SNAPSHOT</version>
2626
<relativePath/>
2727

2828
</parent>
2929
<modelVersion>4.0.0</modelVersion>
3030
<artifactId>sparrow-rocketmq-client</artifactId>
3131
<name>${project.artifactId}</name>
32-
<version>1.0.4-RELEASE</version>
32+
<version>1.0.5-SNAPSHOT</version>
3333
<dependencies>
3434
<dependency>
3535
<groupId>com.sparrowzoo</groupId>

Diff for: ‎sparrow-test/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
<parent>
2222
<artifactId>sparrow-bom</artifactId>
2323
<groupId>com.sparrowzoo</groupId>
24-
<version>1.0.4-RELEASE</version>
24+
<version>1.0.5-SNAPSHOT</version>
2525
<relativePath/>
2626

2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
29-
<version>1.0.4-RELEASE</version>
29+
<version>1.0.5-SNAPSHOT</version>
3030
<artifactId>sparrow-test</artifactId>
3131
<packaging>war</packaging>
3232

Diff for: ‎sparrow/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<parent>
2424
<groupId>com.sparrowzoo</groupId>
2525
<artifactId>sparrow-bom</artifactId>
26-
<version>1.0.4-RELEASE</version>
26+
<version>1.0.5-SNAPSHOT</version>
2727
<relativePath/>
2828
</parent>
2929
<modelVersion>4.0.0</modelVersion>
3030
<artifactId>sparrow</artifactId>
31-
<version>1.0.4-RELEASE</version>
31+
<version>1.0.5-SNAPSHOT</version>
3232
<dependencies>
3333
<dependency>
3434
<groupId>javax.servlet</groupId>

Diff for: ‎sparrow/src/main/java/com/sparrow/constant/Regex.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public class Regex {
106106
* 密码格式
107107
* 至少8个字符，至少1个字母，1个数字和1个特殊字符
108108
*/
109-
public static final String PASSWORD = "^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{8,}$";
109+
public static final String PASSWORD = "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[$@$!%*#?&])[A-Za-z\\d$@$!%*#?&]{8,}$";
110110

111111
public static final Pattern BAIDU_IMAGE_SEARCH = Pattern.compile(
112112
"var imgdata=([\\s\\S]*?)<\\/script>", Regex.OPTION_MULTILINE_CASE_INSENSITIVE);

0 commit comments

Comments
 (0)