release: 1.2.0-beta.1

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "halo-admin",
-  "version": "1.1.3-beta.2",
+  "version": "1.2.0-beta.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "halo-admin",
-  "version": "1.1.3-beta.2",
+  "version": "1.2.0-beta.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

public/index.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
   <meta name="robots" content="noindex,nofllow" />
-  <meta name="generator" content="Halo " />
+  <meta name="generator" content="Halo 1.2.0-beta.1" />
   <link rel="icon" href="<%= BASE_URL %>logo.png" />
   <title>Halo Dashboard</title>
   <style>

src/views/system/developer/tabs/Environment.vue

@@ -2,8 +2,8 @@
   <div>
     <a-row :gutter="12">
       <a-col
-        :xl="24"
+        :xl="12"
-        :lg="24"
+        :lg="12"
         :md="24"
         :sm="24"
         :xs="24"
@@ -44,6 +44,52 @@
             </tbody>
           </table>
         </a-card>
+        <a-divider dashed />
+      </a-col>
+      <a-col
+        :xl="12"
+        :lg="12"
+        :md="24"
+        :sm="24"
+        :xs="24"
+        :style="{ marginBottom: '12px' }"
+      >
+        <a-card
+          title="使用情况"
+          :bordered="false"
+          hoverable
+          :bodyStyle="{ padding: 0 }"
+        >
+          <table style="width:100%">
+            <tbody class="ant-table-tbody">
+              <tr>
+                <td>CPU 数量</td>
+                <td>{{ system.cpu.count }} 个</td>
+              </tr>
+              <tr>
+                <td>CPU 使用率</td>
+                <td>{{ system.cpu.usage }} %</td>
+              </tr>
+              <tr>
+                <td>JVM 最大可用内存</td>
+                <td>{{ jvm.memory.max | fileSizeFormat }}</td>
+              </tr>
+              <tr>
+                <td>JVM 可用内存</td>
+                <td>{{ jvm.memory.committed | fileSizeFormat }}</td>
+              </tr>
+              <tr>
+                <td>JVM 已用内存</td>
+                <td>{{ jvm.memory.used | fileSizeFormat }}</td>
+              </tr>
+              <tr>
+                <td>GC 次数</td>
+                <td>{{ jvm.gc.pause.count }} 次</td>
+              </tr>
+            </tbody>
+          </table>
+        </a-card>
+        <a-divider dashed />
       </a-col>
       <a-col
         :xl="24"
@@ -71,11 +117,19 @@
               </tr>
               <tr>
                 <td>Java Home</td>
-                <td>{{ systemProperties.properties['java.home'].value }}</td>
+                <td>
+                  <ellipsis
+                    :length="isMobile() ? 50 : 256"
+                    tooltip
+                  >
+                    {{ systemProperties.properties['java.home'].value }}
+                  </ellipsis>
+                </td>
               </tr>
             </tbody>
           </table>
         </a-card>
+        <a-divider dashed />
       </a-col>
       <a-col
         :xl="24"
@@ -94,45 +148,161 @@
           <table style="width:100%">
             <tbody class="ant-table-tbody">
               <tr>
-                <td>PID</td>
+                <td>端口</td>
-                <td>{{ systemProperties.properties['PID'].value }}</td>
+                <td>{{ propertiesSourcesMap['server.ports'].properties['local.server.port'].value }}</td>
               </tr>
               <tr>
-                <td>启动目录</td>
+                <td>PID</td>
-                <td>{{ systemProperties.properties['user.dir'].value }}</td>
+                <td>{{ systemProperties.properties['PID'].value }}</td>
               </tr>
               <tr>
                 <td>启动模式</td>
                 <td>{{ systemProperties.properties['spring.profiles.active'].value }}</td>
               </tr>
+              <tr>
+                <td>启动时间</td>
+                <td>{{ system.process.startTime | moment }}</td>
+              </tr>
+              <tr>
+                <td>已启动时间</td>
+                <td>{{ system.process.uptime }} 秒</td>
+              </tr>
+              <tr>
+                <td>启动目录</td>
+                <td>
+                  <ellipsis
+                    :length="isMobile() ? 50 : 256"
+                    tooltip
+                  >
+                    {{ systemProperties.properties['user.dir'].value }}
+                  </ellipsis>
+                </td>
+              </tr>
               <tr>
                 <td>日志目录</td>
