From 01ea376015c35f31eef3d8267b253bf2e5fa6c8b Mon Sep 17 00:00:00 2001
From: linwenxiang <991154416@qq.com>
Date: Fri, 4 Sep 2020 00:21:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  2 +-
 {apis => app/admin/apis}/log/loginlog.go      |  2 +-
 {apis => app/admin/apis}/log/operlog.go       |  2 +-
 {apis => app/admin/apis}/monitor/server.go    |  0
 {apis => app/admin/apis}/public/file.go       |  0
 .../admin/apis}/syscategory/syscategory.go    |  2 +-
 .../admin/apis}/syscontent/syscontent.go      |  2 +-
 {apis => app/admin/apis}/sysfiledir/dir.go    |  2 +-
 .../admin/apis}/sysfileinfo/sysfileinfo.go    |  2 +-
 {apis => app/admin/apis}/sysjob/sysjob.go     |  9 ++---
 {apis => app/admin/apis}/system/captcha.go    |  0
 {apis => app/admin/apis}/system/config.go     |  2 +-
 {apis => app/admin/apis}/system/dept.go       |  2 +-
 .../admin/apis}/system/dict/dictdata.go       |  2 +-
 .../admin/apis}/system/dict/dicttype.go       |  4 +--
 {apis => app/admin/apis}/system/index.go      |  0
 {apis => app/admin/apis}/system/info.go       |  2 +-
 {apis => app/admin/apis}/system/menu.go       |  2 +-
 {apis => app/admin/apis}/system/post.go       |  2 +-
 {apis => app/admin/apis}/system/role.go       |  2 +-
 {apis => app/admin/apis}/system/rolemenu.go   |  2 +-
 {apis => app/admin/apis}/system/settings.go   |  3 +-
 {apis => app/admin/apis}/system/sysuser.go    |  4 +--
 {apis => app/admin/apis}/tools/dbcolumns.go   |  2 +-
 {apis => app/admin/apis}/tools/dbtables.go    |  2 +-
 {apis => app/admin/apis}/tools/gen.go         |  6 ++--
 {apis => app/admin/apis}/tools/systables.go   |  2 +-
 {middleware => app/admin/middleware}/auth.go  |  2 +-
 .../admin/middleware}/customerror.go          |  0
 app/admin/middleware/db.go                    |  5 +++
 .../admin/middleware/handler}/auth.go         |  4 +--
 .../admin/middleware/handler}/httpshandler.go |  0
 .../admin/middleware/handler}/nofound.go      |  1 -
 .../admin/middleware/handler}/ping.go         |  0
 .../admin/middleware/handler}/sd/check.go     |  0
 .../admin/middleware}/header.go               |  0
 {middleware => app/admin/middleware}/init.go  |  0
 .../admin/middleware}/logger.go               |  5 ++-
 .../admin/middleware}/permission.go           |  0
 .../admin/middleware}/requestid.go            |  0
 {models => app/admin/models}/casbinrule.go    |  0
 {models => app/admin/models}/config.go        |  2 +-
 {models => app/admin/models}/datascope.go     |  0
 {models => app/admin/models}/dept.go          |  2 +-
 {models => app/admin/models}/dictdata.go      |  2 +-
 {models => app/admin/models}/dicttype.go      |  2 +-
 {models => app/admin/models}/filedir.go       |  2 +-
 {models => app/admin/models}/gorm/data.go     |  4 +--
 {models => app/admin/models}/gorm/gorm.go     |  6 ++--
 {models => app/admin/models}/initdb.go        |  2 +-
 {models => app/admin/models}/login.go         |  2 +-
 {models => app/admin/models}/loginlog.go      |  2 +-
 {models => app/admin/models}/menu.go          |  2 +-
 {models => app/admin/models}/model.go         |  0
 {models => app/admin/models}/operlog.go       |  2 +-
 {models => app/admin/models}/post.go          |  2 +-
 {models => app/admin/models}/role.go          |  2 +-
 {models => app/admin/models}/roledept.go      |  2 +-
 {models => app/admin/models}/rolemenu.go      |  2 +-
 {models => app/admin/models}/syscategory.go   |  2 +-
 {models => app/admin/models}/syscontent.go    |  2 +-
 {models => app/admin/models}/sysfileinfo.go   |  2 +-
 {models => app/admin/models}/sysjob.go        | 11 +++---
 {models => app/admin/models}/system.go        |  2 +-
 {models => app/admin/models}/sysuser.go       |  4 +--
 .../admin/models}/tools/dbcolumns.go          |  2 +-
 .../admin/models}/tools/dbtables.go           |  2 +-
 .../admin/models}/tools/syscolumns.go         |  4 +--
 .../admin/models}/tools/systables.go          |  4 +--
 {router => app/admin/router}/initrouter.go    |  6 ++--
 {router => app/admin/router}/router.go        |  0
 {router => app/admin/router}/syscategory.go   |  4 +--
 {router => app/admin/router}/syscontent.go    |  4 +--
 {router => app/admin/router}/sysfileinfo.go   |  4 +--
 {router => app/admin/router}/sysrouter.go     | 27 +++++++-------
 .../admin/service}/dto/pagination.go          |  0
 {service => app/admin/service}/dto/sysjob.go  | 15 ++++----
 .../admin/service}/dto/systables.go           |  0
 {jobs => app/jobs}/examples.go                |  0
 {jobs => app/jobs}/jobbase.go                 |  4 +--
 {jobs => app/jobs}/type.go                    |  0
 cmd/api/server.go                             |  8 ++---
 cmd/cobra.go                                  |  2 +-
 cmd/migrate/server.go                         |  8 ++---
 cmd/version/server.go                         |  2 +-
 {apis => common}/actions/create.go            |  9 +++--
 {apis => common}/actions/delete.go            |  8 ++---
 {apis => common}/actions/index.go             | 10 +++---
 {apis => common}/actions/permission.go        | 36 ++++++++++---------
 {apis => common}/actions/type.go              |  0
 {apis => common}/actions/update.go            |  9 +++--
 {apis => common}/actions/view.go              |  8 ++---
 {database => common/database}/initialize.go   |  0
 {database => common/database}/interface.go    |  0
 {database => common/database}/mysql-drive.go  |  2 +-
 {database => common/database}/pgsql-driver.go |  2 +-
 .../database}/sqlite3-driver.go               |  2 +-
 tools/dto.go => common/dto/search.go          |  2 +-
 {service => common}/dto/type.go               |  4 +--
 {global => common/global}/adm.go              |  0
 {global => common/global}/logger.go           |  0
 {middleware => common/middleware}/db.go       |  0
 common/models/by.go                           |  6 ++++
 {tools/model => common/models}/type.go        |  2 +-
 examples/run.go                               |  4 +--
 pkg/casbin/mycasbin.go                        |  2 +-
 pkg/logger/logger.go                          |  2 +-
 template/dto.go.template                      |  2 +-
 tools/model/by.go                             |  6 ----
 109 files changed, 180 insertions(+), 172 deletions(-)
 rename {apis => app/admin/apis}/log/loginlog.go (99%)
 rename {apis => app/admin/apis}/log/operlog.go (99%)
 rename {apis => app/admin/apis}/monitor/server.go (100%)
 rename {apis => app/admin/apis}/public/file.go (100%)
 rename {apis => app/admin/apis}/syscategory/syscategory.go (98%)
 rename {apis => app/admin/apis}/syscontent/syscontent.go (98%)
 rename {apis => app/admin/apis}/sysfiledir/dir.go (98%)
 rename {apis => app/admin/apis}/sysfileinfo/sysfileinfo.go (98%)
 rename {apis => app/admin/apis}/sysjob/sysjob.go (91%)
 rename {apis => app/admin/apis}/system/captcha.go (100%)
 rename {apis => app/admin/apis}/system/config.go (99%)
 rename {apis => app/admin/apis}/system/dept.go (99%)
 rename {apis => app/admin/apis}/system/dict/dictdata.go (99%)
 rename {apis => app/admin/apis}/system/dict/dicttype.go (98%)
 rename {apis => app/admin/apis}/system/index.go (100%)
 rename {apis => app/admin/apis}/system/info.go (97%)
 rename {apis => app/admin/apis}/system/menu.go (99%)
 rename {apis => app/admin/apis}/system/post.go (99%)
 rename {apis => app/admin/apis}/system/role.go (99%)
 rename {apis => app/admin/apis}/system/rolemenu.go (98%)
 rename {apis => app/admin/apis}/system/settings.go (98%)
 rename {apis => app/admin/apis}/system/sysuser.go (99%)
 rename {apis => app/admin/apis}/tools/dbcolumns.go (97%)
 rename {apis => app/admin/apis}/tools/dbtables.go (97%)
 rename {apis => app/admin/apis}/tools/gen.go (99%)
 rename {apis => app/admin/apis}/tools/systables.go (99%)
 rename {middleware => app/admin/middleware}/auth.go (94%)
 rename {middleware => app/admin/middleware}/customerror.go (100%)
 create mode 100644 app/admin/middleware/db.go
 rename {handler => app/admin/middleware/handler}/auth.go (98%)
 rename {handler => app/admin/middleware/handler}/httpshandler.go (100%)
 rename {handler => app/admin/middleware/handler}/nofound.go (99%)
 rename {handler => app/admin/middleware/handler}/ping.go (100%)
 rename {handler => app/admin/middleware/handler}/sd/check.go (100%)
 rename {middleware => app/admin/middleware}/header.go (100%)
 rename {middleware => app/admin/middleware}/init.go (100%)
 rename {middleware => app/admin/middleware}/logger.go (97%)
 rename {middleware => app/admin/middleware}/permission.go (100%)
 rename {middleware => app/admin/middleware}/requestid.go (100%)
 rename {models => app/admin/models}/casbinrule.go (100%)
 rename {models => app/admin/models}/config.go (99%)
 rename {models => app/admin/models}/datascope.go (100%)
 rename {models => app/admin/models}/dept.go (99%)
 rename {models => app/admin/models}/dictdata.go (99%)
 rename {models => app/admin/models}/dicttype.go (99%)
 rename {models => app/admin/models}/filedir.go (99%)
 rename {models => app/admin/models}/gorm/data.go (98%)
 rename {models => app/admin/models}/gorm/gorm.go (85%)
 rename {models => app/admin/models}/initdb.go (98%)
 rename {models => app/admin/models}/login.go (96%)
 rename {models => app/admin/models}/loginlog.go (99%)
 rename {models => app/admin/models}/menu.go (99%)
 rename {models => app/admin/models}/model.go (100%)
 rename {models => app/admin/models}/operlog.go (99%)
 rename {models => app/admin/models}/post.go (99%)
 rename {models => app/admin/models}/role.go (99%)
 rename {models => app/admin/models}/roledept.go (97%)
 rename {models => app/admin/models}/rolemenu.go (99%)
 rename {models => app/admin/models}/syscategory.go (99%)
 rename {models => app/admin/models}/syscontent.go (99%)
 rename {models => app/admin/models}/sysfileinfo.go (99%)
 rename {models => app/admin/models}/sysjob.go (90%)
 rename {models => app/admin/models}/system.go (96%)
 rename {models => app/admin/models}/sysuser.go (98%)
 rename {models => app/admin/models}/tools/dbcolumns.go (98%)
 rename {models => app/admin/models}/tools/dbtables.go (98%)
 rename {models => app/admin/models}/tools/syscolumns.go (98%)
 rename {models => app/admin/models}/tools/systables.go (99%)
 rename {router => app/admin/router}/initrouter.go (88%)
 rename {router => app/admin/router}/router.go (100%)
 rename {router => app/admin/router}/syscategory.go (90%)
 rename {router => app/admin/router}/syscontent.go (89%)
 rename {router => app/admin/router}/sysfileinfo.go (90%)
 rename {router => app/admin/router}/sysrouter.go (95%)
 rename {service => app/admin/service}/dto/pagination.go (100%)
 rename {service => app/admin/service}/dto/sysjob.go (88%)
 rename {service => app/admin/service}/dto/systables.go (100%)
 rename {jobs => app/jobs}/examples.go (100%)
 rename {jobs => app/jobs}/jobbase.go (98%)
 rename {jobs => app/jobs}/type.go (100%)
 rename {apis => common}/actions/create.go (85%)
 rename {apis => common}/actions/delete.go (88%)
 rename {apis => common}/actions/index.go (81%)
 rename {apis => common}/actions/permission.go (78%)
 rename {apis => common}/actions/type.go (100%)
 rename {apis => common}/actions/update.go (88%)
 rename {apis => common}/actions/view.go (88%)
 rename {database => common/database}/initialize.go (100%)
 rename {database => common/database}/interface.go (100%)
 rename {database => common/database}/mysql-drive.go (98%)
 rename {database => common/database}/pgsql-driver.go (97%)
 rename {database => common/database}/sqlite3-driver.go (97%)
 rename tools/dto.go => common/dto/search.go (99%)
 rename {service => common}/dto/type.go (81%)
 rename {global => common/global}/adm.go (100%)
 rename {global => common/global}/logger.go (100%)
 rename {middleware => common/middleware}/db.go (100%)
 create mode 100644 common/models/by.go
 rename {tools/model => common/models}/type.go (92%)
 delete mode 100644 tools/model/by.go

