daihengshun/ArmedPolice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2021-11-02 17:01:04 +08:00
parent 20d81825e1
commit 0fa2630933
19 changed files with 171 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/api/account.go
View File

@ -2,6 +2,7 @@ package api
import (
"ArmedPolice/app/controller/account"
"ArmedPolice/app/service"
"github.com/gin-gonic/gin"
)
@ -50,8 +51,8 @@ func (a *Account) Login(c *gin.Context) {
APIFailure(err.(error))(c)
return
}
//c.GetHeader("x-equipment")
data, err := account.NewInstance()(nil).Login()
data, err := account.NewInstance()(nil).Login(form.Account, form.Password, form.Captcha.Key,
form.Captcha.Value, c.ClientIP())
APIResponse(err, data)(c)
}
@ -75,6 +76,13 @@ func (a *Account) Login(c *gin.Context) {
* }
*/
func (a *Account) Logout(c *gin.Context) {
//err := controller.NewAccount()(getSession()(c).(*service.Session)).Logout()
//APIResponse(err)(c)
handle := getSession()(c)
session := new(service.Session)
if handle != nil {
session = handle.(*service.Session)
}
err := account.NewInstance()(session).Logout()
APIResponse(err)(c)
}

13
app/api/user.go
View File

@ -1 +1,14 @@
package api
import (
"ArmedPolice/app/controller/user"
"ArmedPolice/app/service"
"github.com/gin-gonic/gin"
)
type User struct{}
func (*User) Info(c *gin.Context) {
data := user.NewInstance()(getSession()(c).(*service.Session)).Info()
APIResponse(nil, data)
}

2
app/common/init.go
View File

