williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2021-09-28 11:51:15 +08:00
parent da7b3130fe
commit ef9213f261
51 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/account.go → app/api/api/account.go
View File

@ -1,7 +1,7 @@
package api
import (
"SciencesServer/app/controller"
"SciencesServer/app/api/controller"
"SciencesServer/app/service"
"github.com/gin-gonic/gin"

2
app/api/auth.go → app/api/api/auth.go
View File

@ -1,7 +1,7 @@
package api
import (
"SciencesServer/app/controller/auth"
"SciencesServer/app/api/controller/auth"
"SciencesServer/app/service"
"github.com/gin-gonic/gin"

0
app/api/base.go → app/api/api/base.go
View File

0
app/api/captcha.go → app/api/api/captcha.go
View File

2
app/api/config.go → app/api/api/config.go
View File

@ -1,7 +1,7 @@
package api
import (
"SciencesServer/app/controller"
"SciencesServer/app/api/controller"
"github.com/gin-gonic/gin"
)

2
app/api/department.go → app/api/api/department.go
View File

@ -1,7 +1,7 @@
package api
import (
"SciencesServer/app/controller"
"SciencesServer/app/api/controller"
"SciencesServer/app/service"
"github.com/gin-gonic/gin"

2
app/api/logs.go → app/api/api/logs.go
View File

@ -1,7 +1,7 @@
package api
import (
"SciencesServer/app/controller"
"SciencesServer/app/api/controller"
"SciencesServer/app/service"
"github.com/gin-gonic/gin"

2
app/api/menu.go → app/api/api/menu.go
View File

@ -1,7 +1,7 @@
package api
import (
"SciencesServer/app/controller/menu"
"SciencesServer/app/api/controller/menu"
"SciencesServer/app/service"
"github.com/gin-gonic/gin"

2
app/api/role.go → app/api/api/role.go
View File

@ -1,7 +1,7 @@
package api
import (
"SciencesServer/app/controller/role"
"SciencesServer/app/api/controller/role"
"SciencesServer/app/service"
"github.com/gin-gonic/gin"

0
app/api/struct.go → app/api/api/struct.go
View File

2
app/api/tenant.go → app/api/api/tenant.go
View File

@ -1,7 +1,7 @@
package api
import (
"SciencesServer/app/controller/tenant"
"SciencesServer/app/api/controller/tenant"
"SciencesServer/app/service"
"github.com/gin-gonic/gin"

0
app/api/upload.go → app/api/api/upload.go
View File

2
app/api/user.go → app/api/api/user.go
View File

@ -1,7 +1,7 @@
package api
import (
"SciencesServer/app/controller/user"
"SciencesServer/app/api/controller/user"
"SciencesServer/app/service"
"github.com/gin-gonic/gin"

2
app/controller/account.go → app/api/controller/account.go
View File

@ -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"

2
app/controller/auth/base.go → app/api/controller/auth/base.go
View File

@ -1,8 +1,8 @@
package auth
import (
"SciencesServer/app/api/model"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/model"
)
type (

4
app/controller/auth/instance.go → app/api/controller/auth/instance.go
View File

@ -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"
)

0
app/controller/base.go → app/api/controller/base.go
View File

2
app/controller/config.go → app/api/controller/config.go
View File

@ -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"

2
app/controller/department.go → app/api/controller/department.go
View File

@ -1,8 +1,8 @@
package controller
import (
"SciencesServer/app/api/model"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/model"
"SciencesServer/app/service"
"time"
)

2
app/controller/logs.go → app/api/controller/logs.go
View File

@ -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"
)

2
app/controller/menu/base.go → app/api/controller/menu/base.go
View File

@ -1,8 +1,8 @@
package menu
import (
"SciencesServer/app/api/model"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/model"
)
type (

4
app/controller/menu/menu.go → app/api/controller/menu/menu.go
View File

@ -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"

10
app/controller/role/auth.go → app/api/controller/role/auth.go
View File

@ -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 角色权限绑定

4
app/controller/role/instance.go → app/api/controller/role/instance.go
View File

@ -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"

10
app/controller/role/menu.go → app/api/controller/role/menu.go
View File

@ -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 绑定菜单

4
app/controller/role/user.go → app/api/controller/role/user.go
View File

@ -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"

4
app/controller/tenant/auth.go → app/api/controller/tenant/auth.go
View File

@ -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"

10
app/controller/tenant/instance.go → app/api/controller/tenant/instance.go
View File

@ -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
}
}

10
app/controller/tenant/menu.go → app/api/controller/tenant/menu.go
View File

@ -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 绑定菜单

0
app/controller/tenant/struct.go → app/api/controller/tenant/struct.go
View File

0
app/controller/tenant/sub.go → app/api/controller/tenant/sub.go
View File

4
app/controller/user/instance.go → app/api/controller/user/instance.go
View File

@ -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"

12
app/controller/user/menu.go → app/api/controller/user/menu.go
View File

@ -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 {

2
app/controller/user/person.go → app/api/controller/user/person.go
View File

@ -1,8 +1,8 @@
package user
import (
"SciencesServer/app/api/model"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/model"
"SciencesServer/app/service"
"errors"
"time"

4
app/controller/user/role.go → app/api/controller/user/role.go
View File

@ -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"

0
app/model/sys_auth.go → app/api/model/sys_auth.go
View File

0
app/model/sys_config.go → app/api/model/sys_config.go
View File

0
app/model/sys_deparement.go → app/api/model/sys_deparement.go
View File

0
app/model/sys_log.go → app/api/model/sys_log.go
View File

0
app/model/sys_menu.go → app/api/model/sys_menu.go
View File

0
app/model/sys_role.go → app/api/model/sys_role.go
View File

0
app/model/sys_role_auth.go → app/api/model/sys_role_auth.go
View File

0
app/model/sys_role_menu.go → app/api/model/sys_role_menu.go
View File

0
app/model/sys_tenant.go → app/api/model/sys_tenant.go
View File

0
app/model/sys_tenant_auth.go → app/api/model/sys_tenant_auth.go
View File

0
app/model/sys_tenant_menu.go → app/api/model/sys_tenant_menu.go
View File

0
app/model/sys_user.go → app/api/model/sys_user.go
View File

0
app/model/sys_user_login_log.go → app/api/model/sys_user_login_log.go
View File

0
app/model/sys_user_role.go → app/api/model/sys_user_role.go
View File

0
app/model/sys_user_tenant.go → app/api/model/sys_user_tenant.go
View File

22
router/address.go
View File

@ -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)
}
}