diff --git a/.gitignore b/.gitignore
index 01e54249..9ee84eb0 100644
--- a/.gitignore
+++ b/.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
diff --git a/apis/log/loginlog.go b/app/admin/apis/log/loginlog.go
similarity index 99%
rename from apis/log/loginlog.go
rename to app/admin/apis/log/loginlog.go
index 3fc92906..cfcb78af 100644
--- a/apis/log/loginlog.go
+++ b/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"
 )
diff --git a/apis/log/operlog.go b/app/admin/apis/log/operlog.go
similarity index 99%
rename from apis/log/operlog.go
rename to app/admin/apis/log/operlog.go
index b8b540da..3df538ca 100644
--- a/apis/log/operlog.go
+++ b/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"
 )
diff --git a/apis/monitor/server.go b/app/admin/apis/monitor/server.go
similarity index 100%
rename from apis/monitor/server.go
rename to app/admin/apis/monitor/server.go
diff --git a/apis/public/file.go b/app/admin/apis/public/file.go
similarity index 100%
rename from apis/public/file.go
rename to app/admin/apis/public/file.go
diff --git a/apis/syscategory/syscategory.go b/app/admin/apis/syscategory/syscategory.go
similarity index 98%
rename from apis/syscategory/syscategory.go
rename to app/admin/apis/syscategory/syscategory.go
index b847d637..05d2485d 100644
--- a/apis/syscategory/syscategory.go
+++ b/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"
diff --git a/apis/syscontent/syscontent.go b/app/admin/apis/syscontent/syscontent.go
similarity index 98%
rename from apis/syscontent/syscontent.go
rename to app/admin/apis/syscontent/syscontent.go
index b04c3113..fd313abd 100644
--- a/apis/syscontent/syscontent.go
+++ b/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"
diff --git a/apis/sysfiledir/dir.go b/app/admin/apis/sysfiledir/dir.go
similarity index 98%
rename from apis/sysfiledir/dir.go
rename to app/admin/apis/sysfiledir/dir.go
index fd42ef88..fbf142be 100644
--- a/apis/sysfiledir/dir.go
+++ b/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"
diff --git a/apis/sysfileinfo/sysfileinfo.go b/app/admin/apis/sysfileinfo/sysfileinfo.go
similarity index 98%
rename from apis/sysfileinfo/sysfileinfo.go
rename to app/admin/apis/sysfileinfo/sysfileinfo.go
index a36a9b2f..509c74a9 100644
--- a/apis/sysfileinfo/sysfileinfo.go
+++ b/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"
diff --git a/apis/sysjob/sysjob.go b/app/admin/apis/sysjob/sysjob.go
similarity index 91%
rename from apis/sysjob/sysjob.go
rename to app/admin/apis/sysjob/sysjob.go
index e24d4cbf..d90a9053 100644
--- a/apis/sysjob/sysjob.go
+++ b/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/models"
+	"go-admin/app/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
diff --git a/apis/system/captcha.go b/app/admin/apis/system/captcha.go
similarity index 100%
rename from apis/system/captcha.go
rename to app/admin/apis/system/captcha.go
diff --git a/apis/system/config.go b/app/admin/apis/system/config.go
similarity index 99%
rename from apis/system/config.go
rename to app/admin/apis/system/config.go
index 71f2923f..210925b9 100644
--- a/apis/system/config.go
+++ b/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"
diff --git a/apis/system/dept.go b/app/admin/apis/system/dept.go
similarity index 99%
rename from apis/system/dept.go
rename to app/admin/apis/system/dept.go
index 40dcb336..fb33bfae 100644
--- a/apis/system/dept.go
+++ b/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"
diff --git a/apis/system/dict/dictdata.go b/app/admin/apis/system/dict/dictdata.go
similarity index 99%
rename from apis/system/dict/dictdata.go
rename to app/admin/apis/system/dict/dictdata.go
index b9d2552b..571420a5 100644
--- a/apis/system/dict/dictdata.go
+++ b/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"
 )
