Skip to content

Commit f5477e6

Browse files
Amos09Amos09
committed
调整脚手架
1 parent ba428a5 commit f5477e6

File tree

38 files changed

+660
-2982
lines changed

38 files changed

+660
-2982
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
####***module***

‎archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<archetype-descriptor
3-
xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 http://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd"
4-
name="saltyfish-boot-archetype"
5-
xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0"
6-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<archetype-descriptor xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 http://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd" name="saltyfish-boot-archetype"
3+
xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
75
<fileSets>
86
<fileSet filtered="true" encoding="UTF-8">
97
<directory>docs/dev-ops</directory>
@@ -36,6 +34,7 @@
3634
<directory>.etc/git-hooks</directory>
3735
<includes>
3836
<include>**/*.</include>
37+
<include>pre-commit</include>
3938
</includes>
4039
</fileSet>
4140
<fileSet filtered="true" encoding="UTF-8">
@@ -52,6 +51,7 @@
5251
<include>.gitattributes</include>
5352
<include>.gitignore</include>
5453
<include>CHANGELOG.md</include>
54+
<include>README.md</include>
5555
</includes>
5656
</fileSet>
5757
</fileSets>
@@ -106,8 +106,7 @@
106106
</fileSet>
107107
</fileSets>
108108
</module>
109-
<module id="${rootArtifactId}-integration" dir="__rootArtifactId__-integration"
110-
name="${rootArtifactId}-integration">
109+
<module id="${rootArtifactId}-integration" dir="__rootArtifactId__-integration" name="${rootArtifactId}-integration">
111110
<fileSets>
112111
<fileSet packaged="true" encoding="UTF-8">
113112
<directory>src/main/java</directory>
@@ -129,8 +128,7 @@
129128
</fileSet>
130129
</fileSets>
131130
</module>
132-
<module id="${rootArtifactId}-infrastructure" dir="__rootArtifactId__-infrastructure"
133-
name="${rootArtifactId}-infrastructure">
131+
<module id="${rootArtifactId}-infrastructure" dir="__rootArtifactId__-infrastructure" name="${rootArtifactId}-infrastructure">
134132
<fileSets>
135133
<fileSet filtered="true" packaged="true" encoding="UTF-8">
136134
<directory>src/main/java</directory>

‎archetype/src/main/resources/archetype-resources/.etc/checkstyle/checkstyle-suppressions.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#set( $symbol_pound = '#' )
2+
#set( $symbol_dollar = '$' )
3+
#set( $symbol_escape = '\' )
14
<?xml version="1.0"?>
25

36
<!DOCTYPE suppressions PUBLIC

‎archetype/src/main/resources/archetype-resources/.etc/checkstyle/checkstyle.xml

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#set( $symbol_pound = '#' )
2+
#set( $symbol_dollar = '$' )
3+
#set( $symbol_escape = '\' )
14
<?xml version="1.0"?>
25
<!DOCTYPE module PUBLIC
36
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
@@ -20,7 +23,7 @@
2023
<module name="SuppressWarningsFilter"/>
2124

2225
<module name="BeforeExecutionExclusionFileFilter">
23-
<property name="fileNamePattern" value="module\-info\.java$"/>
26+
<property name="fileNamePattern" value="module${symbol_escape}-info${symbol_escape}.java${symbol_dollar}"/>
2427
</module>
2528

2629
<module name="SuppressionFilter">
@@ -45,7 +48,7 @@
4548
<module name="IllegalTokenText">
4649
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
4750
<property name="format"
48-
value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
51+
value="${symbol_escape}${symbol_escape}u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|${symbol_escape}${symbol_escape}(0(10|11|12|14|15|42|47)|134)"/>
4952
<property name="message"
5053
value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
5154
</module>
@@ -163,7 +166,7 @@
163166
<module name="PackageName">
164167
<message key="name.invalidPattern"
165168
value="Package name ''{0}'' must match pattern ''{1}''."/>
166-
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
169+
<property name="format" value="^[a-z]+(${symbol_escape}.[a-z][a-z0-9]*)*${symbol_dollar}"/>
167170
</module>
168171
<module name="TypeName">
169172
<message key="name.invalidPattern"
@@ -174,61 +177,61 @@
174177
<module name="MemberName">
175178
<message key="name.invalidPattern"
176179
value="Member name ''{0}'' must match pattern ''{1}''."/>
177-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
180+
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*${symbol_dollar}"/>
178181
</module>
179182
<module name="ParameterName">
180183
<message key="name.invalidPattern"
181184
value="Parameter name ''{0}'' must match pattern ''{1}''."/>
182-
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
185+
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?${symbol_dollar}"/>
183186
</module>
184187
<module name="LambdaParameterName">
185188
<message key="name.invalidPattern"
186189
value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
187-
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
190+
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?${symbol_dollar}"/>
188191
</module>
189192
<module name="CatchParameterName">
190193
<message key="name.invalidPattern"
191194
value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
192-
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
195+
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?${symbol_dollar}"/>
193196
</module>
194197
<module name="LocalVariableName">
195198
<message key="name.invalidPattern"
196199
value="Local variable name ''{0}'' must match pattern ''{1}''."/>
197-
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
200+
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?${symbol_dollar}"/>
198201
</module>
199202
<module name="PatternVariableName">
200203
<message key="name.invalidPattern"
201204
value="Pattern variable name ''{0}'' must match pattern ''{1}''."/>
202-
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
205+
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?${symbol_dollar}"/>
203206
</module>
204207
<module name="ClassTypeParameterName">
205208
<message key="name.invalidPattern"
206209
value="Class type name ''{0}'' must match pattern ''{1}''."/>
207-
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
210+
<property name="format" value="(^[A-Z][0-9]?)${symbol_dollar}|([A-Z][a-zA-Z0-9]*[T]${symbol_dollar})"/>
208211
</module>
209212
<module name="RecordComponentName">
210213
<message key="name.invalidPattern" value="Record component name ''{0}'' must match pattern ''{1}''."/>
211-
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
214+
<property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?${symbol_dollar}"/>
212215
</module>
213216
<module name="RecordTypeParameterName">
214217
<message key="name.invalidPattern"
215218
value="Record type name ''{0}'' must match pattern ''{1}''."/>
216-
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
219+
<property name="format" value="(^[A-Z][0-9]?)${symbol_dollar}|([A-Z][a-zA-Z0-9]*[T]${symbol_dollar})"/>
217220
</module>
218221
<module name="RecordTypeParameterName">
219222
<message key="name.invalidPattern"
220223
value="Record type name ''{0}'' must match pattern ''{1}''."/>
221-
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
224+
<property name="format" value="(^[A-Z][0-9]?)${symbol_dollar}|([A-Z][a-zA-Z0-9]*[T]${symbol_dollar})"/>
222225
</module>
223226
<module name="MethodTypeParameterName">
224227
<message key="name.invalidPattern"
225228
value="Method type name ''{0}'' must match pattern ''{1}''."/>
226-
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
229+
<property name="format" value="(^[A-Z][0-9]?)${symbol_dollar}|([A-Z][a-zA-Z0-9]*[T]${symbol_dollar})"/>
227230
</module>
228231
<module name="InterfaceTypeParameterName">
229232
<message key="name.invalidPattern"
230233
value="Interface type name ''{0}'' must match pattern ''{1}''."/>
231-
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
234+
<property name="format" value="(^[A-Z][0-9]?)${symbol_dollar}|([A-Z][a-zA-Z0-9]*[T]${symbol_dollar})"/>
232235
</module>
233236
<module name="NoFinalizer"/>
234237
<module name="GenericWhitespace">
@@ -265,7 +268,7 @@
265268
<module name="CustomImportOrder">
266269
<property name="sortImportsInGroupAlphabetically" value="true"/>
267270
<property name="separateLineBetweenGroups" value="true"/>
268-
<property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
271+
<property name="customImportOrderRules" value="STATIC${symbol_pound}${symbol_pound}${symbol_pound}THIRD_PARTY_PACKAGE"/>
269272
<property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
270273
</module>
271274
<module name="MethodParamPad">
@@ -349,7 +352,7 @@
349352
<module name="MethodName">
350353
<message key="name.invalidPattern"
351354
value="Method name ''{0}'' must match pattern ''{1}''."/>
352-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
355+
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*${symbol_dollar}"/>
353356
</module>
354357
<module name="SingleLineJavadoc">
355358
<property name="ignoreInlineTags" value="false"/>
@@ -362,18 +365,18 @@
362365
</module>
363366
<module name="SuppressionXpathFilter">
364367
<property default="checkstyle-xpath-suppressions.xml" name="file"
365-
value="${org.checkstyle.google.suppressionxpathfilter.config}"/>
368+
value="${symbol_dollar}{org.checkstyle.google.suppressionxpathfilter.config}"/>
366369
<property name="optional" value="true"/>
367370
</module>
368371
<module name="SuppressWarningsHolder"/>
369372
<module name="SuppressionCommentFilter">
370-
<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
371-
<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
372-
<property name="checkFormat" value="$1"/>
373+
<property name="offCommentFormat" value="CHECKSTYLE.OFF${symbol_escape}: ([${symbol_escape}w${symbol_escape}|]+)"/>
374+
<property name="onCommentFormat" value="CHECKSTYLE.ON${symbol_escape}: ([${symbol_escape}w${symbol_escape}|]+)"/>
375+
<property name="checkFormat" value="${symbol_dollar}1"/>
373376
</module>
374377
<module name="SuppressWithNearbyCommentFilter">
375-
<property name="commentFormat" value="CHECKSTYLE.SUPPRESS\: ([\w\|]+)"/>
376-
<property name="checkFormat" value="$1"/>
378+
<property name="commentFormat" value="CHECKSTYLE.SUPPRESS${symbol_escape}: ([${symbol_escape}w${symbol_escape}|]+)"/>
379+
<property name="checkFormat" value="${symbol_dollar}1"/>
377380
<property name="influenceFormat" value="1"/>
378381
</module>
379382
</module>

‎archetype/src/main/resources/archetype-resources/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
####***module***

0 commit comments

Comments
 (0)