From af8691e9435849a37aa66d3630f37ff90209b8b6 Mon Sep 17 00:00:00 2001 From: henry Date: Fri, 15 Oct 2021 15:01:21 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E5=96=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/identity/instance.go | 27 +++++++++++++++++++ .../controller/technology/demand.go | 2 +- .../controller/technology/instance.go | 2 +- app/enterprise/controller/technology/paper.go | 2 +- .../controller/technology/patent.go | 2 +- app/{api => manage}/api/account.go | 2 +- app/{api => manage}/api/auth.go | 2 +- app/{api => manage}/api/base.go | 0 app/{api => manage}/api/captcha.go | 0 app/{api => manage}/api/config.go | 2 +- app/{api => manage}/api/department.go | 2 +- app/{api => manage}/api/logs.go | 2 +- app/{api => manage}/api/menu.go | 2 +- app/{api => manage}/api/role.go | 2 +- app/{api => manage}/api/struct.go | 0 app/{api => manage}/api/tenant.go | 2 +- app/{api => manage}/api/upload.go | 0 app/{api => manage}/api/user.go | 2 +- app/{api => manage}/controller/account.go | 2 +- app/{api => manage}/controller/auth/base.go | 2 +- .../controller/auth/instance.go | 4 +-- app/{api => manage}/controller/base.go | 0 app/{api => manage}/controller/config.go | 2 +- app/{api => manage}/controller/department.go | 2 +- app/{api => manage}/controller/logs.go | 2 +- app/{api => manage}/controller/menu/base.go | 2 +- app/{api => manage}/controller/menu/menu.go | 4 +-- app/{api => manage}/controller/role/auth.go | 6 ++--- .../controller/role/instance.go | 4 +-- app/{api => manage}/controller/role/menu.go | 6 ++--- app/{api => manage}/controller/role/user.go | 4 +-- app/{api => manage}/controller/tenant/auth.go | 4 +-- .../controller/tenant/instance.go | 8 +++--- app/{api => manage}/controller/tenant/menu.go | 6 ++--- .../controller/tenant/struct.go | 0 app/{api => manage}/controller/tenant/sub.go | 0 .../controller/user/instance.go | 4 +-- app/{api => manage}/controller/user/menu.go | 6 ++--- app/{api => manage}/controller/user/person.go | 2 +- app/{api => manage}/controller/user/role.go | 4 +-- app/{api => manage}/model/sys_auth.go | 0 app/{api => manage}/model/sys_config.go | 0 app/{api => manage}/model/sys_deparement.go | 0 app/{api => manage}/model/sys_log.go | 0 app/{api => manage}/model/sys_menu.go | 0 app/{api => manage}/model/sys_role.go | 0 app/{api => manage}/model/sys_role_auth.go | 0 app/{api => manage}/model/sys_role_menu.go | 0 app/{api => manage}/model/sys_tenant.go | 0 app/{api => manage}/model/sys_tenant_auth.go | 0 app/{api => manage}/model/sys_tenant_menu.go | 0 app/{api => manage}/model/sys_user.go | 0 .../model/sys_user_login_log.go | 0 app/{api => manage}/model/sys_user_role.go | 0 app/{api => manage}/model/sys_user_tenant.go | 0 router/address.go | 2 +- 56 files changed, 78 insertions(+), 51 deletions(-) create mode 100644 app/enterprise/controller/identity/instance.go rename app/{api => manage}/api/account.go (98%) rename app/{api => manage}/api/auth.go (96%) rename app/{api => manage}/api/base.go (100%) rename app/{api => manage}/api/captcha.go (100%) rename app/{api => manage}/api/config.go (94%) rename app/{api => manage}/api/department.go (97%) rename app/{api => manage}/api/logs.go (91%) rename app/{api => manage}/api/menu.go (99%) rename app/{api => manage}/api/role.go (99%) rename app/{api => manage}/api/struct.go (100%) rename app/{api => manage}/api/tenant.go (99%) rename app/{api => manage}/api/upload.go (100%) rename app/{api => manage}/api/user.go (99%) rename app/{api => manage}/controller/account.go (98%) rename app/{api => manage}/controller/auth/base.go (97%) rename app/{api => manage}/controller/auth/instance.go (91%) rename app/{api => manage}/controller/base.go (100%) rename app/{api => manage}/controller/config.go (97%) rename app/{api => manage}/controller/department.go (98%) rename app/{api => manage}/controller/logs.go (97%) rename app/{api => manage}/controller/menu/base.go (98%) rename app/{api => manage}/controller/menu/menu.go (97%) rename app/{api => manage}/controller/role/auth.go (94%) rename app/{api => manage}/controller/role/instance.go (98%) rename app/{api => manage}/controller/role/menu.go (93%) rename app/{api => manage}/controller/role/user.go (96%) rename app/{api => manage}/controller/tenant/auth.go (97%) rename app/{api => manage}/controller/tenant/instance.go (98%) rename app/{api => manage}/controller/tenant/menu.go (94%) rename app/{api => manage}/controller/tenant/struct.go (100%) rename app/{api => manage}/controller/tenant/sub.go (100%) rename app/{api => manage}/controller/user/instance.go (98%) rename app/{api => manage}/controller/user/menu.go (88%) rename app/{api => manage}/controller/user/person.go (96%) rename app/{api => manage}/controller/user/role.go (96%) rename app/{api => manage}/model/sys_auth.go (100%) rename app/{api => manage}/model/sys_config.go (100%) rename app/{api => manage}/model/sys_deparement.go (100%) rename app/{api => manage}/model/sys_log.go (100%) rename app/{api => manage}/model/sys_menu.go (100%) rename app/{api => manage}/model/sys_role.go (100%) rename app/{api => manage}/model/sys_role_auth.go (100%) rename app/{api => manage}/model/sys_role_menu.go (100%) rename app/{api => manage}/model/sys_tenant.go (100%) rename app/{api => manage}/model/sys_tenant_auth.go (100%) rename app/{api => manage}/model/sys_tenant_menu.go (100%) rename app/{api => manage}/model/sys_user.go (100%) rename app/{api => manage}/model/sys_user_login_log.go (100%) rename app/{api => manage}/model/sys_user_role.go (100%) rename app/{api => manage}/model/sys_user_tenant.go (100%) diff --git a/app/enterprise/controller/identity/instance.go b/app/enterprise/controller/identity/instance.go new file mode 100644 index 0000000..1c37f89 --- /dev/null +++ b/app/enterprise/controller/identity/instance.go @@ -0,0 +1,27 @@ +package identity + +import ( + "SciencesServer/app/manage/controller" + "SciencesServer/app/service" +) + +type Instance struct { + *service.SessionEnterprise + local string +} + +type InstanceHandle func(enterprise *service.SessionEnterprise, local string) *Instance + +// Expert 专家列表 +func (c *Instance) Expert(name, mobile string, page, pageSize int) (*controller.ReturnPages, error) { + return nil, nil +} + +func NewIdentity() InstanceHandle { + return func(enterprise *service.SessionEnterprise, local string) *Instance { + return &Instance{ + SessionEnterprise: enterprise, + local: local, + } + } +} diff --git a/app/enterprise/controller/technology/demand.go b/app/enterprise/controller/technology/demand.go index 91caf94..b5bc04f 100644 --- a/app/enterprise/controller/technology/demand.go +++ b/app/enterprise/controller/technology/demand.go @@ -1,10 +1,10 @@ package technology import ( - "SciencesServer/app/api/controller" "SciencesServer/app/basic/config" model2 "SciencesServer/app/common/model" "SciencesServer/app/enterprise/model" + "SciencesServer/app/manage/controller" "SciencesServer/app/service" "SciencesServer/utils" "errors" diff --git a/app/enterprise/controller/technology/instance.go b/app/enterprise/controller/technology/instance.go index 6e5f18a..f68e3cf 100644 --- a/app/enterprise/controller/technology/instance.go +++ b/app/enterprise/controller/technology/instance.go @@ -1,9 +1,9 @@ package technology import ( - "SciencesServer/app/api/controller" model2 "SciencesServer/app/common/model" "SciencesServer/app/enterprise/model" + "SciencesServer/app/manage/controller" "SciencesServer/app/service" "errors" "time" diff --git a/app/enterprise/controller/technology/paper.go b/app/enterprise/controller/technology/paper.go index 0c5a9e2..4aeec0e 100644 --- a/app/enterprise/controller/technology/paper.go +++ b/app/enterprise/controller/technology/paper.go @@ -1,9 +1,9 @@ package technology import ( - "SciencesServer/app/api/controller" model2 "SciencesServer/app/common/model" "SciencesServer/app/enterprise/model" + "SciencesServer/app/manage/controller" "SciencesServer/app/service" "SciencesServer/utils" "errors" diff --git a/app/enterprise/controller/technology/patent.go b/app/enterprise/controller/technology/patent.go index b265aa9..682c285 100644 --- a/app/enterprise/controller/technology/patent.go +++ b/app/enterprise/controller/technology/patent.go @@ -1,9 +1,9 @@ package technology import ( - "SciencesServer/app/api/controller" model2 "SciencesServer/app/common/model" "SciencesServer/app/enterprise/model" + "SciencesServer/app/manage/controller" "SciencesServer/app/service" "SciencesServer/utils" "errors" diff --git a/app/api/api/account.go b/app/manage/api/account.go similarity index 98% rename from app/api/api/account.go rename to app/manage/api/account.go index 24cb819..4eb53bc 100644 --- a/app/api/api/account.go +++ b/app/manage/api/account.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/controller" + "SciencesServer/app/manage/controller" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/api/auth.go b/app/manage/api/auth.go similarity index 96% rename from app/api/api/auth.go rename to app/manage/api/auth.go index 36f10c7..ed401ae 100644 --- a/app/api/api/auth.go +++ b/app/manage/api/auth.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/controller/auth" + "SciencesServer/app/manage/controller/auth" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/api/base.go b/app/manage/api/base.go similarity index 100% rename from app/api/api/base.go rename to app/manage/api/base.go diff --git a/app/api/api/captcha.go b/app/manage/api/captcha.go similarity index 100% rename from app/api/api/captcha.go rename to app/manage/api/captcha.go diff --git a/app/api/api/config.go b/app/manage/api/config.go similarity index 94% rename from app/api/api/config.go rename to app/manage/api/config.go index 0c30e71..ce7e4fb 100644 --- a/app/api/api/config.go +++ b/app/manage/api/config.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/controller" + "SciencesServer/app/manage/controller" "github.com/gin-gonic/gin" ) diff --git a/app/api/api/department.go b/app/manage/api/department.go similarity index 97% rename from app/api/api/department.go rename to app/manage/api/department.go index eb72cdb..bc180cd 100644 --- a/app/api/api/department.go +++ b/app/manage/api/department.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/controller" + "SciencesServer/app/manage/controller" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/api/logs.go b/app/manage/api/logs.go similarity index 91% rename from app/api/api/logs.go rename to app/manage/api/logs.go index 2088a86..5f165cc 100644 --- a/app/api/api/logs.go +++ b/app/manage/api/logs.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/controller" + "SciencesServer/app/manage/controller" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/api/menu.go b/app/manage/api/menu.go similarity index 99% rename from app/api/api/menu.go rename to app/manage/api/menu.go index 14bf791..4cbbbe4 100644 --- a/app/api/api/menu.go +++ b/app/manage/api/menu.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/controller/menu" + "SciencesServer/app/manage/controller/menu" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/api/role.go b/app/manage/api/role.go similarity index 99% rename from app/api/api/role.go rename to app/manage/api/role.go index 006e5ad..089e9eb 100644 --- a/app/api/api/role.go +++ b/app/manage/api/role.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/controller/role" + "SciencesServer/app/manage/controller/role" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/api/struct.go b/app/manage/api/struct.go similarity index 100% rename from app/api/api/struct.go rename to app/manage/api/struct.go diff --git a/app/api/api/tenant.go b/app/manage/api/tenant.go similarity index 99% rename from app/api/api/tenant.go rename to app/manage/api/tenant.go index c0a6003..ff433b3 100644 --- a/app/api/api/tenant.go +++ b/app/manage/api/tenant.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/controller/tenant" + "SciencesServer/app/manage/controller/tenant" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/api/upload.go b/app/manage/api/upload.go similarity index 100% rename from app/api/api/upload.go rename to app/manage/api/upload.go diff --git a/app/api/api/user.go b/app/manage/api/user.go similarity index 99% rename from app/api/api/user.go rename to app/manage/api/user.go index ae51e23..7360790 100644 --- a/app/api/api/user.go +++ b/app/manage/api/user.go @@ -1,7 +1,7 @@ package api import ( - "SciencesServer/app/api/controller/user" + "SciencesServer/app/manage/controller/user" "SciencesServer/app/service" "github.com/gin-gonic/gin" diff --git a/app/api/controller/account.go b/app/manage/controller/account.go similarity index 98% rename from app/api/controller/account.go rename to app/manage/controller/account.go index f758a4c..964c81a 100644 --- a/app/api/controller/account.go +++ b/app/manage/controller/account.go @@ -1,9 +1,9 @@ package controller import ( - "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" "SciencesServer/app/handle" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "SciencesServer/config" "SciencesServer/utils" diff --git a/app/api/controller/auth/base.go b/app/manage/controller/auth/base.go similarity index 97% rename from app/api/controller/auth/base.go rename to app/manage/controller/auth/base.go index 7282d94..9b2e25a 100644 --- a/app/api/controller/auth/base.go +++ b/app/manage/controller/auth/base.go @@ -1,8 +1,8 @@ package auth import ( - "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" + "SciencesServer/app/manage/model" ) type ( diff --git a/app/api/controller/auth/instance.go b/app/manage/controller/auth/instance.go similarity index 91% rename from app/api/controller/auth/instance.go rename to app/manage/controller/auth/instance.go index 31f945f..381b9d7 100644 --- a/app/api/controller/auth/instance.go +++ b/app/manage/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/manage/controller" + "SciencesServer/app/manage/model" "SciencesServer/app/service" ) diff --git a/app/api/controller/base.go b/app/manage/controller/base.go similarity index 100% rename from app/api/controller/base.go rename to app/manage/controller/base.go diff --git a/app/api/controller/config.go b/app/manage/controller/config.go similarity index 97% rename from app/api/controller/config.go rename to app/manage/controller/config.go index fbdc6b1..4fe28da 100644 --- a/app/api/controller/config.go +++ b/app/manage/controller/config.go @@ -1,8 +1,8 @@ package controller import ( - "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" + "SciencesServer/app/manage/model" "SciencesServer/config" "SciencesServer/serve/orm" "errors" diff --git a/app/api/controller/department.go b/app/manage/controller/department.go similarity index 98% rename from app/api/controller/department.go rename to app/manage/controller/department.go index ca8691d..792381f 100644 --- a/app/api/controller/department.go +++ b/app/manage/controller/department.go @@ -1,8 +1,8 @@ package controller import ( - "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "time" ) diff --git a/app/api/controller/logs.go b/app/manage/controller/logs.go similarity index 97% rename from app/api/controller/logs.go rename to app/manage/controller/logs.go index dd53fb6..67a97b9 100644 --- a/app/api/controller/logs.go +++ b/app/manage/controller/logs.go @@ -1,8 +1,8 @@ package controller import ( - "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "SciencesServer/tools/ip" ) diff --git a/app/api/controller/menu/base.go b/app/manage/controller/menu/base.go similarity index 98% rename from app/api/controller/menu/base.go rename to app/manage/controller/menu/base.go index de1ba92..2a194ac 100644 --- a/app/api/controller/menu/base.go +++ b/app/manage/controller/menu/base.go @@ -1,8 +1,8 @@ package menu import ( - "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" + "SciencesServer/app/manage/model" ) type ( diff --git a/app/api/controller/menu/menu.go b/app/manage/controller/menu/menu.go similarity index 97% rename from app/api/controller/menu/menu.go rename to app/manage/controller/menu/menu.go index 15ec708..3d64d3b 100644 --- a/app/api/controller/menu/menu.go +++ b/app/manage/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/manage/controller" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "errors" "time" diff --git a/app/api/controller/role/auth.go b/app/manage/controller/role/auth.go similarity index 94% rename from app/api/controller/role/auth.go rename to app/manage/controller/role/auth.go index 6a09930..a4ed9ec 100644 --- a/app/api/controller/role/auth.go +++ b/app/manage/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/manage/controller" + auth2 "SciencesServer/app/manage/controller/auth" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "SciencesServer/serve/logger" "SciencesServer/serve/orm" diff --git a/app/api/controller/role/instance.go b/app/manage/controller/role/instance.go similarity index 98% rename from app/api/controller/role/instance.go rename to app/manage/controller/role/instance.go index c9c77df..76b6452 100644 --- a/app/api/controller/role/instance.go +++ b/app/manage/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/manage/controller" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "SciencesServer/serve/logger" "SciencesServer/utils" diff --git a/app/api/controller/role/menu.go b/app/manage/controller/role/menu.go similarity index 93% rename from app/api/controller/role/menu.go rename to app/manage/controller/role/menu.go index 54d02ce..68ec8a8 100644 --- a/app/api/controller/role/menu.go +++ b/app/manage/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/manage/controller" + menu2 "SciencesServer/app/manage/controller/menu" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "SciencesServer/serve/orm" "errors" diff --git a/app/api/controller/role/user.go b/app/manage/controller/role/user.go similarity index 96% rename from app/api/controller/role/user.go rename to app/manage/controller/role/user.go index 0ffbd97..a385d17 100644 --- a/app/api/controller/role/user.go +++ b/app/manage/controller/role/user.go @@ -1,11 +1,11 @@ package role import ( - "SciencesServer/app/api/controller" model2 "SciencesServer/app/common/model" + "SciencesServer/app/manage/controller" "SciencesServer/serve/logger" - "SciencesServer/app/api/model" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "SciencesServer/serve/orm" "SciencesServer/utils" diff --git a/app/api/controller/tenant/auth.go b/app/manage/controller/tenant/auth.go similarity index 97% rename from app/api/controller/tenant/auth.go rename to app/manage/controller/tenant/auth.go index df5504a..5a43e6d 100644 --- a/app/api/controller/tenant/auth.go +++ b/app/manage/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/manage/controller" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "SciencesServer/serve/logger" "SciencesServer/serve/orm" diff --git a/app/api/controller/tenant/instance.go b/app/manage/controller/tenant/instance.go similarity index 98% rename from app/api/controller/tenant/instance.go rename to app/manage/controller/tenant/instance.go index 3c75402..434d936 100644 --- a/app/api/controller/tenant/instance.go +++ b/app/manage/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/manage/controller" + auth2 "SciencesServer/app/manage/controller/auth" + menu2 "SciencesServer/app/manage/controller/menu" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "SciencesServer/config" "SciencesServer/serve/orm" diff --git a/app/api/controller/tenant/menu.go b/app/manage/controller/tenant/menu.go similarity index 94% rename from app/api/controller/tenant/menu.go rename to app/manage/controller/tenant/menu.go index 3319c7e..0727a3f 100644 --- a/app/api/controller/tenant/menu.go +++ b/app/manage/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/manage/controller" + menu2 "SciencesServer/app/manage/controller/menu" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "SciencesServer/serve/orm" "errors" diff --git a/app/api/controller/tenant/struct.go b/app/manage/controller/tenant/struct.go similarity index 100% rename from app/api/controller/tenant/struct.go rename to app/manage/controller/tenant/struct.go diff --git a/app/api/controller/tenant/sub.go b/app/manage/controller/tenant/sub.go similarity index 100% rename from app/api/controller/tenant/sub.go rename to app/manage/controller/tenant/sub.go diff --git a/app/api/controller/user/instance.go b/app/manage/controller/user/instance.go similarity index 98% rename from app/api/controller/user/instance.go rename to app/manage/controller/user/instance.go index 16ef580..c0289fb 100644 --- a/app/api/controller/user/instance.go +++ b/app/manage/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/manage/controller" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "SciencesServer/serve/orm" "SciencesServer/utils" diff --git a/app/api/controller/user/menu.go b/app/manage/controller/user/menu.go similarity index 88% rename from app/api/controller/user/menu.go rename to app/manage/controller/user/menu.go index c2c856b..b5703b6 100644 --- a/app/api/controller/user/menu.go +++ b/app/manage/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/manage/controller" + menu2 "SciencesServer/app/manage/controller/menu" + "SciencesServer/app/manage/model" "SciencesServer/app/service" ) diff --git a/app/api/controller/user/person.go b/app/manage/controller/user/person.go similarity index 96% rename from app/api/controller/user/person.go rename to app/manage/controller/user/person.go index 8253994..a5da43b 100644 --- a/app/api/controller/user/person.go +++ b/app/manage/controller/user/person.go @@ -1,8 +1,8 @@ package user import ( - "SciencesServer/app/api/model" model2 "SciencesServer/app/common/model" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "errors" "time" diff --git a/app/api/controller/user/role.go b/app/manage/controller/user/role.go similarity index 96% rename from app/api/controller/user/role.go rename to app/manage/controller/user/role.go index 2aca501..05340c3 100644 --- a/app/api/controller/user/role.go +++ b/app/manage/controller/user/role.go @@ -1,11 +1,11 @@ package user import ( - "SciencesServer/app/api/controller" model2 "SciencesServer/app/common/model" + "SciencesServer/app/manage/controller" "SciencesServer/serve/logger" - "SciencesServer/app/api/model" + "SciencesServer/app/manage/model" "SciencesServer/app/service" "SciencesServer/serve/orm" "SciencesServer/utils" diff --git a/app/api/model/sys_auth.go b/app/manage/model/sys_auth.go similarity index 100% rename from app/api/model/sys_auth.go rename to app/manage/model/sys_auth.go diff --git a/app/api/model/sys_config.go b/app/manage/model/sys_config.go similarity index 100% rename from app/api/model/sys_config.go rename to app/manage/model/sys_config.go diff --git a/app/api/model/sys_deparement.go b/app/manage/model/sys_deparement.go similarity index 100% rename from app/api/model/sys_deparement.go rename to app/manage/model/sys_deparement.go diff --git a/app/api/model/sys_log.go b/app/manage/model/sys_log.go similarity index 100% rename from app/api/model/sys_log.go rename to app/manage/model/sys_log.go diff --git a/app/api/model/sys_menu.go b/app/manage/model/sys_menu.go similarity index 100% rename from app/api/model/sys_menu.go rename to app/manage/model/sys_menu.go diff --git a/app/api/model/sys_role.go b/app/manage/model/sys_role.go similarity index 100% rename from app/api/model/sys_role.go rename to app/manage/model/sys_role.go diff --git a/app/api/model/sys_role_auth.go b/app/manage/model/sys_role_auth.go similarity index 100% rename from app/api/model/sys_role_auth.go rename to app/manage/model/sys_role_auth.go diff --git a/app/api/model/sys_role_menu.go b/app/manage/model/sys_role_menu.go similarity index 100% rename from app/api/model/sys_role_menu.go rename to app/manage/model/sys_role_menu.go diff --git a/app/api/model/sys_tenant.go b/app/manage/model/sys_tenant.go similarity index 100% rename from app/api/model/sys_tenant.go rename to app/manage/model/sys_tenant.go diff --git a/app/api/model/sys_tenant_auth.go b/app/manage/model/sys_tenant_auth.go similarity index 100% rename from app/api/model/sys_tenant_auth.go rename to app/manage/model/sys_tenant_auth.go diff --git a/app/api/model/sys_tenant_menu.go b/app/manage/model/sys_tenant_menu.go similarity index 100% rename from app/api/model/sys_tenant_menu.go rename to app/manage/model/sys_tenant_menu.go diff --git a/app/api/model/sys_user.go b/app/manage/model/sys_user.go similarity index 100% rename from app/api/model/sys_user.go rename to app/manage/model/sys_user.go diff --git a/app/api/model/sys_user_login_log.go b/app/manage/model/sys_user_login_log.go similarity index 100% rename from app/api/model/sys_user_login_log.go rename to app/manage/model/sys_user_login_log.go diff --git a/app/api/model/sys_user_role.go b/app/manage/model/sys_user_role.go similarity index 100% rename from app/api/model/sys_user_role.go rename to app/manage/model/sys_user_role.go diff --git a/app/api/model/sys_user_tenant.go b/app/manage/model/sys_user_tenant.go similarity index 100% rename from app/api/model/sys_user_tenant.go rename to app/manage/model/sys_user_tenant.go diff --git a/router/address.go b/router/address.go index dd815bc..5b79071 100644 --- a/router/address.go +++ b/router/address.go @@ -1,8 +1,8 @@ package router import ( - api2 "SciencesServer/app/api/api" api3 "SciencesServer/app/enterprise/api" + api2 "SciencesServer/app/manage/api" "github.com/gin-gonic/gin" )