From c56258ba8ae5e1975eb4cf7daa220a4c748b1115 Mon Sep 17 00:00:00 2001
From: ljm <1271952916@qq.com>
Date: 星期二, 01 十一月 2022 17:25:47 +0800
Subject: [PATCH] 【同步设备通道】第一次收到同步请求应该将通道放入 不然会造成通道数量不一致 同步时也会漏掉第一个通道
---
src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java b/src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java
index 4ff5eba..eb408ab 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java
@@ -2,35 +2,24 @@
import com.genersoft.iot.vmp.common.VersionPo;
import com.genersoft.iot.vmp.utils.GitUtil;
-import com.genersoft.iot.vmp.utils.JarFileUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.util.Map;
@Component
public class VersionInfo {
@Autowired
- VersionConfig config;
- @Autowired
GitUtil gitUtil;
- @Autowired
- JarFileUtils jarFileUtils;
public VersionPo getVersion() {
VersionPo versionPo = new VersionPo();
- Map<String,String> map=jarFileUtils.readJarFile();
versionPo.setGIT_Revision(gitUtil.getGitCommitId());
- versionPo.setCreate_By(map.get("Created-By"));
versionPo.setGIT_BRANCH(gitUtil.getBranch());
versionPo.setGIT_URL(gitUtil.getGitUrl());
versionPo.setBUILD_DATE(gitUtil.getBuildDate());
- versionPo.setArtifactId(config.getArtifactId());
versionPo.setGIT_Revision_SHORT(gitUtil.getCommitIdShort());
- versionPo.setVersion(config.getVersion());
- versionPo.setProject(config.getDescription());
- versionPo.setBuild_Jdk(map.get("Build-Jdk"));
+ versionPo.setVersion(gitUtil.getBuildVersion());
+ versionPo.setGIT_DATE(gitUtil.getCommitTime());
return versionPo;
}
--
Gitblit v1.8.0