diff --git a/apis/system/dict/dicttype.go b/app/admin/apis/system/dict/dicttype.go
similarity index 98%
rename from apis/system/dict/dicttype.go
rename to app/admin/apis/system/dict/dicttype.go
index 44eefc3c..8a612e25 100644
--- a/apis/system/dict/dicttype.go
+++ b/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获取字典类型
diff --git a/apis/system/index.go b/app/admin/apis/system/index.go
similarity index 100%
rename from apis/system/index.go
rename to app/admin/apis/system/index.go
diff --git a/apis/system/info.go b/app/admin/apis/system/info.go
similarity index 97%
rename from apis/system/info.go
rename to app/admin/apis/system/info.go
index 7c410195..694abcd6 100644
--- a/apis/system/info.go
+++ b/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"
 )
diff --git a/apis/system/menu.go b/app/admin/apis/system/menu.go
similarity index 99%
rename from apis/system/menu.go
rename to app/admin/apis/system/menu.go
index 9eba7f5e..dd01d624 100644
--- a/apis/system/menu.go
+++ b/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"
 )
diff --git a/apis/system/post.go b/app/admin/apis/system/post.go
similarity index 99%
rename from apis/system/post.go
rename to app/admin/apis/system/post.go
index 86fdde64..bd7aba6b 100644
--- a/apis/system/post.go
+++ b/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"
 )