@ -35,7 +35,7 @@ func initModel() {
}
}
function(
&synchronized{iModel: model.NewSysTenant()}, &synchronized{iModel: model.NewSysTenantMenu()},
&synchronized{iModel: model.NewSysTenant()},
&synchronized{iModel: model.NewSysConfig()},
&synchronized{iModel: model.NewSysMenu()}, &synchronized{iModel: model.NewSysAuth()},
&synchronized{iModel: model.NewSysUser(), iValues: func() interface{} {

8
app/controller/account/instance.go
View File

@ -68,6 +68,14 @@ func (c *Instance) Login(account, password, captchaKey, captchaValue, ip string)
return &InstanceLoginResponse{Token: session.Token, EffectTime: config.SettingInfo.TokenEffectTime}, nil
}
// Logout 退出请求
func (c *Instance) Logout() error {
if c.UID > 0 {
service.Publish(config.EventForRedisHashDestroy, config.RedisKeyForAccount, utils.UintToString(c.UID))
}
return nil
}
func NewInstance() InstanceHandle {
return func(session *service.Session) *Instance {
return &Instance{session}

4
app/controller/basic/struct.go
View File

@ -1,7 +1,7 @@
package basic
// ReturnPages 分页数据
type ReturnPages struct {
// PageDataResponse 分页数据
type PageDataResponse struct {
Data interface{} `json:"data"`
Count int64 `json:"count"`
}

4
app/controller/supplier/instance.go
View File

@ -28,7 +28,7 @@ type (
)
// List 列表信息
func (c *Instance) List(name, mobile string, kind model2.ManageSupplierKind, page, pageSize int) (*basic.ReturnPages, error) {
func (c *Instance) List(name, mobile string, kind model2.ManageSupplierKind, page, pageSize int) (*basic.PageDataResponse, error) {
mManageSupplier := model.NewManageSupplier()
out := make([]*model2.ManageSupplier, 0)
@ -69,7 +69,7 @@ func (c *Instance) List(name, mobile string, kind model2.ManageSupplierKind, pag
ID: v.GetEncodeID(), ManageSupplier: v,
})
}
return &basic.ReturnPages{Data: list, Count: count}, nil
return &basic.PageDataResponse{Data: list, Count: count}, nil
}
// Form 数据处理

38
app/controller/user/instance.go
View File

@ -2,6 +2,7 @@ package user
import (
"ArmedPolice/app/controller/basic"
"ArmedPolice/app/model"
"ArmedPolice/app/service"
)
@ -9,8 +10,41 @@ type Instance struct{ *service.Session }
type InstanceHandle func(session *service.Session) *Instance
func (c *Instance) List() (*basic.ReturnPages, error) {
return &basic.ReturnPages{Data: nil, Count: 0}, nil
type (
// InstanceBasic 基本信息
InstanceBasic struct {
Name string `json:"name"`
Avatar string `json:"avatar"`
}
// InstanceInfo 用户信息
InstanceInfo struct {
ID string `json:"id"`
*model.SysUserInfo
}
)
// Info 基本信息
func (c *Instance) Info() *InstanceBasic {
return &InstanceBasic{Name: c.Name, Avatar: c.Avatar}
}
// List 列表信息
func (c *Instance) List(name string, page, pageSize int) (*basic.PageDataResponse, error) {
mSysUser := model.NewSysUser()
var count int64
out, err := mSysUser.Users(page, pageSize, &count)
if err != nil {
return nil, err
}
list := make([]*InstanceInfo, 0)
for _, v := range out {
list = append(list, &InstanceInfo{ID: v.GetEncodeID(), SysUserInfo: v})
}
return &basic.PageDataResponse{Data: list, Count: count}, nil
}
func (c *Instance) Form() error {

61
app/model/sys_auth.go
View File

@ -1,9 +1,7 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"fmt"
"ArmedPolice/app/common/model"
)
type SysAuth struct {
@ -16,45 +14,28 @@ type SysAuthScene struct {
SceneID uint64 `json:"scene_id"`
}
// TenantAuth 租户权限
func (m *SysAuth) TenantAuth(tenantID uint64) ([]*SysAuthScene, error) {
mSysTenantAuth := NewSysTenantAuth()
out := make([]*SysAuthScene, 0)
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.*, r_a.id AS scene_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS t_a ON t_a.auth_id = a.id AND t_a.tenant_id = %d AND t_a.is_deleted = %d",
mSysTenantAuth.TableName(), tenantID, model.DeleteStatusForNot)).
Where("a.is_deleted = ?", model.DeleteStatusForNot)
if err := db.Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// RoleAuth 角色权限
func (m *SysAuth) RoleAuth(tenantID, roleID uint64) ([]*SysAuthScene, error) {
mSysTenantAuth := NewSysTenantAuth()
mSysRoleAuth := NewSysRoleAuth()
out := make([]*SysAuthScene, 0)
db := orm.GetDB().Table(m.TableName()+" AS a").
Select("a.*, r_a.id AS scene_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS t_a ON t_a.auth_id = a.id AND t_a.tenant_id = %d AND t_a.is_deleted = %d",
mSysTenantAuth.TableName(), tenantID, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS r_a ON r_a.auth_id = a.id AND r_a.role_id = %d AND r_a.is_deleted = %d",
mSysRoleAuth.TableName(), roleID, model.DeleteStatusForNot)).
Where("a.is_deleted = ?", model.DeleteStatusForNot).
Where("t_a.id > ?", 0)
if err := db.Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
//mSysTenantAuth := NewSysTenantAuth()
//
//mSysRoleAuth := NewSysRoleAuth()
//
//out := make([]*SysAuthScene, 0)
//
//db := orm.GetDB().Table(m.TableName()+" AS a").
// Select("a.*, r_a.id AS scene_id").
// Joins(fmt.Sprintf("LEFT JOIN %s AS t_a ON t_a.auth_id = a.id AND t_a.tenant_id = %d AND t_a.is_deleted = %d",
// mSysTenantAuth.TableName(), tenantID, model.DeleteStatusForNot)).
// Joins(fmt.Sprintf("LEFT JOIN %s AS r_a ON r_a.auth_id = a.id AND r_a.role_id = %d AND r_a.is_deleted = %d",
// mSysRoleAuth.TableName(), roleID, model.DeleteStatusForNot)).
// Where("a.is_deleted = ?", model.DeleteStatusForNot).
// Where("t_a.id > ?", 0)
//
//if err := db.Scan(&out).Error; err != nil {
// return nil, err
//}
//return out, nil
return nil, nil
}
func NewSysAuth() *SysAuth {

2
app/model/sys_config.go
View File

@ -1,6 +1,6 @@
package model
import "TenantServe/app/common/model"
import "ArmedPolice/app/common/model"
type SysConfig struct {
*model.SysConfig

2
app/model/sys_deparement.go
View File

@ -1,6 +1,6 @@
package model
import "TenantServe/app/common/model"
import "ArmedPolice/app/common/model"
type SysDepartment struct {
*model.SysDepartment

106
app/model/sys_menu.go
View File

@ -1,117 +1,13 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"fmt"
"ArmedPolice/app/common/model"
)
type SysMenu struct {
*model.SysMenu
}
type SysMenuScene struct {
ID uint64 `json:"id"`
*model.SysMenuBasic
SceneID uint64 `json:"scene_id"` // 场景（租户，角色）
}
// Recursion 递归查询子菜单
func (m *SysMenu) Recursion(id uint64) {
//SELECT
//t3.id, t3.parent_id, t3.`name`, t3.kind
//FROM
//(SELECT
//t1.id, t1.parent_id, t1.name, t1.kind,
// IF(FIND_IN_SET( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS is_child
//FROM
//(SELECT id, parent_id, `name`, kind FROM sys_menu WHERE is_deleted = 0 ORDER BY parent_id ASC, sort DESC) AS t1,
// (SELECT @pids := 1) AS t2
//) AS t3
//WHERE is_child != 0
}
// SystemMenu 系统菜单
func (m *SysMenu) SystemMenu(where ...*model.ModelWhere) ([]*model.SysMenu, error) {
out := make([]*model.SysMenu, 0)
db := orm.GetDB().Table(m.TableName()).
Where("status = ? AND is_deleted = ?", model.SysMenuStatusForNormal, model.DeleteStatusForNot)
if len(where) > 0 {
for _, wo := range where {
db = db.Where(wo.Condition, wo.Value)
}
}
if err := db.Order("parent_id " + model.OrderModeToAsc).Order("sort " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// TenantMenu 租户菜单
func (m *SysMenu) TenantMenu(tenantID uint64) ([]*SysMenuScene, error) {
mSysTenantMenu := NewSysTenantMenu()
out := make([]*SysMenuScene, 0)
db := orm.GetDB().Table(m.TableName()+" m").
Select("m.id, m.parent_id, m.name, m.kind, m.link, m.component, m.icon, t_m.id AS scene_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS t_m ON m.id = t_m.menu_id AND t_m.tenant_id = %d AND t_m.is_deleted = %d",
mSysTenantMenu.TableName(), tenantID, model.DeleteStatusForNot)).
Where("m.status = ? AND m.is_deleted = ?", model.SysMenuStatusForNormal, model.DeleteStatusForNot)
if err := db.Order("m.parent_id " + model.OrderModeToAsc).Order("m.sort " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// RoleMenu 角色菜单
func (m *SysMenu) RoleMenu(tenantID uint64, roleID uint64) ([]*SysMenuScene, error) {
mSysTenantMenu := NewSysTenantMenu()
mSysRoleMenu := NewSysRoleMenu()
out := make([]*SysMenuScene, 0)
db := orm.GetDB().Table(m.TableName()+" AS m").
Select("m.id, m.parent_id, m.name, m.kind, m.link, m.component, m.icon, r_m.id AS scene_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS t_m ON m.id = t_m.menu_id AND t_m.tenant_id = %d AND t_m.is_deleted = %d",
mSysTenantMenu.TableName(), tenantID, model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS r_m ON m.id = r_m.menu_id AND r_m.role_id = %d AND r_m.is_deleted = %d",
mSysRoleMenu.TableName(), roleID, model.DeleteStatusForNot)).
Where("m.status = ? AND m.is_deleted = ?", model.SysMenuStatusForNormal, model.DeleteStatusForNot).
Where("t_m.id > ?", 0)
if err := db.Order("m.parent_id " + model.OrderModeToAsc).Order("m.sort " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
// UserMenu 用户菜单
func (m *SysMenu) UserMenu(uid uint64) ([]*SysMenuScene, error) {
mSysUserRole := NewSysUserRole()
mSysRoleMenu := NewSysRoleMenu()
out := make([]*SysMenuScene, 0)
db := orm.GetDB().Table(mSysUserRole.TableName()+" AS u_r").
Select("m.id, m.parent_id, m.name, m.kind, m.link, m.component, m.icon").
Joins(fmt.Sprintf("LEFT JOIN %s AS r_m ON u_r.role_id = r_m.id AND r_m.is_deletd = %d",
mSysRoleMenu.TableName(), model.DeleteStatusForNot)).
Joins(fmt.Sprintf("LEFT JOIN %s AS m ON r_m.menu_id = m.id AND m.status = %d AND m.is_deleted = %d",
m.TableName(), model.SysMenuStatusForNormal, model.DeleteStatusForNot)).
Where("u_r.uid = ? AND u_r.is_deleted = ?", uid, model.DeleteStatusForNot)
if err := db.Order("m.parent_id " + model.OrderModeToAsc).Order("m.sort " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
func NewSysMenu() *SysMenu {
return &SysMenu{SysMenu: model.NewSysMenu()}
}

33
app/model/sys_role.go
View File

@ -1,9 +1,7 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"fmt"
"ArmedPolice/app/common/model"
)
type SysRole struct {
@ -24,20 +22,21 @@ type SysRoleUserInfo struct {
// UserRole 用户角色信息
func (m *SysRole) UserRole(uid uint64) ([]*SysRoleUserInfo, error) {
mSysUserRole := NewSysUserRole()
db := orm.GetDB().Table(m.TableName()+" AS r").
Select("r.is, r.name, u_r.id AS user_role_id").
Joins(fmt.Sprintf("LEFT JOIN %s AS u_r ON r.id = u_r.role_id AND u_r.uid = %d AND u_r.is_deleted = %d",
mSysUserRole.TableName(), uid, model.DeleteStatusForNot)).
Where("r.is_deleted = ?", model.DeleteStatusForNot)
out := make([]*SysRoleUserInfo, 0)
if err := db.Order("r.id " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
//mSysUserRole := NewSysUserRole()
//
//db := orm.GetDB().Table(m.TableName()+" AS r").
// Select("r.is, r.name, u_r.id AS user_role_id").
// Joins(fmt.Sprintf("LEFT JOIN %s AS u_r ON r.id = u_r.role_id AND u_r.uid = %d AND u_r.is_deleted = %d",
// mSysUserRole.TableName(), uid, model.DeleteStatusForNot)).
// Where("r.is_deleted = ?", model.DeleteStatusForNot)
//
//out := make([]*SysRoleUserInfo, 0)
//
//if err := db.Order("r.id " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
// return nil, err
//}
//return out, nil
return nil, nil
}
func NewSysRole() *SysRole {

36
app/model/sys_role_auth.go
View File

@ -1,47 +1,13 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"fmt"
"ArmedPolice/app/common/model"
)
type SysRoleAuth struct {
*model.SysRoleAuth
}
// SysRoleAuths 权限信息
type SysRoleAuths struct {
ID uint64 `json:"id"`
RoleID uint64 `json:"role_id"`
Auth string `json:"auth"`
}
// Auths 权限信息
func (m *SysRoleAuth) Auths(where ...*model.ModelWhere) ([]*SysRoleAuths, error) {
mSysRole := NewSysRole()
mSysAuth := NewSysAuth()
db := orm.GetDB().Table(m.TableName()+" AS r_a").
Select("r_a.id, r_a.role_id, a.auth").
Joins(fmt.Sprintf("LEFT JOIN %s AS r ON r_a.role_id = r.id", mSysRole.TableName())).
Joins(fmt.Sprintf("LEFT JOIN %s AS a ON r_a.auth_id = a.id", mSysAuth.TableName())).
Where("r_a.is_deleted = ?", model.DeleteStatusForNot)
out := make([]*SysRoleAuths, 0)
if len(where) > 0 {
for _, wo := range where {
db = db.Where(wo.Condition, wo.Value)
}
}
if err := db.Order("r_a.id " + model.OrderModeToDesc).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
func NewSysRoleAuth() *SysRoleAuth {
return &SysRoleAuth{SysRoleAuth: model.NewSysRoleAuth()}
}

8
app/model/sys_role_menu.go
View File

@ -1,13 +1,11 @@
package model
import (
model2 "TenantServe/app/common/model"
)
import "ArmedPolice/app/common/model"
type SysRoleMenu struct {
*model2.SysRoleMenu
*model.SysRoleMenu
}
func NewSysRoleMenu() *SysRoleMenu {
return &SysRoleMenu{SysRoleMenu: model2.NewSysRoleMenu()}
return &SysRoleMenu{SysRoleMenu: model.NewSysRoleMenu()}
}

44
app/model/sys_user.go
View File

@ -1,30 +1,39 @@
package model
import (
model2 "ArmedPolice/app/common/model"
"ArmedPolice/app/common/model"
"ArmedPolice/serve/orm"
"ArmedPolice/utils"
"errors"
"fmt"
"gorm.io/gorm"
)
// SysUser 用户信息
type SysUser struct {
*model2.SysUser
*model.SysUser
}
type (
// SysUserInfo 用户信息
SysUserInfo struct {
*model.SysUser
TenantName string `json:"tenant_name"`
}
)
func (m *SysUser) ValidatePassword(password string) bool {
return utils.HashCompare([]byte(m.Password), []byte(utils.Md5String(password, m.Salt)))
}
func (m *SysUser) IsAdminUser() bool {
return m.IsAdmin == model2.SysUserAdministratorForAdmin
return m.IsAdmin == model.SysUserAdministratorForAdmin
}
func (m *SysUser) GetByAccountOrMobile(param string) (bool, error) {
db := orm.GetDB().Table(m.TableName()).Where("(account = ? OR mobile = ?)", param, param).
Where("is_deleted = ?", model2.DeleteStatusForNot)
Where("is_deleted = ?", model.DeleteStatusForNot)
if err := db.First(m.SysUser).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
@ -35,6 +44,29 @@ func (m *SysUser) GetByAccountOrMobile(param string) (bool, error) {
return true, nil
}
func NewSysUser() *SysUser {
return &SysUser{SysUser: model2.NewSysUser()}
func (m *SysUser) Users(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*SysUserInfo, error) {
mSysTenant := model.NewSysTenant()
db := orm.GetDB().Table(m.TableName()+" As u").Select("u.*", "t.name AS tenant_name").
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON u.tenant_id = t.id", mSysTenant.TableName())).
Where("u.is_deleted = ?", model.DeleteStatusForNot)
out := make([]*SysUserInfo, 0)
if len(where) > 0 {
for _, wo := range where {
db = db.Where(wo.Condition, wo.Value)
}
}
if err := db.Order("u.id " + model.OrderModeToAsc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}
if err := db.Count(count).Error; err != nil {
return nil, err
}
return out, nil
}
func NewSysUser() *SysUser {
return &SysUser{SysUser: model.NewSysUser()}
}

4
app/model/sys_user_login_log.go
View File

@ -1,8 +1,8 @@
package model
import (
"TenantServe/app/common/model"
"TenantServe/serve/orm"
"ArmedPolice/app/common/model"
"ArmedPolice/serve/orm"
"fmt"
)

6
app/model/sys_user_role.go
View File

@ -1,13 +1,13 @@
package model
import (
model2 "TenantServe/app/common/model"
"ArmedPolice/app/common/model"
)
type SysUserRole struct {
*model2.SysUserRole
*model.SysUserRole
}
func NewSysUserRole() *SysUserRole {
return &SysUserRole{SysUserRole: model2.NewSysUserRole()}
return &SysUserRole{SysUserRole: model.NewSysUserRole()}
}

26
router/auth.go
View File

@ -76,32 +76,6 @@ func NeedLogin(skipperURL ...SkipperURL) gin.HandlerFunc {
}
}
// NeedGradeParam 需要年级参数
func NeedGradeParam(skipperURL ...SkipperURL) gin.HandlerFunc {
return func(c *gin.Context) {
if len(skipperURL) > 0 && skipperURL[0](c) {
c.Next()
return
}
param := c.GetHeader(config.APIRequestGrade)
if param == "" {
c.JSON(http.StatusBadRequest, gin.H{"message": "参数异常"})
c.Abort()
return
}
grade := utils.StringToInt(param)
if grade <= 0 {
c.JSON(http.StatusBadRequest, gin.H{"message": "Grade异常"})
c.Abort()
return
}
c.Set(config.TokenForGrade, grade)
c.Next()
}
}
// NeedPermission 需要权限验证
func NeedPermission(skipperURL ...SkipperURL) PermissionHandle {
return func(key string) gin.HandlerFunc {

25
router/router.go
View File

@ -39,26 +39,21 @@ func (this *Router) registerAPI() {
g.Use(NeedLogin(AddSkipperURL([]string{
apiPrefix + "/v1/account/login",
apiPrefix + "/v1/account/logout",
apiPrefix + "/v1/index",
apiPrefix + "/v1/grade",
apiPrefix + "/v1/book/list",
}...)))
g.Use(NeedGradeParam(AddSkipperURL([]string{
apiPrefix + "/v1/account/authorize",
apiPrefix + "/v1/account/tourist",
apiPrefix + "/v1/grade",
apiPrefix + "/v1/user/info",
}...)))
v1 := g.Group("/v1")
// Account 接口管理
account := v1.Group("/account")
accountV1 := v1.Group("/account")
{
_api := new(api.Account)
account.POST("/login", _api.Login)
account.POST("/logout", _api.Logout)
if config.IsDebug() {
//account.GET("/tourist", _api.Tourist)
}
accountV1.POST("/login", _api.Login)
accountV1.POST("/logout", _api.Logout)
}
// User 用户管理
UserV1 := v1.Group("/user")
{
_api := new(api.User)
UserV1.GET("/info", _api.Info)
}
}