From ef9213f261f61f724636a0d62f961c1d1759d6b7 Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 28 Sep 2021 11:51:15 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E5=96=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/{ => api}/account.go | 2 +- app/api/{ => api}/auth.go | 2 +- app/api/{ => api}/base.go | 0 app/api/{ => api}/captcha.go | 0 app/api/{ => api}/config.go | 2 +- app/api/{ => api}/department.go | 2 +- app/api/{ => api}/logs.go | 2 +- app/api/{ => api}/menu.go | 2 +- app/api/{ => api}/role.go | 2 +- app/api/{ => api}/struct.go | 0 app/api/{ => api}/tenant.go | 2 +- app/api/{ => api}/upload.go | 0 app/api/{ => api}/user.go | 2 +- app/{ => api}/controller/account.go | 2 +- app/{ => api}/controller/auth/base.go | 2 +- app/{ => api}/controller/auth/instance.go | 4 ++-- app/{ => api}/controller/base.go | 0 app/{ => api}/controller/config.go | 2 +- app/{ => api}/controller/department.go | 2 +- app/{ => api}/controller/logs.go | 2 +- app/{ => api}/controller/menu/base.go | 2 +- app/{ => api}/controller/menu/menu.go | 4 ++-- app/{ => api}/controller/role/auth.go | 10 +++++----- app/{ => api}/controller/role/instance.go | 4 ++-- app/{ => api}/controller/role/menu.go | 10 +++++----- app/{ => api}/controller/role/user.go | 4 ++-- app/{ => api}/controller/tenant/auth.go | 4 ++-- app/{ => api}/controller/tenant/instance.go | 10 +++++----- app/{ => api}/controller/tenant/menu.go | 10 +++++----- app/{ => api}/controller/tenant/struct.go | 0 app/{ => api}/controller/tenant/sub.go | 0 app/{ => api}/controller/user/instance.go | 4 ++-- app/{ => api}/controller/user/menu.go | 12 +++++------ app/{ => api}/controller/user/person.go | 2 +- app/{ => api}/controller/user/role.go | 4 ++-- app/{ => api}/model/sys_auth.go | 0 app/{ => api}/model/sys_config.go | 0 app/{ => api}/model/sys_deparement.go | 0 app/{ => api}/model/sys_log.go | 0 app/{ => api}/model/sys_menu.go | 0 app/{ => api}/model/sys_role.go | 0 app/{ => api}/model/sys_role_auth.go | 0 app/{ => api}/model/sys_role_menu.go | 0 app/{ => api}/model/sys_tenant.go | 0 app/{ => api}/model/sys_tenant_auth.go | 0 app/{ => api}/model/sys_tenant_menu.go | 0 app/{ => api}/model/sys_user.go | 0 app/{ => api}/model/sys_user_login_log.go | 0 app/{ => api}/model/sys_user_role.go | 0 app/{ => api}/model/sys_user_tenant.go | 0 router/address.go | 22 ++++++++++----------- 51 files changed, 67 insertions(+), 67 deletions(-) rename app/api/{ => api}/account.go (98%) rename app/api/{ => api}/auth.go (97%) rename app/api/{ => api}/base.go (100%) rename app/api/{ => api}/captcha.go (100%) rename app/api/{ => api}/config.go (94%) rename app/api/{ => api}/department.go (97%) rename app/api/{ => api}/logs.go (92%) rename app/api/{ => api}/menu.go (99%) rename app/api/{ => api}/role.go (99%) rename app/api/{ => api}/struct.go (100%) rename app/api/{ => api}/tenant.go (99%) rename app/api/{ => api}/upload.go (100%) rename app/api/{ => api}/user.go (99%) rename app/{ => api}/controller/account.go (99%) rename app/{ => api}/controller/auth/base.go (97%) rename app/{ => api}/controller/auth/instance.go (92%) rename app/{ => api}/controller/base.go (100%) rename app/{ => api}/controller/config.go (97%) rename app/{ => api}/controller/department.go (98%) rename app/{ => api}/controller/logs.go (97%) rename app/{ => api}/controller/menu/base.go (98%) rename app/{ => api}/controller/menu/menu.go (97%) rename app/{ => api}/controller/role/auth.go (90%) rename app/{ => api}/controller/role/instance.go (98%) rename app/{ => api}/controller/role/menu.go (86%) rename app/{ => api}/controller/role/user.go (96%) rename app/{ => api}/controller/tenant/auth.go (97%) rename app/{ => api}/controller/tenant/instance.go (98%) rename app/{ => api}/controller/tenant/menu.go (90%) rename app/{ => api}/controller/tenant/struct.go (100%) rename app/{ => api}/controller/tenant/sub.go (100%) rename app/{ => api}/controller/user/instance.go (99%) rename app/{ => api}/controller/user/menu.go (76%) rename app/{ => api}/controller/user/person.go (97%) rename app/{ => api}/controller/user/role.go (96%) rename app/{ => api}/model/sys_auth.go (100%) rename app/{ => api}/model/sys_config.go (100%) rename app/{ => api}/model/sys_deparement.go (100%) rename app/{ => api}/model/sys_log.go (100%) rename app/{ => api}/model/sys_menu.go (100%) rename app/{ => api}/model/sys_role.go (100%) rename app/{ => api}/model/sys_role_auth.go (100%) rename app/{ => api}/model/sys_role_menu.go (100%) rename app/{ => api}/model/sys_tenant.go (100%) rename app/{ => api}/model/sys_tenant_auth.go (100%) rename app/{ => api}/model/sys_tenant_menu.go (100%) rename app/{ => api}/model/sys_user.go (100%) rename app/{ => api}/model/sys_user_login_log.go (100%) rename app/{ => api}/model/sys_user_role.go (100%) rename app/{ => api}/model/sys_user_tenant.go (100%) diff --git a/app/api/account.go b/app/api/api/account.go similarity index 98% rename from app/api/account.go rename to app/api/api/account.go index d3bb146..24cb819 100644 --- a/app/api/account.go +++ b/app/api/api/account.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/controller" + "SciencesServer/app/api/controller" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/auth.go b/app/api/api/auth.go similarity index 97% rename from app/api/auth.go rename to app/api/api/auth.go index 4774b08..36f10c7 100644 --- a/app/api/auth.go +++ b/app/api/api/auth.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/controller/auth" + "SciencesServer/app/api/controller/auth" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/base.go b/app/api/api/base.go similarity index 100% rename from app/api/base.go rename to app/api/api/base.go diff --git a/app/api/captcha.go b/app/api/api/captcha.go similarity index 100% rename from app/api/captcha.go rename to app/api/api/captcha.go diff --git a/app/api/config.go b/app/api/api/config.go similarity index 94% rename from app/api/config.go rename to app/api/api/config.go index d9651d1..0c30e71 100644 --- a/app/api/config.go +++ b/app/api/api/config.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/controller" + "SciencesServer/app/api/controller" "github.com/gin-gonic/gin" ) diff --git a/app/api/department.go b/app/api/api/department.go similarity index 97% rename from app/api/department.go rename to app/api/api/department.go index e9dde73..eb72cdb 100644 --- a/app/api/department.go +++ b/app/api/api/department.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/controller" + "SciencesServer/app/api/controller" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/logs.go b/app/api/api/logs.go similarity index 92% rename from app/api/logs.go rename to app/api/api/logs.go index 1f51843..2088a86 100644 --- a/app/api/logs.go +++ b/app/api/api/logs.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/controller" + "SciencesServer/app/api/controller" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/menu.go b/app/api/api/menu.go similarity index 99% rename from app/api/menu.go rename to app/api/api/menu.go index b98117b..14bf791 100644 --- a/app/api/menu.go +++ b/app/api/api/menu.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/controller/menu" + "SciencesServer/app/api/controller/menu" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/role.go b/app/api/api/role.go similarity index 99% rename from app/api/role.go rename to app/api/api/role.go index bc8359f..006e5ad 100644 --- a/app/api/role.go +++ b/app/api/api/role.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/controller/role" + "SciencesServer/app/api/controller/role" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/struct.go b/app/api/api/struct.go similarity index 100% rename from app/api/struct.go rename to app/api/api/struct.go diff --git a/app/api/tenant.go b/app/api/api/tenant.go similarity index 99% rename from app/api/tenant.go rename to app/api/api/tenant.go index ad5ce1c..c0a6003 100644 --- a/app/api/tenant.go +++ b/app/api/api/tenant.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/controller/tenant" + "SciencesServer/app/api/controller/tenant" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/upload.go b/app/api/api/upload.go similarity index 100% rename from app/api/upload.go rename to app/api/api/upload.go diff --git a/app/api/user.go b/app/api/api/user.go similarity index 99% rename from app/api/user.go rename to app/api/api/user.go index 43e0d99..ae51e23 100644 --- a/app/api/user.go +++ b/app/api/api/user.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/controller/user" + "SciencesServer/app/api/controller/user" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/controller/account.go b/app/api/controller/account.go similarity index 99% rename from app/controller/account.go rename to app/api/controller/account.go index e9b56a5..f9fb006 100644 --- a/app/controller/account.go +++ b/app/api/controller/account.go @@ -1,9 +1,9 @@ package controller import ( + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/handle" - "SciencesServer/app/model" "SciencesServer/app/service" "SciencesServer/config" "SciencesServer/utils" diff --git a/app/controller/auth/base.go b/app/api/controller/auth/base.go similarity index 97% rename from app/controller/auth/base.go rename to app/api/controller/auth/base.go index 252c754..7282d94 100644 --- a/app/controller/auth/base.go +++ b/app/api/controller/auth/base.go @@ -1,8 +1,8 @@ package auth import ( + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/model" ) type ( diff --git a/app/controller/auth/instance.go b/app/api/controller/auth/instance.go similarity index 92% rename from app/controller/auth/instance.go rename to app/api/controller/auth/instance.go index a17ff39..31f945f 100644 --- a/app/controller/auth/instance.go +++ b/app/api/controller/auth/instance.go @@ -1,9 +1,9 @@ package auth import ( + "SciencesServer/app/api/controller" + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/controller" - "SciencesServer/app/model" "SciencesServer/app/service" ) diff --git a/app/controller/base.go b/app/api/controller/base.go similarity index 100% rename from app/controller/base.go rename to app/api/controller/base.go diff --git a/app/controller/config.go b/app/api/controller/config.go similarity index 97% rename from app/controller/config.go rename to app/api/controller/config.go index 997f5ff..22f707e 100644 --- a/app/controller/config.go +++ b/app/api/controller/config.go @@ -1,8 +1,8 @@ package controller import ( + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/model" "SciencesServer/config" "SciencesServer/serve/orm" "errors" diff --git a/app/controller/department.go b/app/api/controller/department.go similarity index 98% rename from app/controller/department.go rename to app/api/controller/department.go index 26049fe..ca8691d 100644 --- a/app/controller/department.go +++ b/app/api/controller/department.go @@ -1,8 +1,8 @@ package controller import ( + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/model" "SciencesServer/app/service" "time" ) diff --git a/app/controller/logs.go b/app/api/controller/logs.go similarity index 97% rename from app/controller/logs.go rename to app/api/controller/logs.go index c00fddd..941199b 100644 --- a/app/controller/logs.go +++ b/app/api/controller/logs.go @@ -1,8 +1,8 @@ package controller import ( + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/model" "SciencesServer/app/service" "SciencesServer/tools/ip" ) diff --git a/app/controller/menu/base.go b/app/api/controller/menu/base.go similarity index 98% rename from app/controller/menu/base.go rename to app/api/controller/menu/base.go index 76e472d..de1ba92 100644 --- a/app/controller/menu/base.go +++ b/app/api/controller/menu/base.go @@ -1,8 +1,8 @@ package menu import ( + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/model" ) type ( diff --git a/app/controller/menu/menu.go b/app/api/controller/menu/menu.go similarity index 97% rename from app/controller/menu/menu.go rename to app/api/controller/menu/menu.go index 4f2708a..15ec708 100644 --- a/app/controller/menu/menu.go +++ b/app/api/controller/menu/menu.go @@ -1,9 +1,9 @@ package menu import ( + "SciencesServer/app/api/controller" + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/controller" - "SciencesServer/app/model" "SciencesServer/app/service" "errors" "time" diff --git a/app/controller/role/auth.go b/app/api/controller/role/auth.go similarity index 90% rename from app/controller/role/auth.go rename to app/api/controller/role/auth.go index ec0d532..6a09930 100644 --- a/app/controller/role/auth.go +++ b/app/api/controller/role/auth.go @@ -1,10 +1,10 @@ package role import ( + "SciencesServer/app/api/controller" + auth2 "SciencesServer/app/api/controller/auth" + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/controller" - "SciencesServer/app/controller/auth" - "SciencesServer/app/model" "SciencesServer/app/service" "SciencesServer/serve/logger" "SciencesServer/serve/orm" @@ -18,7 +18,7 @@ type Auth struct{ *controller.Platform } type AuthHandle func(session *service.Session) *Auth // List 角色权限列表 -func (c *Auth) List(roleID uint64) ([]*auth.TreeChecked, error) { +func (c *Auth) List(roleID uint64) ([]*auth2.TreeChecked, error) { mSysAuth := model.NewSysAuth() out, err := mSysAuth.RoleAuth(c.TenantID, roleID) @@ -26,7 +26,7 @@ func (c *Auth) List(roleID uint64) ([]*auth.TreeChecked, error) { if err != nil { return nil, err } - return auth.TreeCheckedFunc(out, 0), nil + return auth2.TreeCheckedFunc(out, 0), nil } // Bind 角色权限绑定 diff --git a/app/controller/role/instance.go b/app/api/controller/role/instance.go similarity index 98% rename from app/controller/role/instance.go rename to app/api/controller/role/instance.go index 2113a23..7eb38a0 100644 --- a/app/controller/role/instance.go +++ b/app/api/controller/role/instance.go @@ -1,9 +1,9 @@ package role import ( + "SciencesServer/app/api/controller" + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/controller" - "SciencesServer/app/model" "SciencesServer/app/service" "SciencesServer/serve/logger" "SciencesServer/utils" diff --git a/app/controller/role/menu.go b/app/api/controller/role/menu.go similarity index 86% rename from app/controller/role/menu.go rename to app/api/controller/role/menu.go index 99f8bad..54d02ce 100644 --- a/app/controller/role/menu.go +++ b/app/api/controller/role/menu.go @@ -1,10 +1,10 @@ package role import ( + "SciencesServer/app/api/controller" + menu2 "SciencesServer/app/api/controller/menu" + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/controller" - "SciencesServer/app/controller/menu" - "SciencesServer/app/model" "SciencesServer/app/service" "SciencesServer/serve/orm" "errors" @@ -17,9 +17,9 @@ type Menu struct{ *controller.Platform } type MenuHandle func(session *service.Session) *Menu // List 菜单列表 -func (c *Menu) List(roleID uint64) ([]*menu.TreeChecked, error) { +func (c *Menu) List(roleID uint64) ([]*menu2.TreeChecked, error) { mSysMenu := model.NewSysMenu() - return menu.MenuForRole(mSysMenu, c.TenantID, roleID) + return menu2.MenuForRole(mSysMenu, c.TenantID, roleID) } // Bind 绑定菜单 diff --git a/app/controller/role/user.go b/app/api/controller/role/user.go similarity index 96% rename from app/controller/role/user.go rename to app/api/controller/role/user.go index b4fae33..0ffbd97 100644 --- a/app/controller/role/user.go +++ b/app/api/controller/role/user.go @@ -1,11 +1,11 @@ package role import ( + "SciencesServer/app/api/controller" model2 "SciencesServer/app/common/model" "SciencesServer/serve/logger" - "SciencesServer/app/controller" - "SciencesServer/app/model" + "SciencesServer/app/api/model" "SciencesServer/app/service" "SciencesServer/serve/orm" "SciencesServer/utils" diff --git a/app/controller/tenant/auth.go b/app/api/controller/tenant/auth.go similarity index 97% rename from app/controller/tenant/auth.go rename to app/api/controller/tenant/auth.go index 002f9ed..df5504a 100644 --- a/app/controller/tenant/auth.go +++ b/app/api/controller/tenant/auth.go @@ -1,9 +1,9 @@ package tenant import ( + "SciencesServer/app/api/controller" + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/controller" - "SciencesServer/app/model" "SciencesServer/app/service" "SciencesServer/serve/logger" "SciencesServer/serve/orm" diff --git a/app/controller/tenant/instance.go b/app/api/controller/tenant/instance.go similarity index 98% rename from app/controller/tenant/instance.go rename to app/api/controller/tenant/instance.go index fc7cfee..7cacadf 100644 --- a/app/controller/tenant/instance.go +++ b/app/api/controller/tenant/instance.go @@ -1,11 +1,11 @@ package tenant import ( + "SciencesServer/app/api/controller" + auth2 "SciencesServer/app/api/controller/auth" + menu2 "SciencesServer/app/api/controller/menu" + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/controller" - cAuth "SciencesServer/app/controller/auth" - "SciencesServer/app/controller/menu" - "SciencesServer/app/model" "SciencesServer/app/service" "SciencesServer/config" "SciencesServer/serve/orm" @@ -121,7 +121,7 @@ func auth(id uint64) func(args ...interface{}) (interface{}, error) { return nil, err } return map[string]interface{}{ - "menu": menu.TreeCheckedFunc(_menu, 0), "auth": cAuth.TreeCheckedFunc(_auth, 0), + "menu": menu2.TreeCheckedFunc(_menu, 0), "auth": auth2.TreeCheckedFunc(_auth, 0), }, nil } } diff --git a/app/controller/tenant/menu.go b/app/api/controller/tenant/menu.go similarity index 90% rename from app/controller/tenant/menu.go rename to app/api/controller/tenant/menu.go index 439cdea..3319c7e 100644 --- a/app/controller/tenant/menu.go +++ b/app/api/controller/tenant/menu.go @@ -1,10 +1,10 @@ package tenant import ( + "SciencesServer/app/api/controller" + menu2 "SciencesServer/app/api/controller/menu" + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/controller" - "SciencesServer/app/controller/menu" - "SciencesServer/app/model" "SciencesServer/app/service" "SciencesServer/serve/orm" "errors" @@ -17,9 +17,9 @@ type Menu struct{ *controller.Platform } type MenuHandle func(session *service.Session) *Menu // List 菜单列表 -func (c *Menu) List(tenantID uint64) ([]*menu.TreeChecked, error) { +func (c *Menu) List(tenantID uint64) ([]*menu2.TreeChecked, error) { mSysMenu := model.NewSysMenu() - return menu.MenuForTenant(mSysMenu, tenantID) + return menu2.MenuForTenant(mSysMenu, tenantID) } // Bind 绑定菜单 diff --git a/app/controller/tenant/struct.go b/app/api/controller/tenant/struct.go similarity index 100% rename from app/controller/tenant/struct.go rename to app/api/controller/tenant/struct.go diff --git a/app/controller/tenant/sub.go b/app/api/controller/tenant/sub.go similarity index 100% rename from app/controller/tenant/sub.go rename to app/api/controller/tenant/sub.go diff --git a/app/controller/user/instance.go b/app/api/controller/user/instance.go similarity index 99% rename from app/controller/user/instance.go rename to app/api/controller/user/instance.go index 0328350..cbc6677 100644 --- a/app/controller/user/instance.go +++ b/app/api/controller/user/instance.go @@ -1,9 +1,9 @@ package user import ( + "SciencesServer/app/api/controller" + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/controller" - "SciencesServer/app/model" "SciencesServer/app/service" "SciencesServer/serve/orm" "SciencesServer/utils" diff --git a/app/controller/user/menu.go b/app/api/controller/user/menu.go similarity index 76% rename from app/controller/user/menu.go rename to app/api/controller/user/menu.go index 5fc0cfe..c2c856b 100644 --- a/app/controller/user/menu.go +++ b/app/api/controller/user/menu.go @@ -1,10 +1,10 @@ package user import ( + "SciencesServer/app/api/controller" + menu2 "SciencesServer/app/api/controller/menu" + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/controller" - "SciencesServer/app/controller/menu" - "SciencesServer/app/model" "SciencesServer/app/service" ) @@ -17,7 +17,7 @@ func (c *Menu) List() (interface{}, error) { mSysMenu := model.NewSysMenu() if c.IsAdmin { - return menu.MenuForSystem(mSysMenu) + return menu2.MenuForSystem(mSysMenu) } mSysUserTenant := model.NewSysUserTenant() @@ -28,9 +28,9 @@ func (c *Menu) List() (interface{}, error) { return nil, nil } if mSysUserTenant.Identity == model2.SysUserTenantIdentityForSystemAdmin { - return menu.MenuForTenant(mSysMenu, c.TenantID) + return menu2.MenuForTenant(mSysMenu, c.TenantID) } - return menu.MenuForUser(mSysMenu, c.TenantID, c.UID) + return menu2.MenuForUser(mSysMenu, c.TenantID, c.UID) } func NewMenu() MenuHandle { diff --git a/app/controller/user/person.go b/app/api/controller/user/person.go similarity index 97% rename from app/controller/user/person.go rename to app/api/controller/user/person.go index 5fb307d..8253994 100644 --- a/app/controller/user/person.go +++ b/app/api/controller/user/person.go @@ -1,8 +1,8 @@ package user import ( + "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" - "SciencesServer/app/model" "SciencesServer/app/service" "errors" "time" diff --git a/app/controller/user/role.go b/app/api/controller/user/role.go similarity index 96% rename from app/controller/user/role.go rename to app/api/controller/user/role.go index a5c2394..2aca501 100644 --- a/app/controller/user/role.go +++ b/app/api/controller/user/role.go @@ -1,11 +1,11 @@ package user import ( + "SciencesServer/app/api/controller" model2 "SciencesServer/app/common/model" "SciencesServer/serve/logger" - "SciencesServer/app/controller" - "SciencesServer/app/model" + "SciencesServer/app/api/model" "SciencesServer/app/service" "SciencesServer/serve/orm" "SciencesServer/utils" diff --git a/app/model/sys_auth.go b/app/api/model/sys_auth.go similarity index 100% rename from app/model/sys_auth.go rename to app/api/model/sys_auth.go diff --git a/app/model/sys_config.go b/app/api/model/sys_config.go similarity index 100% rename from app/model/sys_config.go rename to app/api/model/sys_config.go diff --git a/app/model/sys_deparement.go b/app/api/model/sys_deparement.go similarity index 100% rename from app/model/sys_deparement.go rename to app/api/model/sys_deparement.go diff --git a/app/model/sys_log.go b/app/api/model/sys_log.go similarity index 100% rename from app/model/sys_log.go rename to app/api/model/sys_log.go diff --git a/app/model/sys_menu.go b/app/api/model/sys_menu.go similarity index 100% rename from app/model/sys_menu.go rename to app/api/model/sys_menu.go diff --git a/app/model/sys_role.go b/app/api/model/sys_role.go similarity index 100% rename from app/model/sys_role.go rename to app/api/model/sys_role.go diff --git a/app/model/sys_role_auth.go b/app/api/model/sys_role_auth.go similarity index 100% rename from app/model/sys_role_auth.go rename to app/api/model/sys_role_auth.go diff --git a/app/model/sys_role_menu.go b/app/api/model/sys_role_menu.go similarity index 100% rename from app/model/sys_role_menu.go rename to app/api/model/sys_role_menu.go diff --git a/app/model/sys_tenant.go b/app/api/model/sys_tenant.go similarity index 100% rename from app/model/sys_tenant.go rename to app/api/model/sys_tenant.go diff --git a/app/model/sys_tenant_auth.go b/app/api/model/sys_tenant_auth.go similarity index 100% rename from app/model/sys_tenant_auth.go rename to app/api/model/sys_tenant_auth.go diff --git a/app/model/sys_tenant_menu.go b/app/api/model/sys_tenant_menu.go similarity index 100% rename from app/model/sys_tenant_menu.go rename to app/api/model/sys_tenant_menu.go diff --git a/app/model/sys_user.go b/app/api/model/sys_user.go similarity index 100% rename from app/model/sys_user.go rename to app/api/model/sys_user.go diff --git a/app/model/sys_user_login_log.go b/app/api/model/sys_user_login_log.go similarity index 100% rename from app/model/sys_user_login_log.go rename to app/api/model/sys_user_login_log.go diff --git a/app/model/sys_user_role.go b/app/api/model/sys_user_role.go similarity index 100% rename from app/model/sys_user_role.go rename to app/api/model/sys_user_role.go diff --git a/app/model/sys_user_tenant.go b/app/api/model/sys_user_tenant.go similarity index 100% rename from app/model/sys_user_tenant.go rename to app/api/model/sys_user_tenant.go diff --git a/router/address.go b/router/address.go index abf69b5..e2af48b 100644 --- a/router/address.go +++ b/router/address.go @@ -1,7 +1,7 @@ package router import ( - "SciencesServer/app/api" + api2 "SciencesServer/app/api/api" "github.com/gin-gonic/gin" ) @@ -22,20 +22,20 @@ func register(app *gin.Engine) { // apiPrefix + "/account/logout", //}...))) // Captcha 验证码 - g.GET("/captcha", new(api.Captcha).Captcha) + g.GET("/captcha", new(api2.Captcha).Captcha) // Upload 上传管理 - g.POST("/upload", new(api.Upload).Upload) + g.POST("/upload", new(api2.Upload).Upload) // Account 账户管理 account := g.Group("/account") { - _api := new(api.Account) + _api := new(api2.Account) account.POST("/login", _api.Login) account.POST("/logout", _api.Logout) } // User 用户管理 user := g.Group("/user") { - _api := new(api.User) + _api := new(api2.User) user.GET("/info", _api.Info) user.GET("/menu", _api.Menu) user.POST("/list", _api.List) @@ -50,7 +50,7 @@ func register(app *gin.Engine) { // Tenant 租户管理 tenant := g.Group("/tenant") { - _api := new(api.Tenant) + _api := new(api2.Tenant) tenant.POST("/list", _api.List) tenant.POST("/add", _api.Add) tenant.POST("/edit", _api.Edit) @@ -67,7 +67,7 @@ func register(app *gin.Engine) { // Menu 菜单管理 menu := g.Group("/menu") { - _api := new(api.Menu) + _api := new(api2.Menu) menu.GET("/list", _api.List) menu.POST("/add", _api.Add) menu.POST("/edit", _api.Edit) @@ -77,13 +77,13 @@ func register(app *gin.Engine) { // Auth 权限管理 auth := g.Group("/auth") { - _api := new(api.Auth) + _api := new(api2.Auth) auth.POST("/list", _api.List) } // Department 部门管理 department := g.Group("/department") { - _api := new(api.Department) + _api := new(api2.Department) department.GET("/list", _api.List) department.GET("/select", _api.Select) department.POST("/add", _api.Add) @@ -93,7 +93,7 @@ func register(app *gin.Engine) { // Role 角色管理 role := g.Group("/role") { - _api := new(api.Role) + _api := new(api2.Role) role.POST("/list", _api.List) role.POST("/select", _api.Select) role.POST("/add", _api.Add) @@ -108,7 +108,7 @@ func register(app *gin.Engine) { // Logs 日志管理 log := g.Group("/log") { - _api := new(api.Log) + _api := new(api2.Log) log.POST("/login", _api.Login) } }