diff --git a/apis/system/role.go b/app/admin/apis/system/role.go
similarity index 99%
rename from apis/system/role.go
rename to app/admin/apis/system/role.go
index bc10dce2..e6738dd4 100644
--- a/apis/system/role.go
+++ b/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"
 )
diff --git a/apis/system/rolemenu.go b/app/admin/apis/system/rolemenu.go
similarity index 98%
rename from apis/system/rolemenu.go
rename to app/admin/apis/system/rolemenu.go
index dcefa9fc..1844599d 100644
--- a/apis/system/rolemenu.go
+++ b/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"
 )
 
diff --git a/apis/system/settings.go b/app/admin/apis/system/settings.go
similarity index 98%
rename from apis/system/settings.go
rename to app/admin/apis/system/settings.go
index 7878344f..12335f55 100644
--- a/apis/system/settings.go
+++ b/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 查询系统信息
diff --git a/apis/system/sysuser.go b/app/admin/apis/system/sysuser.go
similarity index 99%
rename from apis/system/sysuser.go
rename to app/admin/apis/system/sysuser.go
index 5f637aa1..7c0b5ac8 100644
--- a/apis/system/sysuser.go
+++ b/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/models"
+	"go-admin/app/admin/models"
+	"go-admin/common/global"
 	"go-admin/tools"
 	"go-admin/tools/app"
 )
diff --git a/apis/tools/dbcolumns.go b/app/admin/apis/tools/dbcolumns.go
similarity index 97%
rename from apis/tools/dbcolumns.go
rename to app/admin/apis/tools/dbcolumns.go
index 4616d727..57f711bd 100644
--- a/apis/tools/dbcolumns.go
+++ b/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"
 )
diff --git a/apis/tools/dbtables.go b/app/admin/apis/tools/dbtables.go
similarity index 97%
rename from apis/tools/dbtables.go
rename to app/admin/apis/tools/dbtables.go
index b5d46f0b..361fb044 100644
--- a/apis/tools/dbtables.go
+++ b/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"
diff --git a/apis/tools/gen.go b/app/admin/apis/tools/gen.go
similarity index 99%
rename from apis/tools/gen.go
rename to app/admin/apis/tools/gen.go
index df519674..b3a1e734 100644
--- a/apis/tools/gen.go
+++ b/app/admin/apis/tools/gen.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"go-admin/global"
-	"go-admin/models"
-	"go-admin/models/tools"
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/models/tools"
+	"go-admin/common/global"
 	tools2 "go-admin/tools"
 	"go-admin/tools/app"
 	"go-admin/tools/config"
diff --git a/apis/tools/systables.go b/app/admin/apis/tools/systables.go
similarity index 99%
rename from apis/tools/systables.go
rename to app/admin/apis/tools/systables.go
index 08b4c8f0..d5a90644 100644
--- a/apis/tools/systables.go
+++ b/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"
 )
diff --git a/middleware/auth.go b/app/admin/middleware/auth.go
similarity index 94%
rename from middleware/auth.go
rename to app/admin/middleware/auth.go
index 9ed2816e..a7519a16 100644
--- a/middleware/auth.go
+++ b/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"
 )
diff --git a/middleware/customerror.go b/app/admin/middleware/customerror.go
similarity index 100%
rename from middleware/customerror.go
rename to app/admin/middleware/customerror.go
diff --git a/app/admin/middleware/db.go b/app/admin/middleware/db.go
new file mode 100644
index 00000000..79a32da9
--- /dev/null
+++ b/app/admin/middleware/db.go
@@ -0,0 +1,5 @@
+package middleware
+
+import "go-admin/common/middleware"
+
+var WithContextDb = middleware.WithContextDb
diff --git a/handler/auth.go b/app/admin/middleware/handler/auth.go
similarity index 98%
rename from handler/auth.go
rename to app/admin/middleware/handler/auth.go
index 03a97224..f16c3511 100644
--- a/handler/auth.go
+++ b/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/models"
+	"go-admin/app/admin/models"
+	"go-admin/common/global"
 	jwt "go-admin/pkg/jwtauth"
 	"go-admin/tools"
 	"go-admin/tools/config"
