From a156f79fc04c78421e554752ad0bf57a2f865da1 Mon Sep 17 00:00:00 2001
From: witersen <1801168257@qq.com>
Date: Fri, 20 May 2022 15:09:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=8A=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 01.web/package-lock.json                  |  26 +-
 01.web/src/router.js                      |  17 +-
 01.web/src/views/index/index.vue          | 319 ----------------------
 01.web/src/views/login/index.vue          |   8 +-
 01.web/src/views/repositoryInfo/index.vue |   1 +
 02.php/app/controller/Statistics.php      |  70 -----
 02.php/app/controller/base/Base.php       |   4 +-
 02.php/app/service/Statistics.php         | 260 ------------------
 README.md                                 |   5 +-
 9 files changed, 18 insertions(+), 692 deletions(-)
 delete mode 100644 01.web/src/views/index/index.vue
 delete mode 100644 02.php/app/controller/Statistics.php
 delete mode 100644 02.php/app/service/Statistics.php

diff --git a/01.web/package-lock.json b/01.web/package-lock.json
index eafaa01..423de8f 100644
--- a/01.web/package-lock.json
+++ b/01.web/package-lock.json
@@ -4,12 +4,6 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@types/streamsaver": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/@types/streamsaver/-/streamsaver-2.0.1.tgz",
-      "integrity": "sha512-I49NtT8w6syBI3Zg3ixCyygTHoTVMY0z2TMRcTgccdIsVd2MwlKk7ITLHLsJtgchUHcOd7QEARG9h0ifcA6l2Q==",
-      "dev": true
-    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -343,6 +337,14 @@
             "es6-promise": "~2.3.0",
             "js-base64": "~2.1.8",
             "source-map": "~0.4.2"
+          },
+          "dependencies": {
+            "es6-promise": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-2.3.0.tgz",
+              "integrity": "sha512-oyOjMhyKMLEjOOtvkwg0G4pAzLQ9WdbbeX7WdqKzvYXu+UFgD0Zo/Brq5Q49zNmnGPPzV5rmYvrr0jz1zWx8Iw==",
+              "dev": true
+            }
           }
         }
       }
@@ -2524,12 +2526,6 @@
         "is-symbol": "^1.0.1"
       }
     },
-    "es6-promise": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz",
-      "integrity": "sha1-lu258v2wGZWCKyY92KratnSBgbw=",
-      "dev": true
-    },
     "es6-templates": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz",
@@ -8102,12 +8098,6 @@
         }
       }
     },
-    "streamsaver": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmmirror.com/streamsaver/-/streamsaver-2.0.6.tgz",
-      "integrity": "sha512-LK4e7TfCV8HzuM0PKXuVUfKyCB1FtT9L0EGxsFk5Up8njj0bXK8pJM9+Wq2Nya7/jslmCQwRK39LFm55h7NBTw==",
-      "dev": true
-    },
     "strict-uri-encode": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
