From ccc0a99d6894844d83d751b924cfebe74da7826c Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:20:43 +0800
Subject: [PATCH] 同步主线的代码，保持一致性
---
src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java
index 60ee987..ca637dd 100644
--- a/src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java
@@ -11,16 +11,23 @@
@PropertySource(value = {"classpath:git.properties" }, ignoreResourceNotFound = true)
public class GitUtil {
- @Value("${git.branch:null}")
+ @Value("${git.branch:}")
private String branch;
- @Value("${git.commit.id:null}")
+ @Value("${git.commit.id:}")
private String gitCommitId;
- @Value("${git.remote.origin.url:null}")
+ @Value("${git.remote.origin.url:}")
private String gitUrl;
- @Value("${git.build.time:null}")
+ @Value("${git.build.time:}")
private String buildDate;
- @Value("${git.commit.id.abbrev:null}")
+
+ @Value("${git.build.version:}")
+ private String buildVersion;
+
+ @Value("${git.commit.id.abbrev:}")
private String commitIdShort;
+
+ @Value("${git.commit.time:}")
+ private String commitTime;
public String getGitCommitId() {
return gitCommitId;
@@ -41,4 +48,12 @@
public String getCommitIdShort() {
return commitIdShort;
}
+
+ public String getBuildVersion() {
+ return buildVersion;
+ }
+
+ public String getCommitTime() {
+ return commitTime;
+ }
}
--
Gitblit v1.8.0