diff --git a/handler/httpshandler.go b/app/admin/middleware/handler/httpshandler.go
similarity index 100%
rename from handler/httpshandler.go
rename to app/admin/middleware/handler/httpshandler.go
diff --git a/handler/nofound.go b/app/admin/middleware/handler/nofound.go
similarity index 99%
rename from handler/nofound.go
rename to app/admin/middleware/handler/nofound.go
index 80a6518b..a7092a30 100644
--- a/handler/nofound.go
+++ b/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) {
diff --git a/handler/ping.go b/app/admin/middleware/handler/ping.go
similarity index 100%
rename from handler/ping.go
rename to app/admin/middleware/handler/ping.go
diff --git a/handler/sd/check.go b/app/admin/middleware/handler/sd/check.go
similarity index 100%
rename from handler/sd/check.go
rename to app/admin/middleware/handler/sd/check.go
diff --git a/middleware/header.go b/app/admin/middleware/header.go
similarity index 100%
rename from middleware/header.go
rename to app/admin/middleware/header.go
diff --git a/middleware/init.go b/app/admin/middleware/init.go
similarity index 100%
rename from middleware/init.go
rename to app/admin/middleware/init.go
diff --git a/middleware/logger.go b/app/admin/middleware/logger.go
similarity index 97%
rename from middleware/logger.go
rename to app/admin/middleware/logger.go
index d595dd90..f3a621d8 100644
--- a/middleware/logger.go
+++ b/app/admin/middleware/logger.go
@@ -7,11 +7,10 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"go-admin/global"
-	"go-admin/models"
+	"go-admin/app/admin/models"
+	"go-admin/common/global"
 	"go-admin/tools"
 	config2 "go-admin/tools/config"
-
 )
 
 // 日志记录到文件
diff --git a/middleware/permission.go b/app/admin/middleware/permission.go
similarity index 100%
rename from middleware/permission.go
rename to app/admin/middleware/permission.go
diff --git a/middleware/requestid.go b/app/admin/middleware/requestid.go
similarity index 100%
rename from middleware/requestid.go
rename to app/admin/middleware/requestid.go
diff --git a/models/casbinrule.go b/app/admin/models/casbinrule.go
similarity index 100%
rename from models/casbinrule.go
rename to app/admin/models/casbinrule.go
diff --git a/models/config.go b/app/admin/models/config.go
similarity index 99%
rename from models/config.go
rename to app/admin/models/config.go
index 05ac8c87..6835bce2 100644
--- a/models/config.go
+++ b/app/admin/models/config.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	_ "time"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 
diff --git a/models/datascope.go b/app/admin/models/datascope.go
similarity index 100%
rename from models/datascope.go
rename to app/admin/models/datascope.go
diff --git a/models/dept.go b/app/admin/models/dept.go
similarity index 99%
rename from models/dept.go
rename to app/admin/models/dept.go
index 8bf504f3..29544f5a 100644
--- a/models/dept.go
+++ b/app/admin/models/dept.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	_ "time"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 
diff --git a/models/dictdata.go b/app/admin/models/dictdata.go
similarity index 99%
rename from models/dictdata.go
rename to app/admin/models/dictdata.go
index 96625568..72006f18 100644
--- a/models/dictdata.go
+++ b/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"
 )
 
diff --git a/models/dicttype.go b/app/admin/models/dicttype.go
similarity index 99%
rename from models/dicttype.go
rename to app/admin/models/dicttype.go
index 9f72ef65..08a6e4a9 100644
--- a/models/dicttype.go
+++ b/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"
 )
 
diff --git a/models/filedir.go b/app/admin/models/filedir.go
similarity index 99%
rename from models/filedir.go
rename to app/admin/models/filedir.go
index 82cdbfd3..91c67fd5 100644
--- a/models/filedir.go
+++ b/app/admin/models/filedir.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 
diff --git a/models/gorm/data.go b/app/admin/models/gorm/data.go
similarity index 98%
rename from models/gorm/data.go
rename to app/admin/models/gorm/data.go
index f3bf0bb1..31dc067c 100644
--- a/models/gorm/data.go
+++ b/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", "", "", ""},
diff --git a/models/gorm/gorm.go b/app/admin/models/gorm/gorm.go
similarity index 85%
rename from models/gorm/gorm.go
rename to app/admin/models/gorm/gorm.go
index a2d050e3..dd26e4df 100644
--- a/models/gorm/gorm.go
+++ b/app/admin/models/gorm/gorm.go
@@ -3,12 +3,12 @@ package gorm
 import (
 	"gorm.io/gorm"
 
-	"go-admin/models"
-	"go-admin/models/tools"
+	"go-admin/app/admin/models"
+	"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),
diff --git a/models/initdb.go b/app/admin/models/initdb.go
similarity index 98%
rename from models/initdb.go
rename to app/admin/models/initdb.go
index 25a35a9d..e5df27e4 100644
--- a/models/initdb.go
+++ b/app/admin/models/initdb.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"strings"
 
-	"go-admin/global"
+	"go-admin/common/global"
 )
 
 func InitDb() (err error) {
diff --git a/models/login.go b/app/admin/models/login.go
similarity index 96%
rename from models/login.go
rename to app/admin/models/login.go
index 55fbe65e..26a4c4b8 100644
--- a/models/login.go
+++ b/app/admin/models/login.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 
diff --git a/models/loginlog.go b/app/admin/models/loginlog.go
similarity index 99%
rename from models/loginlog.go
rename to app/admin/models/loginlog.go
index 8af509ed..810a9640 100644
--- a/models/loginlog.go
+++ b/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 {
diff --git a/models/menu.go b/app/admin/models/menu.go
similarity index 99%
rename from models/menu.go
rename to app/admin/models/menu.go
index a04c40ba..f7970a1a 100644
--- a/models/menu.go
+++ b/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"
 )
 
diff --git a/models/model.go b/app/admin/models/model.go
similarity index 100%
rename from models/model.go
rename to app/admin/models/model.go
diff --git a/models/operlog.go b/app/admin/models/operlog.go
similarity index 99%
rename from models/operlog.go
rename to app/admin/models/operlog.go
index 4346cd58..cde719af 100644
--- a/models/operlog.go
+++ b/app/admin/models/operlog.go
@@ -3,7 +3,7 @@ package models
 import (
 	"time"
 
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 )
 
 //sys_operlog
diff --git a/models/post.go b/app/admin/models/post.go
similarity index 99%
rename from models/post.go
rename to app/admin/models/post.go
index 088fb3e1..bcdd32fb 100644
--- a/models/post.go
+++ b/app/admin/models/post.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 
diff --git a/models/role.go b/app/admin/models/role.go
similarity index 99%
rename from models/role.go
rename to app/admin/models/role.go
index 2ea09151..2537405c 100644
--- a/models/role.go
+++ b/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"
 )
 
