From 958474c64691557a3348cbbe7c33a42272f09639 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 24 十月 2022 18:14:31 +0800 Subject: [PATCH] 首页改造完成,添加系统信息 --- src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java | 2 web_src/src/components/console.vue | 17 +++++ src/main/java/com/genersoft/iot/vmp/vmanager/bean/SystemConfigInfo.java | 47 +++++++++++++++ src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java | 1 src/main/java/com/genersoft/iot/vmp/common/VersionPo.java | 25 ++++++-- src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 13 ++++ web_src/src/components/dialog/configInfo.vue | 59 +++++++++++++++++++ 7 files changed, 156 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/common/VersionPo.java b/src/main/java/com/genersoft/iot/vmp/common/VersionPo.java index a7d8ce6..29b2caa 100644 --- a/src/main/java/com/genersoft/iot/vmp/common/VersionPo.java +++ b/src/main/java/com/genersoft/iot/vmp/common/VersionPo.java @@ -6,28 +6,33 @@ /** * 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鐨剈rl */ - @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 @@ /** * 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 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; + } } 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 5551b4f..eb408ab 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/VersionInfo.java @@ -19,6 +19,7 @@ versionPo.setBUILD_DATE(gitUtil.getBuildDate()); versionPo.setGIT_Revision_SHORT(gitUtil.getCommitIdShort()); versionPo.setVersion(gitUtil.getBuildVersion()); + versionPo.setGIT_DATE(gitUtil.getCommitTime()); return versionPo; } 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 ed0e0fd..ca637dd 100644 --- a/src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java +++ b/src/main/java/com/genersoft/iot/vmp/utils/GitUtil.java @@ -13,7 +13,7 @@ @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; diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/SystemConfigInfo.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/SystemConfigInfo.java new file mode 100644 index 0000000..f5a52b9 --- /dev/null +++ b/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; + } +} + diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java index ed6f44d..0c6ca4b 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java @@ -19,6 +19,7 @@ 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 @@ }); }; + @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 diff --git a/web_src/src/components/console.vue b/web_src/src/components/console.vue index 352989f..6e2dd83 100644 --- a/web_src/src/components/console.vue +++ b/web_src/src/components/console.vue @@ -52,6 +52,7 @@ </div> </el-col> </el-row> + <configInfo ref="configInfo"></configInfo> </div> </template> @@ -63,6 +64,7 @@ import consoleNodeLoad from './console/ConsoleNodeLoad.vue' import consoleDisk from './console/ConsoleDisk.vue' import consoleResource from './console/ConsoleResource.vue' +import configInfo from './dialog/configInfo.vue' import echarts from 'echarts'; @@ -77,10 +79,11 @@ consoleNodeLoad, consoleDisk, consoleResource, + configInfo, }, data() { return { - timer: null + timer: null, }; }, created() { @@ -143,6 +146,18 @@ }, showInfo: function (){ + this.$axios({ + method: 'get', + url: `/api/server/system/configInfo`, + }).then( (res)=> { + console.log(res) + if (res.data.code === 0) { + console.log(2222) + console.log(this.$refs.configInfo) + this.$refs.configInfo.openDialog(res.data.data) + } + }).catch( (error)=> { + }); } } diff --git a/web_src/src/components/dialog/configInfo.vue b/web_src/src/components/dialog/configInfo.vue new file mode 100644 index 0000000..428d621 --- /dev/null +++ b/web_src/src/components/dialog/configInfo.vue @@ -0,0 +1,59 @@ +<template> + <div id="configInfo"> + <el-dialog + title="绯荤粺淇℃伅" + width="=80%" + top="2rem" + :close-on-click-modal="false" + :visible.sync="showDialog" + :destroy-on-close="true" + @close="close()" + > + <div id="shared" style="margin-top: 1rem;margin-right: 100px;"> + <el-descriptions title="鍥芥爣鏈嶅姟淇℃伅" v-if="configInfoData.sip" :span="2"> + <el-descriptions-item label="缂栧彿" >{{configInfoData.sip.id}}</el-descriptions-item> + <el-descriptions-item label="鍩�">{{configInfoData.sip.domain}}</el-descriptions-item> + <el-descriptions-item label="IP">{{configInfoData.sip.ip}}</el-descriptions-item> + <el-descriptions-item label="绔彛">{{configInfoData.sip.port}}</el-descriptions-item> + <el-descriptions-item label="瀵嗙爜"> + <el-tag size="small">{{configInfoData.sip.password}}</el-tag> + </el-descriptions-item> + </el-descriptions> + <el-descriptions title="鐗堟湰淇℃伅"v-if="configInfoData.sip"> + <el-descriptions-item label="鐗堟湰">{{configInfoData.version.version}}</el-descriptions-item> + <el-descriptions-item label="缂栬瘧鏃堕棿">{{configInfoData.version.BUILD_DATE}}</el-descriptions-item> + <el-descriptions-item label="GIT鐗堟湰">{{configInfoData.version.GIT_Revision_SHORT}}</el-descriptions-item> + <el-descriptions-item label="GIT鏈�鍚庢彁浜ゆ椂闂�">{{configInfoData.version.GIT_DATE}}</el-descriptions-item> + </el-descriptions> + </div> + </el-dialog> + </div> +</template> + +<script> +export default { + name: "configInfo", + props: {}, + computed: {}, + created() {}, + data() { + return { + showDialog: false, + configInfoData: { + sip:{}, + + } + }; + }, + methods: { + openDialog: function (data) { + console.log(data) + this.showDialog = true; + this.configInfoData = data; + }, + close: function () { + this.showDialog = false; + }, + }, +}; +</script> -- Gitblit v1.8.0