Merge pull request #263 from wenjianzhang/dev

调整sysconfig结构

app/admin/models/system/sys_config.go

@@ -1,4 +1,4 @@
-package models
+package system
 
 import (
 	"gorm.io/gorm"

app/admin/router/sys_config.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/app/admin/apis/sys_config"
+	"go-admin/app/admin/apis/system/sys_config"
 	"go-admin/app/admin/middleware"
-	"go-admin/app/admin/models"
+	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
 	jwt "go-admin/pkg/jwtauth"
@@ -18,9 +18,9 @@ func init() {
 func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
 	{
-		model := &models.SysConfig{}
+		model := &system.SysConfig{}
 		r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysConfigSearch), func() interface{} {
-			list := make([]models.SysConfig, 0)
+			list := make([]system.SysConfig, 0)
 			return &list
 		}))
 		r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.SysConfigById), nil))

app/admin/service/dto/sys_config.go

@@ -2,9 +2,9 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
+	"go-admin/app/admin/models/system"
 	"gorm.io/gorm"
 
-	"go-admin/app/admin/models"
 	"go-admin/common/dto"
 	"go-admin/common/log"
 	common "go-admin/common/models"
@@ -65,7 +65,7 @@ func (s *SysConfigControl) Generate() dto.Control {
 }
 
 func (s *SysConfigControl) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysConfig{
+	return &system.SysConfig{
 		Model:       gorm.Model{ID: s.ID},
 		ConfigName:  s.ConfigName,
 		ConfigKey:   s.ConfigKey,
@@ -89,5 +89,5 @@ func (s *SysConfigById) Generate() dto.Control {
 }
 
 func (s *SysConfigById) GenerateM() (common.ActiveRecord, error) {
-	return &models.SysConfig{}, nil
+	return &system.SysConfig{}, nil
 }

app/admin/service/sys_config.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"go-admin/app/admin/models"
+	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/log"
 	"go-admin/common/service"
@@ -14,7 +14,7 @@ type SysConfig struct {
 // GetSysConfigByKEY 根据Key获取SysConfig
 func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error {
 	var err error
-	var data models.SysConfig
+	var data system.SysConfig
 	msgID := e.MsgID
 	data.ConfigKey = c.ConfigKey
 	err = e.Orm.Table(data.TableName()).Where("config_key = ?", data.ConfigKey).First(c).Error