diff --git a/models/roledept.go b/app/admin/models/roledept.go
similarity index 97%
rename from models/roledept.go
rename to app/admin/models/roledept.go
index da43693e..dd094e1c 100644
--- a/models/roledept.go
+++ b/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
diff --git a/models/rolemenu.go b/app/admin/models/rolemenu.go
similarity index 99%
rename from models/rolemenu.go
rename to app/admin/models/rolemenu.go
index 6a4110cb..2573dc67 100644
--- a/models/rolemenu.go
+++ b/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"
 )
 
diff --git a/models/syscategory.go b/app/admin/models/syscategory.go
similarity index 99%
rename from models/syscategory.go
rename to app/admin/models/syscategory.go
index 6878e44d..b277bd92 100644
--- a/models/syscategory.go
+++ b/app/admin/models/syscategory.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 
diff --git a/models/syscontent.go b/app/admin/models/syscontent.go
similarity index 99%
rename from models/syscontent.go
rename to app/admin/models/syscontent.go
index 28d1d286..cfa93026 100644
--- a/models/syscontent.go
+++ b/app/admin/models/syscontent.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 
diff --git a/models/sysfileinfo.go b/app/admin/models/sysfileinfo.go
similarity index 99%
rename from models/sysfileinfo.go
rename to app/admin/models/sysfileinfo.go
index 48e7f29f..ff0ea576 100644
--- a/models/sysfileinfo.go
+++ b/app/admin/models/sysfileinfo.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 	"go-admin/tools"
 )
 
diff --git a/models/sysjob.go b/app/admin/models/sysjob.go
similarity index 90%
rename from models/sysjob.go
rename to app/admin/models/sysjob.go
index 828e0707..703d4c2e 100644
--- a/models/sysjob.go
+++ b/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
diff --git a/models/system.go b/app/admin/models/system.go
similarity index 96%
rename from models/system.go
rename to app/admin/models/system.go
index ca6741f2..ec94125f 100644
--- a/models/system.go
+++ b/app/admin/models/system.go
@@ -1,7 +1,7 @@
 package models
 
 import (
-	orm "go-admin/global"
+	orm "go-admin/common/global"
 )
 
 type SysSetting struct {
diff --git a/models/sysuser.go b/app/admin/models/sysuser.go
similarity index 98%
rename from models/sysuser.go
rename to app/admin/models/sysuser.go
index 3d80e8e1..c31ad27e 100644
--- a/models/sysuser.go
+++ b/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
 	}
diff --git a/models/tools/dbcolumns.go b/app/admin/models/tools/dbcolumns.go
similarity index 98%
rename from models/tools/dbcolumns.go
rename to app/admin/models/tools/dbcolumns.go
index 08d6b4c1..5a01d4b7 100644
--- a/models/tools/dbcolumns.go
+++ b/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"
 )
diff --git a/models/tools/dbtables.go b/app/admin/models/tools/dbtables.go
similarity index 98%
rename from models/tools/dbtables.go
rename to app/admin/models/tools/dbtables.go
index a802f68b..0ef2a8d7 100644
--- a/models/tools/dbtables.go
+++ b/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"
 )
diff --git a/models/tools/syscolumns.go b/app/admin/models/tools/syscolumns.go
similarity index 98%
rename from models/tools/syscolumns.go
rename to app/admin/models/tools/syscolumns.go
index 12a79efc..9bcbd83b 100644
--- a/models/tools/syscolumns.go
+++ b/app/admin/models/tools/syscolumns.go
@@ -1,8 +1,8 @@
 package tools
 
 import (
-	orm "go-admin/global"
-	"go-admin/models"
+	"go-admin/app/admin/models"
+	orm "go-admin/common/global"
 )
 
 type SysColumns struct {
diff --git a/models/tools/systables.go b/app/admin/models/tools/systables.go
similarity index 99%
rename from models/tools/systables.go
rename to app/admin/models/tools/systables.go
index 372855ff..24f973b5 100644
--- a/models/tools/systables.go
+++ b/app/admin/models/tools/systables.go
@@ -3,8 +3,8 @@ package tools
 import (
 	"strings"
 
-	orm "go-admin/global"
-	"go-admin/models"
+	"go-admin/app/admin/models"
+	orm "go-admin/common/global"
 )
 
 type SysTables struct {
diff --git a/router/initrouter.go b/app/admin/router/initrouter.go
similarity index 88%
rename from router/initrouter.go
rename to app/admin/router/initrouter.go
index 322e42fd..e6411dab 100644
--- a/router/initrouter.go
+++ b/app/admin/router/initrouter.go
@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/global"
-	"go-admin/handler"
-	"go-admin/middleware"
+	"go-admin/app/admin/middleware"
+	"go-admin/app/admin/middleware/handler"
+	"go-admin/common/global"
 	_ "go-admin/pkg/jwtauth"
 	"go-admin/tools"
 	config2 "go-admin/tools/config"
diff --git a/router/router.go b/app/admin/router/router.go
similarity index 100%
rename from router/router.go
rename to app/admin/router/router.go
diff --git a/router/syscategory.go b/app/admin/router/syscategory.go
similarity index 90%
rename from router/syscategory.go
rename to app/admin/router/syscategory.go
index 31a6e340..187389b2 100644
--- a/router/syscategory.go
+++ b/app/admin/router/syscategory.go
@@ -2,8 +2,8 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/apis/syscategory"
-	"go-admin/middleware"
+	"go-admin/app/admin/apis/syscategory"
+	"go-admin/app/admin/middleware"
 	jwt "go-admin/pkg/jwtauth"
 )
 
diff --git a/router/syscontent.go b/app/admin/router/syscontent.go
similarity index 89%
rename from router/syscontent.go
rename to app/admin/router/syscontent.go
index f02f2f1d..f72488bb 100644
--- a/router/syscontent.go
+++ b/app/admin/router/syscontent.go
@@ -2,8 +2,8 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/apis/syscontent"
-	"go-admin/middleware"
+	"go-admin/app/admin/apis/syscontent"
+	"go-admin/app/admin/middleware"
 	jwt "go-admin/pkg/jwtauth"
 )
 