-                <td>{{ systemProperties.properties['LOG_FILE'].value }}</td>
+                <td>
+                  <ellipsis
+                    :length="isMobile() ? 50 : 256"
+                    tooltip
+                  >
+                    {{ systemProperties.properties['LOG_FILE'].value }}
+                  </ellipsis>
+                </td>
               </tr>
             </tbody>
           </table>
         </a-card>
       </a-col>
     </a-row>
+    <div style="position: fixed;bottom: 30px;right: 30px;">
+      <a-button
+        type="primary"
+        shape="circle"
+        icon="sync"
+        size="large"
+        @click="handleRefresh"
+      ></a-button>
+    </div>
   </div>
 </template>
 <script>
+import { mixin, mixinDevice } from '@/utils/mixin.js'
+import { mapGetters } from 'vuex'
+import axios from 'axios'
 import actuatorApi from '@/api/actuator'
 export default {
   name: 'Environment',
+  mixins: [mixin, mixinDevice],
   data() {
     return {
-      systemProperties: {}
+      propertiesSourcesMap: {},
+      systemProperties: {},
+      interval: null,
+      system: {
+        cpu: {
+          count: 0,
+          usage: 0
+        },
+        process: {
+          cpuUsage: 0,
+          uptime: 0,
+          startTime: 0
+        }
+      },
+      jvm: {
+        memory: {
+          max: 0,
+          committed: 0,
+          used: 0
+        },
+        gc: {
+          pause: {
+            count: 0
+          }
+        }
+      }
     }
   },
   created() {
     this.loadEnv()
+    this.loadSystemInfo()
+    this.loadJvmInfo()
+  },
+  computed: {
+    ...mapGetters(['options'])
   },
   methods: {
     loadEnv() {
       actuatorApi.env().then(response => {
-        this.systemProperties = response.data.propertySources[2]
+        const propertiesSources = response.data.propertySources
+        propertiesSources.forEach(item => {
+          this.propertiesSourcesMap[item.name] = item
+          this.systemProperties = this.propertiesSourcesMap['systemProperties']
+        })
       })
+    },
+    loadSystemInfo() {
+      axios
+        .all([
+          axios.get(this.options.blog_url + '/api/admin/actuator/metrics/system.cpu.count'),
+          axios.get(this.options.blog_url + '/api/admin/actuator/metrics/system.cpu.usage'),
+          axios.get(this.options.blog_url + '/api/admin/actuator/metrics/process.uptime'),
+          axios.get(this.options.blog_url + '/api/admin/actuator/metrics/process.start.time'),
+          axios.get(this.options.blog_url + '/api/admin/actuator/metrics/process.cpu.usage')
+        ])
+        .then(response => {
+          this.system.cpu.count = response[0].data.measurements[0].value
+          this.system.cpu.usage = Number(response[1].data.measurements[0].value * 100).toFixed(2)
+          this.system.process.uptime = response[2].data.measurements[0].value
+          this.system.process.startTime = response[3].data.measurements[0].value * 1000
+          this.system.process.cpuUsage = response[4].data.measurements[0].value
+        })
+        .catch(response => {
+          this.$message.error('获取服务器系统信息失败！')
+        })
+    },
+    loadJvmInfo() {
+      axios
+        .all([
+          axios.get(this.options.blog_url + '/api/admin/actuator/metrics/jvm.memory.max'),
+          axios.get(this.options.blog_url + '/api/admin/actuator/metrics/jvm.memory.committed'),
+          axios.get(this.options.blog_url + '/api/admin/actuator/metrics/jvm.memory.used'),
+          axios.get(this.options.blog_url + '/api/admin/actuator/metrics/jvm.gc.pause')
+        ])
+        .then(r => {
+          this.jvm.memory.max = r[0].data.measurements[0].value
+          this.jvm.memory.committed = r[1].data.measurements[0].value
+          this.jvm.memory.used = r[2].data.measurements[0].value
+          this.jvm.gc.pause.count = r[3].data.measurements[0].value
+        })
+        .catch(r => {
+          console.error(r)
+          this.$message.error('获取 JVM 信息失败！')
+        })
+    },
+    handleRefresh() {
+      this.loadSystemInfo()
+      this.loadJvmInfo()
     }
   }
 }