修改文件目录

.gitignore

@@ -7,7 +7,7 @@ temp/
 vendor
 config/settings.dev.yml
 go-admin
-middleware/demo.go
+common/middleware/demo.go
 config/settings.dev.b.yml
 temp/logs
 config/settings.dev.yml.log

app/admin/apis/log/loginlog.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 )

app/admin/apis/log/operlog.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 )

app/admin/apis/syscategory/syscategory.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/app/msg"

app/admin/apis/syscontent/syscontent.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/app/msg"

app/admin/apis/sysfiledir/dir.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/app/msg"

app/admin/apis/sysfileinfo/sysfileinfo.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/app/msg"

app/admin/apis/sysjob/sysjob.go

@@ -1,12 +1,13 @@
 package sysjob
 
 import (
+	"go-admin/common/dto"
 	"time"
 
 	"github.com/gin-gonic/gin"
 
-	"go-admin/jobs"
+	"go-admin/app/admin/models"
-	"go-admin/models"
+	"go-admin/app/jobs"
 	"go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/app/msg"
@@ -14,7 +15,7 @@ import (
 
 func RemoveJob(c *gin.Context) {
 	var data models.SysJob
-	var v tools.GeneralDelDto
+	var v dto.GeneralDelDto
 	err := c.BindUri(&v)
 	tools.HasError(err, "", 500)
 	data.JobId = v.Id
@@ -36,7 +37,7 @@ func RemoveJob(c *gin.Context) {
 
 func StartJob(c *gin.Context) {
 	var data models.SysJob
-	var v tools.GeneralGetDto
+	var v dto.GeneralGetDto
 	err := c.BindUri(&v)
 	tools.HasError(err, "", 500)
 	data.JobId = v.Id

app/admin/apis/system/config.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/app/msg"

app/admin/apis/system/dept.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/app/msg"

app/admin/apis/system/dict/dictdata.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 )

app/admin/apis/system/dict/dicttype.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 )
@@ -44,7 +44,7 @@ func GetDictTypeList(c *gin.Context) {
 	result, count, err := data.GetPage(pageSize, pageIndex)
 	tools.HasError(err, "", -1)
 
-	app.PageOK(c,result,count,pageIndex,pageSize,"")
+	app.PageOK(c, result, count, pageIndex, pageSize, "")
 }
 
 // @Summary 通过字典id获取字典类型

app/admin/apis/system/info.go

@@ -3,7 +3,7 @@ package system
 import (
 	"github.com/gin-gonic/gin"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 )

app/admin/apis/system/menu.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 )

app/admin/apis/system/post.go

@@ -3,7 +3,7 @@ package system
 import (
 	"github.com/gin-gonic/gin"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 )

app/admin/apis/system/role.go

@@ -3,7 +3,7 @@ package system
 import (
 	"github.com/gin-gonic/gin"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
 )

app/admin/apis/system/rolemenu.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools/app"
 )
 

app/admin/apis/system/settings.go

@@ -7,10 +7,9 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 	"go-admin/tools"
 	"go-admin/tools/app"
-
 )
 
 // @Summary 查询系统信息

app/admin/apis/system/sysuser.go

@@ -5,8 +5,8 @@ import (
 	"github.com/gin-gonic/gin/binding"
 	"github.com/google/uuid"
 
-	"go-admin/global"
+	"go-admin/app/admin/models"
-	"go-admin/models"
+	"go-admin/common/global"
 	"go-admin/tools"
 	"go-admin/tools/app"
 )

app/admin/apis/tools/dbcolumns.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"go-admin/models/tools"
+	"go-admin/app/admin/models/tools"
 	tools2 "go-admin/tools"
 	"go-admin/tools/app"
 )

app/admin/apis/tools/dbtables.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"go-admin/models/tools"
+	"go-admin/app/admin/models/tools"
 	tools2 "go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/config"

app/admin/apis/tools/gen.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"go-admin/global"
+	"go-admin/app/admin/models"
-	"go-admin/models"
+	"go-admin/app/admin/models/tools"
-	"go-admin/models/tools"
+	"go-admin/common/global"
 	tools2 "go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/config"

app/admin/apis/tools/systables.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"go-admin/models/tools"
+	"go-admin/app/admin/models/tools"
 	tools2 "go-admin/tools"
 	"go-admin/tools/app"
 )

