Merge pull request #205 from go-admin-team/github-dev

GitHub dev

.github/workflows/build.yml

@@ -0,0 +1,42 @@
+name: Build CI
+
+on: 
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      
+      - name: install
+        run: yarn
+
+      - name: Build
+        run: npm run build:prod
+
+      - name: ClearFile
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.SSH_HOST }}  # 下面三个配置与上一步类似
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.DEPLOY_KEY }}
+          # 重启的脚本，根据自身情况做相应改动，一般要做的是migrate数据库以及重启服务器
+          script: |
+            sudo rm -rf /www/vue2/*
+
+      - name: Deploy to Server      # 第四步，rsync推送文件
+        uses: AEnterprise/rsync-deploy@v1.0  # 使用别人包装好的步骤镜像
+        env:
+          DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}   # 引用配置，SSH私钥
+          ARGS: -avz --delete --exclude='*.pyc'   # rsync参数，排除.pyc文件
+          SERVER_PORT: '22'  # SSH端口
+          FOLDER: ./dist/*  # 要推送的文件夹，路径相对于代码仓库的根目录
+          SERVER_IP: ${{ secrets.SSH_HOST }}  # 引用配置，服务器的host名（IP或者域名domain.com）
+          USERNAME: ${{ secrets.SSH_USERNAME }}  # 引用配置，服务器登录名
+          SERVER_DESTINATION: /www/vue2/ # 部署到目标文件夹

package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-admin",
-  "version": "2.0.6",
+  "version": "2.0.9",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "https://github.com/wenjianzhang",
   "license": "MIT",
@@ -54,7 +54,7 @@
     "driver.js": "0.9.8",
     "dropzone": "5.7.2",
     "echarts": "4.8.0",
-    "element-ui": "2.13.2",
+    "element-ui": "2.15.6",
     "file-saver": "2.0.2",
     "fuse.js": "6.4.1",
     "js-cookie": "2.2.1",

src/views/sys-tools/monitor.vue

@@ -12,11 +12,11 @@
                       type="success"
                       effect="dark"
                     >
-                      {{ info.location }}
+                      Runing
                     </el-tag>
                   </el-col>
                   <el-col :sm="24" :md="8" class="" style="line-height:28px;text-align:center;">
-                    Aliyun
+                    {{ info.location }}
                   </el-col>
                 </el-row>
               </div>
@@ -36,20 +36,24 @@
                   </el-row>
                   <el-row :gutter="10">
                     <el-col :sm="12" :md="12" class="line">
-                      <el-col :sm="8" :md="8">
-                        下载<i class="el-icon-caret-bottom" />
-                      </el-col>
-                      <el-col :sm="16" :md="16" class="line-value">
-                        {{ info.net.in }}KB
-                      </el-col>
+                      <el-row>
+                        <el-col span="12" :sm="8" :md="8" xs="12">
+                          下载<i class="el-icon-caret-bottom" />
+                        </el-col>
+                        <el-col span="12" :sm="16" :md="16" xs="12" class="line-value">
+                          {{ info.net.in }}KB
+                        </el-col>
+                      </el-row>
                     </el-col>
                     <el-col :sm="12" :md="12" class="line">
-                      <el-col :sm="8" :md="8">
-                        上传<i class="el-icon-caret-top" />
-                      </el-col>
-                      <el-col :sm="16" :md="16" class="line-value">
-                        {{ info.net.out }}KB
-                      </el-col>
+                      <el-row border>
+                        <el-col span="12" :sm="6" :md="8">
+                          上传<i class="el-icon-caret-top" />
+                        </el-col>
+                        <el-col span="12" :sm="6" :md="16" class="line-value">
+                          {{ info.net.out }}KB
+                        </el-col>
+                      </el-row>
                     </el-col>
                   </el-row>
                   <el-row :gutter="10" class="monitor-progress">
@@ -144,7 +148,7 @@ export default {
     this.getServerInfo()
     this.timer = setInterval(() => {
       this.getServerInfo()
-    }, 5000)
+    }, 1000)
   },
   beforeDestroy() {
     clearInterval(this.timer)
@@ -166,8 +170,9 @@ export default {
 .line{
   line-height: 49px;
   font-size: 14px ;
-  padding-left: 0px !important;
-  padding-right: 0px !important;
+  padding-left: 5px !important;
+  padding-right: 5px !important;
+  border-bottom: 1px solid #e6ebf5;
   .line-value{
     text-align: right;
     color: #969799;