From 52a77636fbac570316404eddb16bf1c1c92a222f Mon Sep 17 00:00:00 2001
From: zhangwenjian <zwj777@live.com>
Date: Tue, 14 Apr 2020 00:39:34 +0800
Subject: [PATCH] update

---
 apis/monitor/server.go     | 10 +---------
 models/tools/syscolumns.go |  2 +-
 models/tools/systables.go  |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/apis/monitor/server.go b/apis/monitor/server.go
index 5033720f..d54d9d14 100644
--- a/apis/monitor/server.go
+++ b/apis/monitor/server.go
@@ -7,7 +7,6 @@ import (
 	"github.com/shirou/gopsutil/mem"
 	"go-admin/pkg/app"
 	"runtime"
-	"time"
 )
 
 const (
@@ -28,15 +27,11 @@ func ServerInfo(c *gin.Context) {
 	osDic["numGoroutine"] = runtime.NumGoroutine()
 
 	dis, _ := disk.Usage("/")
-	diskUsedGB := int(dis.Used) / GB
 	diskTotalGB := int(dis.Total) / GB
 	diskFreeGB := int(dis.Free) / GB
-	diskUsedPercent := int(dis.UsedPercent)
 	diskDic := make(map[string]interface{}, 0)
 	diskDic["total"] = diskTotalGB
-	diskDic["used"] = diskUsedGB
 	diskDic["free"] = diskFreeGB
-	diskDic["usage"] = diskUsedPercent
 
 	mem, _ := mem.VirtualMemory()
 	memUsedMB := int(mem.Used) / GB
@@ -49,12 +44,9 @@ func ServerInfo(c *gin.Context) {
 	memDic["free"] = memFreeMB
 	memDic["usage"] = memUsedPercent
 
-	cpuPercent, _ := cpu.Percent(time.Duration(200)*time.Millisecond, true)
 	cpuDic := make(map[string]interface{}, 0)
 	cpuDic["cpuNum"], _ = cpu.Counts(false)
-	cpuDic["user"] = cpuPercent[cpu.CPUser]
-	cpuDic["nice"] = cpuPercent[cpu.CPNice]
-	cpuDic["sys"] = cpuPercent[cpu.CPSys]
+
 
 	app.Custum(c, gin.H{
 		"code": 200,
diff --git a/models/tools/syscolumns.go b/models/tools/syscolumns.go
index 1109c8a7..1e3721c8 100644
--- a/models/tools/syscolumns.go
+++ b/models/tools/syscolumns.go
@@ -6,7 +6,7 @@ import (
 )
 
 type SysColumns struct {
-	ColumnId      int  `gorm:"primary_key;AUTO_INCREMENT" json:"columnId"`
+	ColumnId      int  `gorm:"primary_key;auto_increment" json:"columnId"`
 	TableId       int  `gorm:"type:int(11);" json:"tableId"`
 	ColumnName    string `gorm:"type:varchar(128);" json:"columnName"`
 	ColumnComment string `gorm:"column:column_comment;type:varchar(128);" json:"columnComment"`
diff --git a/models/tools/systables.go b/models/tools/systables.go
index 3deab5cd..d5b29a01 100644
--- a/models/tools/systables.go
+++ b/models/tools/systables.go
@@ -6,7 +6,7 @@ import (
 )
 
 type SysTables struct {
-	TableId             int        `gorm:"primary_key;AUTO_INCREMENT" json:"tableId"` //表编码
+	TableId             int        `gorm:"primary_key;auto_increment" json:"tableId"` //表编码
 	TableName           string       `gorm:"type:varchar(255);" json:"tableName"`         //表名称
 	TableComment        string       `gorm:"type:varchar(255);" json:"tableComment"`   //表备注
 	ClassName           string       `gorm:"type:varchar(255);" json:"className"`         //类名