app/admin/middleware/auth.go

@@ -3,7 +3,7 @@ package middleware
 import (
 	"time"
 
-	"go-admin/handler"
+	"go-admin/app/admin/middleware/handler"
 	jwt "go-admin/pkg/jwtauth"
 	"go-admin/tools/config"
 )

app/admin/middleware/db.go

@@ -0,0 +1,5 @@
+package middleware
+
+import "go-admin/common/middleware"
+
+var WithContextDb = middleware.WithContextDb

app/admin/middleware/handler/auth.go

@@ -7,8 +7,8 @@ import (
 	"github.com/mojocn/base64Captcha"
 	"github.com/mssola/user_agent"
 
-	"go-admin/global"
+	"go-admin/app/admin/models"
-	"go-admin/models"
+	"go-admin/common/global"
 	jwt "go-admin/pkg/jwtauth"
 	"go-admin/tools"
 	"go-admin/tools/config"

app/admin/middleware/handler/nofound.go

@@ -7,7 +7,6 @@ import (
 	"github.com/gin-gonic/gin"
 
 	jwt "go-admin/pkg/jwtauth"
-
 )
 
 func NoFound(c *gin.Context) {

app/admin/middleware/logger.go

@@ -7,11 +7,10 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"go-admin/global"
+	"go-admin/app/admin/models"
-	"go-admin/models"
+	"go-admin/common/global"
 	"go-admin/tools"
 	config2 "go-admin/tools/config"
-
 )
 
 // 日志记录到文件

app/admin/models/config.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	_ "time"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/dept.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	_ "time"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/dictdata.go

@@ -3,7 +3,7 @@ package models
 import (
 	"errors"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/dicttype.go

@@ -5,7 +5,7 @@ import (
 
 	"gorm.io/gorm"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/filedir.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/gorm/data.go

@@ -3,10 +3,10 @@ package gorm
 import (
 	"gorm.io/gorm"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
 )
 
-func InitData(db *gorm.DB)  {
+func InitData(db *gorm.DB) {
 
 	list := []models.CasbinRule{
 		{"p", "admin", "/api/v1/menulist", "GET", "", "", ""},

app/admin/models/gorm/gorm.go

@@ -3,12 +3,12 @@ package gorm
 import (
 	"gorm.io/gorm"
 
-	"go-admin/models"
+	"go-admin/app/admin/models"
-	"go-admin/models/tools"
+	"go-admin/app/admin/models/tools"
 )
 
 func AutoMigrate(db *gorm.DB) (err error) {
-	err = db.AutoMigrate(new(models.CasbinRule),
+	err = db.Migrator().AutoMigrate(new(models.CasbinRule),
 		new(models.SysDept),
 		new(models.SysConfig),
 		new(tools.SysTables),

app/admin/models/initdb.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"strings"
 
-	"go-admin/global"
+	"go-admin/common/global"
 )
 
 func InitDb() (err error) {

app/admin/models/login.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/loginlog.go

@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 )
 
 type LoginLog struct {

app/admin/models/menu.go

@@ -3,7 +3,7 @@ package models
 import (
 	"errors"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/operlog.go

@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 )
 
 //sys_operlog

app/admin/models/post.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/role.go

@@ -4,7 +4,7 @@ import (
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/roledept.go

@@ -3,7 +3,7 @@ package models
 import (
 	"fmt"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 )
 
 //sys_role_dept

app/admin/models/rolemenu.go

@@ -3,7 +3,7 @@ package models
 import (
 	"fmt"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/syscategory.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/syscontent.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/sysfileinfo.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 

app/admin/models/sysjob.go

@@ -1,9 +1,10 @@
 package models
 
 import (
-	orm "go-admin/global"
+	"go-admin/common/dto"
+	orm "go-admin/common/global"
+	"go-admin/common/models"
 	"go-admin/tools"
-	"go-admin/tools/model"
 	"strconv"
 )
 
@@ -29,7 +30,7 @@ func (SysJob) TableName() string {
 	return "sys_job"
 }
 
-func (e *SysJob) Generate() model.ActiveRecord {
+func (e *SysJob) Generate() models.ActiveRecord {
 	o := *e
 	return &o
 }
@@ -58,7 +59,7 @@ func (e *SysJob) Get(id interface{}) (err error) {
 
 // 获取SysJob带分页
 func (e *SysJob) GetPage(pageSize int, pageIndex int, v interface{}, list interface{}) (int, error) {
-	table := orm.Eloquent.Table(e.TableName()).Scopes(tools.MakeCondition(v))
+	table := orm.Eloquent.Table(e.TableName()).Scopes(dto.MakeCondition(v))
 
 	// 数据权限控制(如果不需要数据权限请将此处去掉)
 	//dataPermission := new(DataPermission)
@@ -66,7 +67,7 @@ func (e *SysJob) GetPage(pageSize int, pageIndex int, v interface{}, list interf
 
 	var count int64
 
-	if err := table.Scopes(DataScopes(e.TableName(), userid), tools.Paginate(pageSize, pageIndex)).Find(list).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
+	if err := table.Scopes(DataScopes(e.TableName(), userid), dto.Paginate(pageSize, pageIndex)).Find(list).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
 		return 0, err
 	}
 	return int(count), nil

app/admin/models/system.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 )
 
 type SysSetting struct {

app/admin/models/sysuser.go

@@ -8,7 +8,7 @@ import (
 
 	"golang.org/x/crypto/bcrypt"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 
@@ -219,7 +219,7 @@ func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, erro
 	// 数据权限控制(如果不需要数据权限请将此处去掉)
 	dataPermission := new(DataPermission)
 	dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
-	table,err := dataPermission.GetDataScope(e.TableName(), table)
+	table, err := dataPermission.GetDataScope(e.TableName(), table)
 	if err != nil {
 		return nil, 0, err
 	}

app/admin/models/tools/dbcolumns.go

@@ -5,7 +5,7 @@ import (
 
 	"gorm.io/gorm"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 	config2 "go-admin/tools/config"
 )

app/admin/models/tools/dbtables.go

@@ -5,7 +5,7 @@ import (
 
 	"gorm.io/gorm"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 	config2 "go-admin/tools/config"
 )

app/admin/models/tools/syscolumns.go

@@ -1,8 +1,8 @@
 package tools
 
 import (
-	orm "go-admin/global"
+	"go-admin/app/admin/models"
-	"go-admin/models"
+	orm "go-admin/common/global"
 )
 
 type SysColumns struct {

app/admin/models/tools/systables.go

@@ -3,8 +3,8 @@ package tools
 import (
 	"strings"
 
-	orm "go-admin/global"
+	"go-admin/app/admin/models"
-	"go-admin/models"
+	orm "go-admin/common/global"
 )
 
 type SysTables struct {

app/admin/router/initrouter.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/global"
+	"go-admin/app/admin/middleware"
-	"go-admin/handler"
+	"go-admin/app/admin/middleware/handler"
-	"go-admin/middleware"
+	"go-admin/common/global"
 	_ "go-admin/pkg/jwtauth"
 	"go-admin/tools"
 	config2 "go-admin/tools/config"

app/admin/router/syscategory.go

@@ -2,8 +2,8 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/apis/syscategory"
+	"go-admin/app/admin/apis/syscategory"
-	"go-admin/middleware"
+	"go-admin/app/admin/middleware"
 	jwt "go-admin/pkg/jwtauth"
 )
 

app/admin/router/syscontent.go

@@ -2,8 +2,8 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/apis/syscontent"
+	"go-admin/app/admin/apis/syscontent"
-	"go-admin/middleware"
+	"go-admin/app/admin/middleware"
 	jwt "go-admin/pkg/jwtauth"
 )
 

app/admin/router/sysfileinfo.go

@@ -2,8 +2,8 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/apis/sysfiledir"
+	"go-admin/app/admin/apis/sysfiledir"
-	"go-admin/apis/sysfileinfo"
+	"go-admin/app/admin/apis/sysfileinfo"
 )
 
 // 无需认证的路由代码

app/admin/router/sysrouter.go

@@ -1,22 +1,23 @@
 package router
 
 import (
-	"go-admin/apis/actions"
+	"mime"
-	log2 "go-admin/apis/log"
+
-	"go-admin/apis/monitor"
+	log2 "go-admin/app/admin/apis/log"
-	"go-admin/apis/public"
+	"go-admin/app/admin/apis/monitor"
-	"go-admin/apis/sysjob"
+	"go-admin/app/admin/apis/public"
-	"go-admin/apis/system"
+	"go-admin/app/admin/apis/sysjob"
-	"go-admin/apis/system/dict"
+	"go-admin/app/admin/apis/system"
-	. "go-admin/apis/tools"
+	"go-admin/app/admin/apis/system/dict"
+	. "go-admin/app/admin/apis/tools"
+	"go-admin/app/admin/middleware"
+	"go-admin/app/admin/middleware/handler"
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
 	_ "go-admin/docs"
-	"go-admin/handler"
-	"go-admin/middleware"
-	"go-admin/models"
 	jwt "go-admin/pkg/jwtauth"
 	"go-admin/pkg/ws"
-	"go-admin/service/dto"
-	"mime"
 
 	"github.com/gin-gonic/gin"
 	ginSwagger "github.com/swaggo/gin-swagger"

app/admin/service/dto/sysjob.go

@@ -2,8 +2,9 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/models"
+	"go-admin/app/admin/models"
-	"go-admin/tools/model"
+	"go-admin/common/dto"
+	models2 "go-admin/common/models"
 	"net/http"
 )
 
@@ -25,7 +26,7 @@ func (m *SysJobSearch) Bind(ctx *gin.Context) error {
 	return ctx.Bind(m)
 }
 
-func (m *SysJobSearch) Generate() Index {
+func (m *SysJobSearch) Generate() dto.Index {
 	o := *m
 	return &o
 }
@@ -56,12 +57,12 @@ func (s *SysJobControl) Bind(ctx *gin.Context) error {
 	return ctx.Bind(s)
 }
 
-func (s *SysJobControl) Generate() Control {
+func (s *SysJobControl) Generate() dto.Control {
 	cp := *s
 	return &cp
 }
 
-func (s *SysJobControl) GenerateM() (model.ActiveRecord, error) {
+func (s *SysJobControl) GenerateM() (models2.ActiveRecord, error) {
 	return &models.SysJob{
 		JobId:          s.JobId,
 		JobName:        s.JobName,
@@ -99,12 +100,12 @@ func (s *SysJobById) Bind(ctx *gin.Context) error {
 	return ctx.BindUri(s)
 }
 
-func (s *SysJobById) Generate() Control {
+func (s *SysJobById) Generate() dto.Control {
 	cp := *s
 	return &cp
 }
 
-func (s *SysJobById) GenerateM() (model.ActiveRecord, error) {
+func (s *SysJobById) GenerateM() (models2.ActiveRecord, error) {
 	return &models.SysJob{}, nil
 }
 

app/jobs/jobbase.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/robfig/cron/v3"
 
-	"go-admin/global"
+	"go-admin/app/admin/models"
-	"go-admin/models"
+	"go-admin/common/global"
 	"go-admin/pkg"
 	"go-admin/pkg/cronjob"
 )

cmd/api/server.go

@@ -13,12 +13,12 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"go-admin/database"
+	"go-admin/app/admin/router"
-	"go-admin/global"
+	"go-admin/app/jobs"
-	"go-admin/jobs"
+	"go-admin/common/database"
+	"go-admin/common/global"
 	mycasbin "go-admin/pkg/casbin"
 	"go-admin/pkg/logger"
-	"go-admin/router"
 	"go-admin/tools"
 	"go-admin/tools/config"
 )

cmd/cobra.go

@@ -11,7 +11,7 @@ import (
 	"go-admin/cmd/config"
 	"go-admin/cmd/migrate"
 	"go-admin/cmd/version"
-	"go-admin/global"
+	"go-admin/common/global"
 	"go-admin/tools"
 )
 

cmd/migrate/server.go

@@ -5,10 +5,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"go-admin/database"
+	"go-admin/app/admin/models"
-	"go-admin/global"
+	"go-admin/app/admin/models/gorm"
-	"go-admin/models"
+	"go-admin/common/database"
-	"go-admin/models/gorm"
+	"go-admin/common/global"
 	"go-admin/pkg/logger"
 	"go-admin/tools/config"
 )

cmd/version/server.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"go-admin/global"
+	"go-admin/common/global"
 )
 
 var (

common/actions/create.go

@@ -2,18 +2,17 @@ package actions
 
 import (
 	"errors"
-	"go-admin/service/dto"
-
 	"github.com/gin-gonic/gin"
+	dto2 "go-admin/common/dto"
+	"go-admin/common/models"
 	"gorm.io/gorm"
 
 	"go-admin/tools"
 	"go-admin/tools/app"
-	"go-admin/tools/model"
 )
 
 // CreateAction 通用新增动作
-func CreateAction(control dto.Control) gin.HandlerFunc {
+func CreateAction(control dto2.Control) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		req := control.Generate()
 		var err error
@@ -28,7 +27,7 @@ func CreateAction(control dto.Control) gin.HandlerFunc {
 			db := idb.(*gorm.DB)
 			err = req.Bind(c)
 			tools.HasError(err, "参数验证失败", 422)
-			var object model.ActiveRecord
+			var object models.ActiveRecord
 			object, err = req.GenerateM()
 			tools.HasError(err, "模型生成失败", 422)
 			object.SetCreateBy(tools.GetUserIdUint(c))

common/actions/delete.go

@@ -2,18 +2,18 @@ package actions
 
 import (
 	"errors"
-	"go-admin/service/dto"
+	dto2 "go-admin/common/dto"
+	"go-admin/common/models"
 	"go-admin/tools/app"
 
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 
 	"go-admin/tools"
-	"go-admin/tools/model"
 )
 
 // DeleteAction 通用删除动作
-func DeleteAction(control dto.Control) gin.HandlerFunc {
+func DeleteAction(control dto2.Control) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		var err error
 		idb, exist := c.Get("db")
@@ -28,7 +28,7 @@ func DeleteAction(control dto.Control) gin.HandlerFunc {
 			req := control.Generate()
 			err = req.Bind(c)
 			tools.HasError(err, "参数验证失败", 422)
-			var object model.ActiveRecord
+			var object models.ActiveRecord
 			object, err = req.GenerateM()
 			tools.HasError(err, "模型生成失败", 500)
 

common/actions/index.go

@@ -2,18 +2,18 @@ package actions
 
 import (
 	"errors"
+	dto2 "go-admin/common/dto"
+	"go-admin/common/models"
 
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 
-	"go-admin/service/dto"
 	"go-admin/tools"
 	"go-admin/tools/app"
-	"go-admin/tools/model"
 )
 
 // IndexAction 通用查询动作
-func IndexAction(m model.ActiveRecord, d dto.Index, f func() interface{}) gin.HandlerFunc {
+func IndexAction(m models.ActiveRecord, d dto2.Index, f func() interface{}) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		list := f()
 		object := m.Generate()
@@ -39,8 +39,8 @@ func IndexAction(m model.ActiveRecord, d dto.Index, f func() interface{}) gin.Ha
 
 			err = db.WithContext(c).Model(object).
 				Scopes(
-					tools.MakeCondition(req.GetNeedSearch()),
+					dto2.MakeCondition(req.GetNeedSearch()),
-					tools.Paginate(req.GetPageSize(), req.GetPageIndex()),
+					dto2.Paginate(req.GetPageSize(), req.GetPageIndex()),
 					Permission(object.TableName(), p),
 				).
 				Find(list).Limit(-1).Offset(-1).

common/actions/permission.go

@@ -2,8 +2,8 @@ package actions
 
 import (
 	"errors"
+	"fmt"
 	"github.com/gin-gonic/gin"
-	"go-admin/models"
 	"go-admin/tools/config"
 
 	"gorm.io/gorm"
@@ -32,12 +32,23 @@ func PermissionAction() gin.HandlerFunc {
 			var p = new(dataPermission)
 			if userId := tools.GetUserIdStr(c); userId != "" {
 				p, err = newDataPermission(db, userId)
-				tools.HasError(err, "权限范围鉴定错误", 500)
+				if err != nil {
+					c.JSON(500, gin.H{
+						"code": 500,
+						"msg":  fmt.Sprintf("权限范围鉴定错误, error:%v", err),
+					})
+					c.Abort()
+					return
+				}
 			}
 			c.Set(PermissionKey, p)
 		default:
-			err = errors.New("db connect not exist")
+			c.JSON(500, gin.H{
-			tools.HasError(err, "", 500)
+				"code": 500,
+				"msg":  "db connect not exist",
+			})
+			c.Abort()
+			return
 		}
 		c.Next()
 	}
@@ -46,23 +57,16 @@ func PermissionAction() gin.HandlerFunc {
 func newDataPermission(tx *gorm.DB, userId interface{}) (*dataPermission, error) {
 	var err error
 	p := &dataPermission{}
-	sysUser := new(models.SysUser)
-	sysRole := new(models.SysRole)
 
-	err = sysUser.GetByUserId(tx, userId)
+	err = tx.Table("sys_user").
+		Select("sys_user.user_id", "sys_role.role_id", "sys_user.dept_id", "sys_role.data_scope").
+		Joins("left join sys_role on sys_role.role_id = sys_user.role_id").
+		Where("sys_user.user_id = ?", userId).
+		Scan(&p).Error
 	if err != nil {
 		err = errors.New("获取用户数据出错 msg:" + err.Error())
 		return nil, err
 	}
-	p.UserId = sysUser.UserId
-	p.RoleId = sysUser.RoleId
-	p.DeptId = sysUser.DeptId
-	err = sysRole.GetById(tx, sysUser.RoleId)
-	if err != nil {
-		err = errors.New("获取用户数据出错 msg:" + err.Error())
-		return nil, err
-	}
-	p.DataScope = sysRole.DataScope
 	return p, nil
 }
 

common/actions/update.go

@@ -2,18 +2,17 @@ package actions
 
 import (
 	"errors"
-	"go-admin/service/dto"
-
 	"github.com/gin-gonic/gin"
+	dto2 "go-admin/common/dto"
+	"go-admin/common/models"
 	"gorm.io/gorm"
 
 	"go-admin/tools"
 	"go-admin/tools/app"
-	"go-admin/tools/model"
 )
 
 // UpdateAction 通用更新动作
-func UpdateAction(control dto.Control) gin.HandlerFunc {
+func UpdateAction(control dto2.Control) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		req := control.Generate()
 		var err error
@@ -28,7 +27,7 @@ func UpdateAction(control dto.Control) gin.HandlerFunc {
 			db := idb.(*gorm.DB)
 			err = req.Bind(c)
 			tools.HasError(err, "参数验证失败", 422)
-			var object model.ActiveRecord
+			var object models.ActiveRecord
 			object, err = req.GenerateM()
 			tools.HasError(err, "参数验证失败", 422)
 			object.SetUpdateBy(tools.GetUserIdUint(c))

common/actions/view.go

@@ -2,18 +2,18 @@ package actions
 
 import (
 	"errors"
-	"go-admin/service/dto"
+	dto2 "go-admin/common/dto"
+	"go-admin/common/models"
 	"go-admin/tools/app"
 
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 
 	"go-admin/tools"
-	"go-admin/tools/model"
 )
 
 // ViewAction 通用详情动作
-func ViewAction(control dto.Control) gin.HandlerFunc {
+func ViewAction(control dto2.Control) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		var err error
 		idb, exist := c.Get("db")
@@ -28,7 +28,7 @@ func ViewAction(control dto.Control) gin.HandlerFunc {
 			req := control.Generate()
 			err = req.Bind(c)
 			tools.HasError(err, "参数验证失败", 422)
-			var object model.ActiveRecord
+			var object models.ActiveRecord
 			object, err = req.GenerateM()
 			tools.HasError(err, "模型生成失败", 500)
 

common/database/mysql-drive.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"time"
 
-	"go-admin/global"
+	"go-admin/common/global"
 	"go-admin/tools"
 	"go-admin/tools/config"
 )

common/database/pgsql-driver.go

@@ -10,7 +10,7 @@ import (
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
 
-	"go-admin/global"
+	"go-admin/common/global"
 	"go-admin/tools/config"
 )
 

common/database/sqlite3-driver.go

@@ -12,7 +12,7 @@ import (
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
 
-	"go-admin/global"
+	"go-admin/common/global"
 	"go-admin/tools/config"
 )
 

common/dto/search.go

@@ -1,4 +1,4 @@
-package tools
+package dto
 
 import (
 	"go-admin/tools/config"

common/dto/type.go

@@ -2,7 +2,7 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/tools/model"
+	"go-admin/common/models"
 )
 
 type Index interface {
@@ -16,6 +16,6 @@ type Index interface {
 type Control interface {
 	Generate() Control
 	Bind(ctx *gin.Context) error
-	GenerateM() (model.ActiveRecord, error)
+	GenerateM() (models.ActiveRecord, error)
 	GetId() interface{}
 }