Skip to content

Commit bfee976

Browse files
fix: 修复idea废弃api
1 parent 20b2e0d commit bfee976

File tree

6 files changed

+17
-14
lines changed

6 files changed

+17
-14
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repositories {
2222

2323
dependencies {
2424
api 'uk.com.robust-it:cloning:1.9.12'
25-
api 'commons-io:commons-io:2.11.0'
25+
api 'org.apache.commons:commons-text:1.11.0'
2626
testImplementation 'junit:junit:4.13.2'
2727
}
2828

@@ -35,6 +35,7 @@ intellij {
3535
updateSinceUntilBuild = false
3636
buildSearchableOptions.enabled = false
3737

38+
3839
runIde {
3940
jvmArgs = project.runIdeJvmArgs.split(',').toList()
4041
}

src/main/java/com/fulinlin/constant/GitCommitConstants.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ public class GitCommitConstants {
99

1010
public static final String ACTION_PREFIX = "$APP_CONFIG$/GitCommitMessageHelperSettings";
1111

12-
public static final String DEFAULT_TEMPLATE = "#if($type)${type}#end#if($scope)(${scope})#end: #if($subject)${subject}#end" +
13-
"#if($body)${newline}${newline}${body}#end" +
14-
"#if($changes)${newline}${newline}BREAKING CHANGE: ${changes}#end" +
15-
"#if($closes)${newline}${newline}Closes ${closes}#end";
12+
public static final String DEFAULT_TEMPLATE = "#if($type)${type}#end#if($scope)(${scope})#end: #if($subject)${subject}#end\n" +
13+
"#if($body)${newline}${newline}${body}#end\n" +
14+
"#if($changes)${newline}${newline}BREAKING CHANGE: ${changes}#end\n" +
15+
"#if($closes)${newline}${newline}Closes ${closes}#end\n";
1616
}

src/main/java/com/fulinlin/model/DomainObject.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.fulinlin.model;
22

3-
import org.apache.commons.lang.builder.EqualsBuilder;
4-
import org.apache.commons.lang.builder.HashCodeBuilder;
5-
import org.apache.commons.lang.builder.ReflectionToStringBuilder;
3+
import org.apache.commons.lang3.builder.EqualsBuilder;
4+
import org.apache.commons.lang3.builder.HashCodeBuilder;
5+
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
66

77
public abstract class DomainObject {
88

src/main/java/com/fulinlin/model/TypeAlias.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.fulinlin.model;
22

3-
import org.apache.commons.lang.StringEscapeUtils;
3+
4+
import org.apache.commons.text.StringEscapeUtils;
5+
46

57
/**
68
* @program: git-commit-message-helper

src/main/java/com/fulinlin/ui/commit/CommitMessage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private String buildContent(GitCommitMessageHelperSettings settings,
5555
if (StringUtils.isNotBlank(closedIssues)) {
5656
commitTemplate.setCloses(closedIssues);
5757
}
58-
String template = settings.getDateSettings().getTemplate();
58+
String template = settings.getDateSettings().getTemplate().replaceAll("\\n", "");
5959
return VelocityUtils.convert(template, commitTemplate);
6060
}
6161

src/main/resources/i18n/info_zh.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ commit.cancel.button=取消
3030
# init git commit type description
3131
feature.description=新功能
3232
fix.description=错误修复
33-
docs.description=更改文档
34-
style.description=代码格式(不影响功能,例如空格、分号等格式修正)
33+
docs.description=修改文档
34+
style.description=格式修改(不影响功能,例如空格、分号等格式修正)
3535
refactor.description=代码重构
3636
perf.description=代码优化
37-
test.description=增加测试
37+
test.description=新增测试
3838
build.description=构建依赖更改
3939
ci.description=更改 CI 配置文件或者脚本
40-
chore.description=改变构建流程、或者增加依赖库、工具等
40+
chore.description=更改构建流程、或者增加依赖库、工具等
4141
revert.description=代码回退

0 commit comments

Comments
 (0)