diff --git a/router/sysfileinfo.go b/app/admin/router/sysfileinfo.go
similarity index 90%
rename from router/sysfileinfo.go
rename to app/admin/router/sysfileinfo.go
index dd74b9e0..b701c20f 100644
--- a/router/sysfileinfo.go
+++ b/app/admin/router/sysfileinfo.go
@@ -2,8 +2,8 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/apis/sysfiledir"
-	"go-admin/apis/sysfileinfo"
+	"go-admin/app/admin/apis/sysfiledir"
+	"go-admin/app/admin/apis/sysfileinfo"
 )
 
 // 无需认证的路由代码
diff --git a/router/sysrouter.go b/app/admin/router/sysrouter.go
similarity index 95%
rename from router/sysrouter.go
rename to app/admin/router/sysrouter.go
index 6f4f7849..c2f9f355 100644
--- a/router/sysrouter.go
+++ b/app/admin/router/sysrouter.go
@@ -1,22 +1,23 @@
 package router
 
 import (
-	"go-admin/apis/actions"
-	log2 "go-admin/apis/log"
-	"go-admin/apis/monitor"
-	"go-admin/apis/public"
-	"go-admin/apis/sysjob"
-	"go-admin/apis/system"
-	"go-admin/apis/system/dict"
-	. "go-admin/apis/tools"
+	"mime"
+
+	log2 "go-admin/app/admin/apis/log"
+	"go-admin/app/admin/apis/monitor"
+	"go-admin/app/admin/apis/public"
+	"go-admin/app/admin/apis/sysjob"
+	"go-admin/app/admin/apis/system"
+	"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"
diff --git a/service/dto/pagination.go b/app/admin/service/dto/pagination.go
similarity index 100%
rename from service/dto/pagination.go
rename to app/admin/service/dto/pagination.go
diff --git a/service/dto/sysjob.go b/app/admin/service/dto/sysjob.go
similarity index 88%
rename from service/dto/sysjob.go
rename to app/admin/service/dto/sysjob.go
index f12b2834..c291bd5f 100644
--- a/service/dto/sysjob.go
+++ b/app/admin/service/dto/sysjob.go
@@ -2,8 +2,9 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/models"
-	"go-admin/tools/model"
+	"go-admin/app/admin/models"
+	"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
 }
 
diff --git a/service/dto/systables.go b/app/admin/service/dto/systables.go
similarity index 100%
rename from service/dto/systables.go
rename to app/admin/service/dto/systables.go
diff --git a/jobs/examples.go b/app/jobs/examples.go
similarity index 100%
rename from jobs/examples.go
rename to app/jobs/examples.go
diff --git a/jobs/jobbase.go b/app/jobs/jobbase.go
similarity index 98%
rename from jobs/jobbase.go
rename to app/jobs/jobbase.go
index bd9d15f8..08846bd3 100644
--- a/jobs/jobbase.go
+++ b/app/jobs/jobbase.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/robfig/cron/v3"
 
-	"go-admin/global"
-	"go-admin/models"
+	"go-admin/app/admin/models"
+	"go-admin/common/global"
 	"go-admin/pkg"
 	"go-admin/pkg/cronjob"
 )
diff --git a/jobs/type.go b/app/jobs/type.go
similarity index 100%
rename from jobs/type.go
rename to app/jobs/type.go
diff --git a/cmd/api/server.go b/cmd/api/server.go
index 2d51a097..25f12e00 100644
--- a/cmd/api/server.go
+++ b/cmd/api/server.go
@@ -13,12 +13,12 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"go-admin/database"
-	"go-admin/global"
-	"go-admin/jobs"
+	"go-admin/app/admin/router"
+	"go-admin/app/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"
 )
diff --git a/cmd/cobra.go b/cmd/cobra.go
index cbd60035..caeb17d1 100644
--- a/cmd/cobra.go
+++ b/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"
 )
 
diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go
index 45b84cab..a935bb3c 100644
--- a/cmd/migrate/server.go
+++ b/cmd/migrate/server.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"go-admin/database"
-	"go-admin/global"
-	"go-admin/models"
-	"go-admin/models/gorm"
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/models/gorm"
+	"go-admin/common/database"
+	"go-admin/common/global"
 	"go-admin/pkg/logger"
 	"go-admin/tools/config"
 )
diff --git a/cmd/version/server.go b/cmd/version/server.go
index d95f74a5..cb46e41d 100644
--- a/cmd/version/server.go
+++ b/cmd/version/server.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"go-admin/global"
+	"go-admin/common/global"
 )
 
 var (
diff --git a/apis/actions/create.go b/common/actions/create.go
similarity index 85%
rename from apis/actions/create.go
rename to common/actions/create.go
index d33555ac..6b6cd278 100644
--- a/apis/actions/create.go
+++ b/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))
diff --git a/apis/actions/delete.go b/common/actions/delete.go
similarity index 88%
rename from apis/actions/delete.go
rename to common/actions/delete.go
index b6e739b2..777412d4 100644
--- a/apis/actions/delete.go
+++ b/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)
 
diff --git a/apis/actions/index.go b/common/actions/index.go
similarity index 81%
rename from apis/actions/index.go
rename to common/actions/index.go
index c80a99a5..a58911d3 100644
--- a/apis/actions/index.go
+++ b/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()),
-					tools.Paginate(req.GetPageSize(), req.GetPageIndex()),
+					dto2.MakeCondition(req.GetNeedSearch()),
+					dto2.Paginate(req.GetPageSize(), req.GetPageIndex()),
 					Permission(object.TableName(), p),
 				).
 				Find(list).Limit(-1).Offset(-1).
