From 375cd035755ca4485893a9524b4ce670ac46732d Mon Sep 17 00:00:00 2001
From: lin <lin@pop-os.localdomain>
Date: 星期一, 06 二月 2023 16:43:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 d6dc943..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,22 +11,22 @@
@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.build.version:null}")
+ @Value("${git.build.version:}")
private String buildVersion;
- @Value("${git.commit.id.abbrev:null}")
+ @Value("${git.commit.id.abbrev:}")
private String commitIdShort;
- @Value("${git.commit.time:null}")
+ @Value("${git.commit.time:}")
private String commitTime;
public String getGitCommitId() {
--
Gitblit v1.8.0