首页改造完成,添加系统信息

src/main/java/com/genersoft/iot/vmp/common/VersionPo.java

@@ -6,28 +6,33 @@ public class VersionPo {
     /**
      * git的全版本号
      */
-    @JSONField(name="GIT-Revision")
+    @JSONField(name="GIT_Revision")
     private String GIT_Revision;
     /**
      * maven版本
      */
-    @JSONField(name = "Create-By")
+    @JSONField(name = "Create_By")
     private String Create_By;
     /**
      * git的分支
      */
-    @JSONField(name = "GIT-BRANCH")
+    @JSONField(name = "GIT_BRANCH")
     private String GIT_BRANCH;
     /**
      * git的url
      */
-    @JSONField(name = "GIT-URL")
+    @JSONField(name = "GIT_URL")
     private String GIT_URL;
     /**
      * 构建日期
      */
-    @JSONField(name = "BUILD-DATE")
+    @JSONField(name = "BUILD_DATE")
     private String BUILD_DATE;
+    /**
+     * 构建日期
+     */
+    @JSONField(name = "GIT_DATE")
+    private String GIT_DATE;
     /**
      * 项目名称 配合pom使用
      */
@@ -36,7 +41,7 @@ public class VersionPo {
     /**
      * git局部版本号
      */
-    @JSONField(name = "GIT-Revision-SHORT")
+    @JSONField(name = "GIT_Revision_SHORT")
     private String GIT_Revision_SHORT;
     /**
      * 项目的版本如2.0.1.0 配合pom使用
@@ -133,4 +138,12 @@ public class VersionPo {
     public String getBuild_Jdk() {
         return Build_Jdk;
     }
+
+    public String getGIT_DATE() {
+        return GIT_DATE;
+    }
+
+    public void setGIT_DATE(String GIT_DATE) {
+        this.GIT_DATE = GIT_DATE;
+    }
 }

src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java

@@ -19,6 +19,7 @@ public class VersionInfo {
         versionPo.setBUILD_DATE(gitUtil.getBuildDate());
         versionPo.setGIT_Revision_SHORT(gitUtil.getCommitIdShort());
         versionPo.setVersion(gitUtil.getBuildVersion());
+        versionPo.setGIT_DATE(gitUtil.getCommitTime());
 
         return versionPo;
     }

src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java

@@ -13,7 +13,7 @@ public class GitUtil {
 
     @Value("${git.branch:}")
     private String branch;
-    @Value("${git.commit.id.abbrev:}")
+    @Value("${git.commit.id:}")
     private String gitCommitId;
     @Value("${git.remote.origin.url:}")
     private String gitUrl;

src/main/java/com/genersoft/iot/vmp/vmanager/bean/SystemConfigInfo.java

@@ -0,0 +1,47 @@
+package com.genersoft.iot.vmp.vmanager.bean;
+
+import com.genersoft.iot.vmp.common.VersionPo;
+import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.conf.VersionInfo;
+
+public class SystemConfigInfo {
+
+    private int serverPort;
+    private SipConfig sip;
+    private UserSetting addOn;
+    private VersionPo version;
+
+    public int getServerPort() {
+        return serverPort;
+    }
+
+    public void setServerPort(int serverPort) {
+        this.serverPort = serverPort;
+    }
+
+    public SipConfig getSip() {
+        return sip;
+    }
+
+    public void setSip(SipConfig sip) {
+        this.sip = sip;
+    }
+
+    public UserSetting getAddOn() {
+        return addOn;
+    }
+
+    public void setAddOn(UserSetting addOn) {
+        this.addOn = addOn;
+    }
+
+    public VersionPo getVersion() {
+        return version;
+    }
+
+    public void setVersion(VersionPo version) {
+        this.version = version;
+    }
+}
+

src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java

@@ -19,6 +19,7 @@ import com.genersoft.iot.vmp.utils.SpringBeanFactory;
 import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
 import com.genersoft.iot.vmp.vmanager.bean.ResourceInfo;
+import com.genersoft.iot.vmp.vmanager.bean.SystemConfigInfo;
 import gov.nist.javax.sip.SipStackImpl;
 
 import io.swagger.v3.oas.annotations.Operation;
@@ -184,6 +185,18 @@ public class ServerController {
         });
     };
 
+    @Operation(summary = "获取系统信息信息")
+    @GetMapping(value = "/system/configInfo")
+    @ResponseBody
+    public SystemConfigInfo getConfigInfo() {
+        SystemConfigInfo systemConfigInfo = new SystemConfigInfo();
+        systemConfigInfo.setVersion(versionInfo.getVersion());
+        systemConfigInfo.setSip(sipConfig);
+        systemConfigInfo.setAddOn(userSetting);
+        systemConfigInfo.setServerPort(serverPort);
+        return systemConfigInfo;
+    }
+
     @Operation(summary = "获取版本信息")
     @GetMapping(value = "/version")
     @ResponseBody