fix: 错误数据改动

Author: fulin

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

@@ -6,12 +6,12 @@
  * @create: 2019-12-08 11:37
  **/
 public class GitCommitConstants {
- public static final String DEFAULT_TEMPLATE = "${type}(${scope}): ${subject}\n" +
+ public static final String DEFAULT_TEMPLATE = "#if($type)${type}#end#if(${scope})(${scope})#end: #if(${subject})${subject}#end\n" +
  "\n" +
- "${body}\n" +
+ "#if(${body})${body}#end\n" +
  "\n" +
- "BREAKING CHANGE: ${changes}\n" +
+ "#if(${changes})BREAKING CHANGE: ${changes}#end\n" +
  "\n" +
- "Closes ${closes}\n";
+ "#if(${closes})Closes ${closes}#end\n";
 
 }

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

@@ -5,6 +5,8 @@
 import com.fulinlin.model.TypeAlias;
 import com.fulinlin.storage.GitCommitMessageHelperSettings;
 import com.fulinlin.utils.VelocityUtils;
+import com.intellij.openapi.util.text.StringUtil;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.WordUtils;
 
 import static org.apache.commons.lang.StringUtils.isNotBlank;
@@ -38,12 +40,26 @@ private String buildContent(GitCommitMessageHelperSettings settings,
  ) {
 
  CommitTemplate commitTemplate = new CommitTemplate();
- commitTemplate.setType(typeAlias.toString());
- commitTemplate.setScope(changeScope);
- commitTemplate.setSubject(shortDescription);
- commitTemplate.setBody(longDescription);
- commitTemplate.setChanges(breakingChanges);
- commitTemplate.setCloses(closedIssues);
+ if (typeAlias != null) {
+ if (StringUtils.isNotBlank(typeAlias.getTitle())) {
+ commitTemplate.setType(typeAlias.getTitle());
+ }
+ }
+ if (StringUtils.isNotBlank(changeScope)) {
+ commitTemplate.setScope(changeScope);
+ }
+ if (StringUtils.isNotBlank(shortDescription)) {
+ commitTemplate.setSubject(shortDescription);
+ }
+ if (StringUtils.isNotBlank(longDescription)) {
+ commitTemplate.setBody(longDescription);
+ }
+ if (StringUtils.isNotBlank(breakingChanges)) {
+ commitTemplate.setChanges(breakingChanges);
+ }
+ if (StringUtils.isNotBlank(closedIssues)) {
+ commitTemplate.setCloses(closedIssues);
+ }
  String template = settings.getDateSettings().getTemplate();
  return VelocityUtils.convert(template, commitTemplate);
  }

src/main/resources/template/defaultTemplate.vm

@@ -1,22 +1,7 @@
-#set($directoryRoot = "www" )
-#set($templateName = "index.vm" )
-#set($template = "$directoryRoot/$templateName" )
+#if($type)${type}#end#if(${scope})(${scope})#end: #if(${subject})${subject}#end
 
-feat(scope): dep
-
-xzcxz
-
-BREAKING CHANGE: ccccc
-
-Closes #22
-
-
-${type}(${scopr}): ${subject}
-
-${body}
-
-BREAKING CHANGE: ${changes}
-
-Closes ${closes}
+#if(${body})${body}#end
 
+#if(${changes})BREAKING CHANGE: ${changes}#end
 
+#if(${closes})Closes ${closes}#end