diff --git a/apis/actions/permission.go b/common/actions/permission.go
similarity index 78%
rename from apis/actions/permission.go
rename to common/actions/permission.go
index f3092088..1cefe7b3 100644
--- a/apis/actions/permission.go
+++ b/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")
-			tools.HasError(err, "", 500)
+			c.JSON(500, gin.H{
+				"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
 }
 
diff --git a/apis/actions/type.go b/common/actions/type.go
similarity index 100%
rename from apis/actions/type.go
rename to common/actions/type.go
diff --git a/apis/actions/update.go b/common/actions/update.go
similarity index 88%
rename from apis/actions/update.go
rename to common/actions/update.go
index d552a93a..9a57aef5 100644
--- a/apis/actions/update.go
+++ b/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))
diff --git a/apis/actions/view.go b/common/actions/view.go
similarity index 88%
rename from apis/actions/view.go
rename to common/actions/view.go
index 695c6cbf..20d4692f 100644
--- a/apis/actions/view.go
+++ b/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)
 
diff --git a/database/initialize.go b/common/database/initialize.go
similarity index 100%
rename from database/initialize.go
rename to common/database/initialize.go
diff --git a/database/interface.go b/common/database/interface.go
similarity index 100%
rename from database/interface.go
rename to common/database/interface.go
diff --git a/database/mysql-drive.go b/common/database/mysql-drive.go
similarity index 98%
rename from database/mysql-drive.go
rename to common/database/mysql-drive.go
index 12818649..a053321f 100644
--- a/database/mysql-drive.go
+++ b/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"
 )
diff --git a/database/pgsql-driver.go b/common/database/pgsql-driver.go
similarity index 97%
rename from database/pgsql-driver.go
rename to common/database/pgsql-driver.go
index 8cedc342..7cbce140 100644
--- a/database/pgsql-driver.go
+++ b/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"
 )
 
diff --git a/database/sqlite3-driver.go b/common/database/sqlite3-driver.go
similarity index 97%
rename from database/sqlite3-driver.go
rename to common/database/sqlite3-driver.go
index 6beb1484..bbe5f764 100644
--- a/database/sqlite3-driver.go
+++ b/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"
 )
 
diff --git a/tools/dto.go b/common/dto/search.go
similarity index 99%
rename from tools/dto.go
rename to common/dto/search.go
index e6344c4b..ea34ccb9 100644
--- a/tools/dto.go
+++ b/common/dto/search.go
@@ -1,4 +1,4 @@
-package tools
+package dto
 
 import (
 	"go-admin/tools/config"
diff --git a/service/dto/type.go b/common/dto/type.go
similarity index 81%
rename from service/dto/type.go
rename to common/dto/type.go
index 1083a4f4..e0299436 100644
--- a/service/dto/type.go
+++ b/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{}
 }
diff --git a/global/adm.go b/common/global/adm.go
similarity index 100%
rename from global/adm.go
rename to common/global/adm.go
diff --git a/global/logger.go b/common/global/logger.go
similarity index 100%
rename from global/logger.go
rename to common/global/logger.go
diff --git a/middleware/db.go b/common/middleware/db.go
similarity index 100%
rename from middleware/db.go
rename to common/middleware/db.go
diff --git a/common/models/by.go b/common/models/by.go
new file mode 100644
index 00000000..afe259eb
--- /dev/null
+++ b/common/models/by.go
@@ -0,0 +1,6 @@
+package models
+
+type ControlBy struct {
+	CreateBy uint `gorm:"index;comment:'创建者'"`
+	UpdateBy uint `gorm:"index;comment:'更新者'"`
+}
diff --git a/tools/model/type.go b/common/models/type.go
similarity index 92%
rename from tools/model/type.go
rename to common/models/type.go
index 1e209c22..23f3a0d1 100644
--- a/tools/model/type.go
+++ b/common/models/type.go
@@ -1,4 +1,4 @@
-package model
+package models
 
 import "gorm.io/gorm/schema"
 
diff --git a/examples/run.go b/examples/run.go
index 47d555ee..98412268 100644
--- a/examples/run.go
+++ b/examples/run.go
@@ -7,10 +7,10 @@ import (
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 
-	"go-admin/global"
+	"go-admin/app/admin/router"
+	"go-admin/common/global"
 	mycasbin "go-admin/pkg/casbin"
 	"go-admin/pkg/logger"
-	"go-admin/router"
 )
 
 func main() {
diff --git a/pkg/casbin/mycasbin.go b/pkg/casbin/mycasbin.go
index bd5e7d49..f93c3895 100644
--- a/pkg/casbin/mycasbin.go
+++ b/pkg/casbin/mycasbin.go
@@ -8,7 +8,7 @@ import (
 	gormAdapter "github.com/casbin/gorm-adapter/v3"
 	_ "github.com/go-sql-driver/mysql"
 
-	"go-admin/global"
+	"go-admin/common/global"
 )
 
 // Initialize the model from a string.
diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
index 3b3ab9a9..7c958b7a 100644
--- a/pkg/logger/logger.go
+++ b/pkg/logger/logger.go
@@ -2,7 +2,7 @@ package logger
 
 import (
 	"github.com/gogf/gf/os/glog"
-	"go-admin/global"
+	"go-admin/common/global"
 	"go-admin/tools"
 	"go-admin/tools/config"
 )
diff --git a/template/dto.go.template b/template/dto.go.template
index c4e0ce7e..a59cf2da 100644
--- a/template/dto.go.template
+++ b/template/dto.go.template
@@ -9,4 +9,4 @@ type {{.ClassName}}Search struct {
 
     {{end -}}
     {{- end }}
-}
\ No newline at end of file
+}
diff --git a/tools/model/by.go b/tools/model/by.go
deleted file mode 100644
index 48ae8065..00000000
--- a/tools/model/by.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package model
-
-type ByModel struct {
-	CreateBy uint `gorm:"index;"` // 创建者
-	UpdateBy uint `gorm:"index;"` // 更新者
-}