diff --git a/01.web/src/router.js b/01.web/src/router.js
index 2ad960f..7a455a2 100644
--- a/01.web/src/router.js
+++ b/01.web/src/router.js
@@ -18,21 +18,6 @@ const routers = [
         },
         component: (resolve) => require(['./views/layout/basicLayout/index.vue'], resolve),
         children: [
-            {
-                name: 'index',
-                path: '/index',
-                meta: {
-                    title: '信息统计',
-                    icon: "ios-stats",
-                    requireAuth: true,
-                    user_role_id: ['1'],
-                    group: {
-                        name: "仓库",
-                        num: 1
-                    }
-                },
-                component: (resolve) => require(['./views/index/index.vue'], resolve)
-            },
             {
                 name: 'repositoryInfo',
                 path: '/repositoryInfo',
@@ -42,7 +27,7 @@ const routers = [
                     requireAuth: true,
                     user_role_id: ['1', '2'],
                     group: {
-                        name: "",
+                        name: "仓库",
                         num: 1
                     }
                 },
diff --git a/01.web/src/views/index/index.vue b/01.web/src/views/index/index.vue
deleted file mode 100644
index 69e217c..0000000
--- a/01.web/src/views/index/index.vue
+++ /dev/null
@@ -1,319 +0,0 @@
-<template>
-  <div>
-    <Card :bordered="false" :dis-hover="true">
-      <p slot="title">
-        <Icon type="md-bulb" />
-        {{ systemBrif.os }}
-      </p>
-      <div>
-        <Row>
-          <Col span="4">
-            <div class="statusTop">负载状态</div>
-            <Tooltip placement="bottom" max-width="200">
-              <Circle
-                :percent="statusInfo.load.percent"
-                dashboard
-                :size="100"
-                :stroke-color="statusInfo.load.color"
-                class="statusCircle"
-              >
-                <span class="demo-circle-inner" style="font-size: 24px"
-                  >{{ statusInfo.load.percent }}%</span
-                >
-              </Circle>
-              <div slot="content">
-                <p>最近1分钟平均负载：{{ statusInfo.load.cpuLoad1Min }}</p>
-                <p>最近5分钟平均负载：{{ statusInfo.load.cpuLoad5Min }}</p>
-                <p>最近15分钟平均负载：{{ statusInfo.load.cpuLoad15Min }}</p>
-              </div>
-            </Tooltip>
-            <div class="statusBottom">{{ statusInfo.load.title }}</div>
-          </Col>
-          <Col span="4">
-            <div class="statusTop">CPU使用率</div>
-            <Tooltip placement="bottom" max-width="200">
-              <Circle
-                :percent="statusInfo.cpu.percent"
-                dashboard
-                :size="100"
-                :stroke-color="statusInfo.cpu.color"
-                class="statusCircle"
-              >
-                <span class="demo-circle-inner" style="font-size: 24px"
-                  >{{ statusInfo.cpu.percent }}%</span
-                >
-              </Circle>
-              <div slot="content">
-                <p v-for="item in statusInfo.cpu.cpu" :key="item">{{ item }}</p>
-                <p>物理CPU个数：{{ statusInfo.cpu.cpuPhysical }}</p>
-                <p>物理CPU的总核心数：{{ statusInfo.cpu.cpuCore }}</p>
-                <p>物理CPU的线程总数：{{ statusInfo.cpu.cpuProcessor }}</p>
-              </div>
-            </Tooltip>
-            <div class="statusBottom">{{ statusInfo.cpu.cpuCore }}核心</div>
-          </Col>
-          <Col span="4">
-            <div class="statusTop">内存使用率</div>
-            <Circle
-              :percent="statusInfo.mem.percent"
-              dashboard
-              :size="100"
-              :stroke-color="statusInfo.mem.color"
-              class="statusCircle"
-            >
-              <span class="demo-circle-inner" style="font-size: 24px"
-                >{{ statusInfo.mem.percent }}%</span
-              >
-            </Circle>
-            <div class="statusBottom">
-              {{ statusInfo.mem.memUsed }} / {{ statusInfo.mem.memTotal }}(MB)
-            </div>
-          </Col>
-          <Col span="4" v-for="(item, index) in diskList" :key="index">
-            <div class="statusTop">{{ item.mountedOn }}</div>
-            <Tooltip placement="bottom" max-width="200">
-              <div slot="content">
-                <p>文件系统：{{ item.fileSystem }}</p>
-                <p>容量：{{ item.size }}</p>
-                <p>已使用：{{ item.used }}</p>
-                <p>可使用：{{ item.avail }}</p>
-                <p>使用率：{{ item.percent }}%</p>
-                <p>挂载点：{{ item.mountedOn }}</p>
-              </div>
-              <Circle
-                :percent="item.percent"
-                dashboard
-                :size="100"
-                :stroke-color="item.color"
-                class="statusCircle"
-              >
-                <span class="demo-circle-inner" style="font-size: 24px"
-                  >{{ item.percent }}%</span
-                >
-              </Circle>
-            </Tooltip>
-            <div class="statusBottom">
-              {{ item.used }} /
-              {{ item.size }}
-            </div>
-          </Col>
-        </Row>
-      </div>
-    </Card>
-    <Card :bordered="false" :dis-hover="true" style="margin-top: 10px">
-      <p slot="title">
-        <Icon type="ios-options" />
-        统计
-      </p>
-      <div>
-        <Row :gutter="16">
-          <Col span="4">
-            <Card :dis-hover="true">
-              <div style="text-align: center">
-                <p>仓库占用</p>
-                <h2 style="color: #28bcfe">{{ systemBrif.repSize }}</h2>
-              </div>
-            </Card>
-          </Col>
-          <Col span="4">
-            <Card :dis-hover="true">
-              <div style="text-align: center">
-                <p>备份占用</p>
-                <h2 style="color: #28bcfe">{{ systemBrif.backupSize }}</h2>
-              </div>
-            </Card>
-          </Col>
-          <Col span="4">
-            <Card :dis-hover="true">
-              <div style="text-align: center">
-                <p>SVN仓库</p>
-                <h2 style="color: #28bcfe">{{ systemBrif.repCount }}</h2>
-              </div>
-            </Card>
-          </Col>
-          <Col span="4">
-            <Card :dis-hover="true">
-              <div style="text-align: center">
-                <p>SVN用户</p>
-                <h2 style="color: #28bcfe">{{ systemBrif.repUser }}</h2>
-              </div>
-            </Card>
-          </Col>
-          <Col span="4">
-            <Card :dis-hover="true">
-              <div style="text-align: center">
-                <p>SVN分组</p>
-                <h2 style="color: #28bcfe">{{ systemBrif.repGroup }}</h2>
-              </div>
-            </Card>
-          </Col>
-          <Col span="4">
-            <Card :dis-hover="true">
-              <div style="text-align: center">
-                <p>运行日志/条</p>
-                <h2 style="color: #28bcfe">{{ systemBrif.logCount }}</h2>
-              </div>
-            </Card>
-          </Col>
-        </Row>
-      </div>
-    </Card>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      /**
-       * 硬盘信息
-       */
-      diskList: [],
-      /**
-       * 状态信息
-       */
-      statusInfo: {
-        load: {
-          cpuLoad15Min: 0.22,
-          cpuLoad5Min: 0.28,
-          cpuLoad1Min: 0.32,
-          percent: 16,
-          color: "#28bcfe",
-        },
-        cpu: {
-          percent: 28.2,
-          cpu: ["Intel(R) Xeon(R) Platinum 8255C CPU @ 2.50GHz"],
-          cpuPhysical: 1,
-          cpuPhysicalCore: 1,
-          cpuCore: 1,
-          cpuProcessor: 1,
-          color: "#28bcfe",
-        },
-        mem: {
-          memTotal: 1838,
-          memUsed: 975,
-          memFree: 863,
-          percent: 53,
-          color: "#28bcfe",
-        },
-      },
-      /**
-       * 统计信息
-       */
-      systemBrif: {
-        os: "",
-        repSize: 0,
-        repCount: 0,
-        repUser: 0,
-        repGroup: 0,
-        logCount: 0,
-        backupSize: 0,
-      },
-    };
-  },
-  computed: {},
-  created() {},
-  mounted() {
-    var that = this;
-    this.GetDisk();
-    this.GetSystemStatus();
-    this.GetSystemAnalysis();
-    //设置定时器
-    that.timer = window.setInterval(() => {
-      setTimeout(that.GetSystemStatus(), 0);
-    }, 3000);
-    //离开页面清除定时器
-    that.$once("hook:beforeDestroy", () => {
-      clearInterval(that.timer);
-    });
-  },
-  methods: {
-    /**
-     * 获取磁盘
-     */
-    GetDisk() {
-      var that = this;
-      var data = {};
-      that.$axios
-        .post("/api.php?c=Statistics&a=GetDisk&t=web", data)
-        .then(function (response) {
-          var result = response.data;
-          if (result.status == 1) {
-            // that.$Message.success(result.message);
-            that.diskList = result.data;
-          } else {
-            that.$Message.error(result.message);
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-          that.$Message.error("出错了 请联系管理员！");
-        });
-    },
-    /**
-     * 获取状态
-     */
-    GetSystemStatus() {
-      var that = this;
-      var data = {};
-      that.$axios
-        .post("/api.php?c=Statistics&a=GetSystemStatus&t=web", data)
-        .then(function (response) {
-          var result = response.data;
-          if (result.status == 1) {
-            // that.$Message.success(result.message);
-            that.statusInfo = result.data;
-          } else {
-            that.$Message.error(result.message);
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-          that.$Message.error("出错了 请联系管理员！");
-        });
-    },
-    /**
-     * 获取统计
-     */
-    GetSystemAnalysis() {
-      var that = this;
-      var data = {};
-      that.$axios
-        .post("/api.php?c=Statistics&a=GetSystemAnalysis&t=web", data)
-        .then(function (response) {
-          var result = response.data;
-          if (result.status == 1) {
-            // that.$Message.success(result.message);
-            that.systemBrif = result.data;
-          } else {
-            that.$Message.error(result.message);
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-          that.$Message.error("出错了 请联系管理员！");
-        });
-    },
-  },
-};
-</script>
-
-<style>
-.statusTop {
-  width: 140px;
-  text-align: center;
-  margin-bottom: 5px;
-
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-.statusCircle {
-  margin-left: 20px;
-}
-.statusBottom {
-  width: 140px;
-  text-align: center;
-  margin-bottom: 15px;
-}
-</style>
\ No newline at end of file
diff --git a/01.web/src/views/login/index.vue b/01.web/src/views/login/index.vue
index 582ad2f..1fef561 100644
--- a/01.web/src/views/login/index.vue
+++ b/01.web/src/views/login/index.vue
@@ -122,8 +122,8 @@ export default {
       that.$Message.success("已有登录信息 自动跳转中...");
       setTimeout(function () {
         if (sessionStorage.user_role_id == 1) {
-          //管理员跳转到首页
-          that.$router.push({ name: "index" });
+          //管理员跳转到仓库页
+          that.$router.push({ name: "repositoryInfo" });
         } else if (sessionStorage.user_role_id == 2) {
           //用户跳转到仓库页
           that.$router.push({ name: "repositoryInfo" });
@@ -197,8 +197,8 @@ export default {
             that.$Message.success(result.message);
 
             if (result.data.user_role_id == 1) {
-              //管理员跳转到首页
-              that.$router.push({ name: "index" });
+              //管理员跳转到仓库页
+              that.$router.push({ name: "repositoryInfo" });
             } else if (result.data.user_role_id == 2) {
               //用户跳转到仓库页
               that.$router.push({ name: "repositoryInfo" });
diff --git a/01.web/src/views/repositoryInfo/index.vue b/01.web/src/views/repositoryInfo/index.vue
index c082563..44c702c 100644
--- a/01.web/src/views/repositoryInfo/index.vue
+++ b/01.web/src/views/repositoryInfo/index.vue
@@ -890,6 +890,7 @@
 
 <script>
 import { WritableStream } from "web-streams-polyfill/ponyfill";
+
 export default {
   data() {
     return {
diff --git a/02.php/app/controller/Statistics.php b/02.php/app/controller/Statistics.php
deleted file mode 100644
index 8ab205d..0000000
--- a/02.php/app/controller/Statistics.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/*
- * @Author: witersen
- * @Date: 2022-04-24 23:37:05
- * @LastEditors: witersen
- * @LastEditTime: 2022-05-07 14:00:06
- * @Description: QQ:1801168257
- */
-
-namespace app\controller;
-
-use app\service\Statistics as ServiceStatistics;
-
-class Statistics extends Base
-{
-    /**
-     * 服务层对象
-     *
-     * @var object
-     */
-    private $ServiceStatistics;
-
-    function __construct()
-    {
-        parent::__construct();
-
-        $this->ServiceStatistics = new ServiceStatistics();
-    }
-
-    /**
-     * 获取状态
-     * 
-     * 负载状态
-     * CPU使用率
-     * 内存使用率
-     */
-    public function GetSystemStatus()
-    {
-        $result = $this->ServiceStatistics->GetSystemStatus();
-        json2($result);
-    }
-
-    /**
-     * 获取硬盘
-     * 
-     * 获取硬盘数量和每个硬盘的详细信息
-     */
-    public function GetDisk()
-    {
-        $result = $this->ServiceStatistics->GetDisk();
-        json2($result);
-    }
-
-    /**
-     * 获取统计
-     * 
-     * 操作系统类型
-     * 仓库占用体积
-     * SVN仓库数量
-     * SVN用户数量
-     * SVN分组数量
-     * 计划任务数量
-     * 运行日志数量
-     */
-    public function GetSystemAnalysis()
-    {
-        $result = $this->ServiceStatistics->GetSystemAnalysis();
-        json2($result);
-    }
-}
diff --git a/02.php/app/controller/base/Base.php b/02.php/app/controller/base/Base.php
index a06f205..462d832 100644
--- a/02.php/app/controller/base/Base.php
+++ b/02.php/app/controller/base/Base.php
@@ -3,7 +3,7 @@
  * @Author: witersen
  * @Date: 2022-05-06 18:41:32
  * @LastEditors: witersen
- * @LastEditTime: 2022-05-07 12:11:40
+ * @LastEditTime: 2022-05-20 15:04:52
  * @Description: QQ:1801168257
  */
 
@@ -47,7 +47,6 @@ require_once BASE_PATH . '/app/controller/Logs.php';
 require_once BASE_PATH . '/app/controller/Mail.php';
 require_once BASE_PATH . '/app/controller/Personal.php';
 require_once BASE_PATH . '/app/controller/Safe.php';
-require_once BASE_PATH . '/app/controller/Statistics.php';
 require_once BASE_PATH . '/app/controller/Svn.php';
 require_once BASE_PATH . '/app/controller/Svngroup.php';
 require_once BASE_PATH . '/app/controller/Svnrep.php';
@@ -61,7 +60,6 @@ require_once BASE_PATH . '/app/service/Logs.php';
 require_once BASE_PATH . '/app/service/Mail.php';
 require_once BASE_PATH . '/app/service/Personal.php';
 require_once BASE_PATH . '/app/service/Safe.php';
-require_once BASE_PATH . '/app/service/Statistics.php';
 require_once BASE_PATH . '/app/service/Svn.php';
 require_once BASE_PATH . '/app/service/Svngroup.php';
 require_once BASE_PATH . '/app/service/Svnrep.php';
diff --git a/02.php/app/service/Statistics.php b/02.php/app/service/Statistics.php
deleted file mode 100644
index fb7d5ce..0000000
--- a/02.php/app/service/Statistics.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/*
- * @Author: witersen
- * @Date: 2022-04-24 23:37:05
- * @LastEditors: witersen
- * @LastEditTime: 2022-05-07 01:45:39
- * @Description: QQ:1801168257
- */
-
-namespace app\service;
-
-class Statistics extends Base
-{
-    function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * 获取状态
-     * 
-     * 负载状态
-     * CPU使用率
-     * 内存使用率
-     */
-    public function GetSystemStatus()
-    {
-        /**
-         * ----------负载计算开始----------
-         */
-        $laodavg = FunShellExec("cat /proc/loadavg | awk '{print $1,$2,$3}'");
-        $laodavg = $laodavg['result'];
-        $laodavgArray = explode(' ', $laodavg);
-
-        //获取CPU15分钟前到现在的负载平均值
-        $cpuLoad15Min = (float)trim($laodavgArray[2]);
-
-        //获取CPU5分钟前到现在的负载平均值
-        $cpuLoad5Min = (float)trim($laodavgArray[1]);
-
-        //获取CPU1分钟前到现在的负载平均值
-        $cpuLoad1Min = (float)trim($laodavgArray[0]);
-
-        //获取cpu总核数
-        $cpuCount  = FunShellExec('grep -c "model name" /proc/cpuinfo');
-        $cpuCount = $cpuCount['result'];
-        $cpuCount = (int)trim($cpuCount);
-
-        //一分钟的平均负载 / （cpu总核数 * 2），超过100则为100 不超100为真实值取整
-        $percent = round($cpuLoad1Min / ($cpuCount * 2) * 100, 1);
-        if ($percent > 100) {
-            $percent = 100;
-        }
-
-        /**
-         * ----------负载计算结束----------
-         */
-        $data['load'] = [
-            'cpuLoad15Min' => $cpuLoad15Min,
-            'cpuLoad5Min' => $cpuLoad5Min,
-            'cpuLoad1Min' => $cpuLoad1Min,
-            'percent' => $percent,
-            'color' => FunGetColor($percent)['color'],
-            'title' => FunGetColor($percent)['title']
-        ];
-
-        /**
-         * ----------cpu计算开始----------
-         */
-        /**
-         * cpu使用率
-         * 
-         * %Cpu(s):  0.0 us,  3.2 sy,  0.0 ni, 96.8 id,  0.0 wa,  0.0 hi,  0.0 si,  0.0 st
-         * 
-         * us user CPU time     用户空间占用CPU百分比
-         * sy system CPU time   内核空间占用CPU百分比
-         * ni nice CPU          用户进程空间内改变过优先级的进程占用CPU百分比 
-         * id idle              空闲CPU百分比
-         * wa iowait            等待输入输出的CPU时间百分比
-         * hi hardware          硬件中断
-         * si software          软件中断 
-         * st steal             实时
-         */
-        $topResult = FunShellExec('top -b -n 1 | grep Cpu');
-        $topResult = $topResult['result'];
-        preg_match('/ni,(.*?)id/', $topResult, $matches);
-        $id = 100 - (float)trim($matches[1]);
-
-        //cpu型号
-        $cpuModelArray = [];
-        $cpuModelName = FunShellExec("cat /proc/cpuinfo | grep 'model name' | uniq");
-        $cpuModelName = $cpuModelName['result'];
-        $explodeArray = explode("\n", trim($cpuModelName));
-        foreach ($explodeArray as $value) {
-            if (trim($value) != '') {
-                $tempArray = explode(':', $value);
-                array_push($cpuModelArray, trim($tempArray[1]));
-            }
-        }
-
-        //物理cpu个数
-        $cpuPhysical = FunShellExec("cat /proc/cpuinfo | grep 'physical id' | sort -u | wc -l");
-        $cpuPhysical = $cpuPhysical['result'];
-        $cpuPhysical = (int)trim($cpuPhysical);
-
-        //每个物理cpu的物理核心数
-        $cpuPhysicalCore = FunShellExec("cat /proc/cpuinfo | grep 'cpu cores' | wc -l");
-        $cpuPhysicalCore = $cpuPhysicalCore['result'];
-        $cpuPhysicalCore = (int)trim($cpuPhysicalCore);
-
-        //总物理核心数 = 物理cpu个数 * 每个物理cpu的物理核心数（每个物理cpu的物理核心数都一样吗？）
-        $cpuCore = $cpuPhysical * $cpuPhysicalCore;
-
-        //逻辑核心总数（线程总数）
-        $cpuProcessor = FunShellExec("cat /proc/cpuinfo | grep 'processor' | wc -l");
-        $cpuProcessor = $cpuProcessor['result'];
-        $cpuProcessor = (int)trim($cpuProcessor);
-
-        /**
-         * ----------cpu计算结束----------
-         */
-        $data['cpu'] = [
-            'percent' => round($id, 1),
-            'cpu' => $cpuModelArray,
-            'cpuPhysical' => $cpuPhysical,
-            'cpuPhysicalCore' => $cpuPhysicalCore,
-            'cpuCore' => $cpuCore,
-            'cpuProcessor' => $cpuProcessor,
-            'color' => FunGetColor($id)['color']
-        ];
-
-        /**
-         * ----------内存计算开始----------
-         */
-        /**
-         * MemTotal 总内存
-         * MemFree 空闲内存
-         * MemAvailable 可用内存（MemFree + 可回收的内存），系统中有些内存虽然已被使用但是可以回收，比如cache、buffer、slab都有一部分可以回收
-         */
-        //物理内存总量
-        $memTotal = FunShellExec("cat /proc/meminfo | grep 'MemTotal' | awk '{print $2}'");
-        $memTotal = $memTotal['result'];
-        $memTotal = (int)trim($memTotal);
-
-        //操作系统可用内存总量（没有使用空闲内存）
-        $memFree =  FunShellExec("cat /proc/meminfo | grep 'MemAvailable' | awk '{print $2}'");
-        $memFree = $memFree['result'];
-        $memFree = (int)trim($memFree);
-
-        //操作系统已使用内存总量
-        $memUsed =  $memTotal - $memFree;
-
-        //内存使用率
-        $percent = round($memUsed / $memTotal * 100, 1);
-
-        /**
-         * ----------内存计算结束----------
-         */
-        $data['mem'] = [
-            'memTotal' => round($memTotal / 1024),
-            'memUsed' => round($memUsed / 1024),
-            'memFree' => round($memFree / 1024),
-            'percent' => $percent,
-            'color' => FunGetColor($percent)['color']
-        ];
-
-        return message(200, 1, '成功', $data);
-    }
-
-    /**
-     * 获取硬盘
-     * 
-     * 获取硬盘数量和每个硬盘的详细信息
-     */
-    public function GetDisk()
-    {
-        $rs = FunShellExec('df -lh | grep -E "^(/)"');
-        $rs = $rs['result'];
-
-        //将多个连续的空格换为一个
-        $result = preg_replace("/\s{2,}/", ' ', $rs);
-
-        //多个硬盘
-        $diskArray = explode("\n", $result);
-
-        $data = [];
-
-        //处理
-        foreach ($diskArray as $value) {
-            if (trim($value) != '') {
-                $diskInfo = explode(" ", $value);
-                array_push($data, [
-                    'fileSystem' => $diskInfo[0],
-                    'size' => $diskInfo[1],
-                    'used' => $diskInfo[2],
-                    'avail' => $diskInfo[3],
-                    'percent' => (int)str_replace('%', '', $diskInfo[4]),
-                    'mountedOn' => $diskInfo[5],
-                    'color' => FunGetColor((int)str_replace('%', '', $diskInfo[4]))['color']
-                ]);
-            }
-        }
-
-        return message(200, 1, '成功', $data);
-    }
-
-    /**
-     * 获取统计
-     * 
-     * 操作系统类型
-     * 仓库占用体积
-     * SVN仓库数量
-     * SVN用户数量
-     * SVN分组数量
-     * 计划任务数量
-     * 运行日志数量
-     */
-    public function GetSystemAnalysis()
-    {
-        //操作系统类型和版本
-        $os = FunShellExec("cat /etc/redhat-release");
-        $os = $os['result'];
-
-        //仓库占用体积
-        $repSize = FunFormatSize(FunGetDirSizeDu($this->config_svn['rep_base_path']));
-
-        //备份占用体积
-        $backupSize = FunFormatSize(FunGetDirSizeDu($this->config_svn['backup_base_path']));
-
-        //SVN仓库数量
-        $repCount = count($this->SVNAdminRep->GetSimpleRepList());
-
-        //SVN用户数量
-        $userCount = $this->SVNAdminUser->GetSvnUserList($this->passwdContent);
-        if ($userCount === '0') {
-            return message(200, 0, '文件格式错误(不存在[users]标识)');
-        }
-        $userCount  = count($userCount);
-
-        //SVN分组数量
-        $groupCount = $this->SVNAdminGroup->GetSvnGroupList($this->authzContent);
-        if ($userCount === '0') {
-            return message(200, 0, '文件格式错误(不存在[groups]标识)');
-        }
-        $groupCount = count($groupCount);
-
-        //运行日志数量
-        $logCount = $this->database->count('logs', ['log_id[>]' => 0]);
-
-        return message(200, 1, '成功', [
-            'os' => trim($os),
-            'repSize' => $repSize,
-            'repCount' => $repCount,
-            'repUser' => $userCount,
-            'repGroup' => $groupCount,
-            'logCount' => $logCount,
-            'backupSize' => $backupSize
-        ]);
-    }
-}
diff --git a/README.md b/README.md
index 01bc5d8..a48d9df 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ yum install -y php-mysqlnd
 yum install -y php-process
 yum install -y php-json
 yum install -y php-gd
+yum install -y php-bcmatch
 ```
 
 - 安装web服务器
@@ -63,10 +64,10 @@ systemctl enable httpd
 cd /var/www/html/
 
 #代码包从发行版获取
-wget xxx.zip
+wget https://gitee.com/witersen/SvnAdminV2.0/attach_files/1059115/download/v2.3.zip
 
 #解压
-unzip xxx.zip
+unzip v2.3
 ```
 
 - 安装Subversion（如果你安装过Subversion，本步骤可以略过）