From 82a09c4abd00b9cf935d5a7c25700775c3bd9383 Mon Sep 17 00:00:00 2001
From: zhangwenjian <zwj777@live.com>
Date: Mon, 11 Jan 2021 21:31:03 +0800
Subject: [PATCH] =?UTF-8?q?perf=F0=9F=91=8C=20:=20=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/models/system.go                            | 11 ++++++++---
 app/admin/router/sysrouter.go                         |  5 +++--
 .../migration/version/1599190683670_migrate.go        |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/admin/models/system.go b/app/admin/models/system.go
index f2a2d3b8..77525c92 100644
--- a/app/admin/models/system.go
+++ b/app/admin/models/system.go
@@ -2,19 +2,24 @@ package models
 
 import (
 	orm "go-admin/common/global"
+	"go-admin/common/models"
 )
 
 type SysSetting struct {
 	SettingsId int    `json:"settings_id" gorm:"primary_key;AUTO_INCREMENT"`
 	Name       string `json:"name" gorm:"type:varchar(256);"`
 	Logo       string `json:"logo" gorm:"type:varchar(256);"`
-	BaseModel
+	models.ModelTime
 }
 
 func (SysSetting) TableName() string {
 	return "sys_setting"
 }
 
+func (s *SysSetting) GetId() interface{} {
+	return s.SettingsId
+}
+
 //查询
 func (s *SysSetting) Get() (create SysSetting, err error) {
 	result := orm.Eloquent.Table("sys_setting").First(&create)
@@ -34,7 +39,7 @@ func (s *SysSetting) Update() (update SysSetting, err error) {
 }
 
 type ResponseSystemConfig struct {
-	Name string `json:"name" binding:"required"` // 名称
-	Logo string `json:"logo" binding:"required"` // 头像
+	Name       string `json:"name" binding:"required"`        // 名称
+	Logo       string `json:"logo" binding:"required"`        // 头像
 	SettingsId int    `json:"settings_id" binding:"required"` // 头像
 }
diff --git a/app/admin/router/sysrouter.go b/app/admin/router/sysrouter.go
index 859bcb16..9e68d750 100644
--- a/app/admin/router/sysrouter.go
+++ b/app/admin/router/sysrouter.go
@@ -219,10 +219,11 @@ func registerDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar
 	}
 }
 func registerSysSettingRouter(v1 *gin.RouterGroup) {
+	api := system.SysSetting{}
 	setting := v1.Group("/setting")
 	{
-		setting.GET("", system.GetSetting)
-		setting.POST("", system.CreateSetting)
+		setting.GET("", api.GetSetting)
+		setting.POST("", api.CreateOrUpdateSetting)
 		setting.GET("/serverInfo", monitor.ServerInfo)
 	}
 }
diff --git a/cmd/migrate/migration/version/1599190683670_migrate.go b/cmd/migrate/migration/version/1599190683670_migrate.go
index f1a472b0..f81afa71 100644
--- a/cmd/migrate/migration/version/1599190683670_migrate.go
+++ b/cmd/migrate/migration/version/1599190683670_migrate.go
@@ -96,7 +96,7 @@ func _1599190683670Test(db *gorm.DB, version string) error {
 		}
 
 		list10 := []models.SysSetting{
-			{1, "go-admin管理系统", "https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png", models.BaseModel{CreatedAt: time.Now(), UpdatedAt: time.Now()}},
+			{1, "go-admin管理系统", "https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png", common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}},
 		}
 
 		list11 := []models.SysJob{