public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 10:58:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

【优化】租户功能，框架优化

Browse Source
This commit is contained in:
PandaGoAdmin
2022-07-18 18:17:11 +08:00
parent d33bd39570
commit ae38e7bcef
60 changed files with 861 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/system/services/api.go
View File

@@ -6,7 +6,7 @@ import (
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/casbin"
"pandax/base/global"
"pandax/pkg/global"
)
type (

2
apps/system/services/config.go
View File

@@ -3,7 +3,7 @@ package services
import (
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
)
type (

2
apps/system/services/dept.go
View File

@@ -5,7 +5,7 @@ import (
"github.com/kakuilan/kgo"
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
)
type (

2
apps/system/services/dict_data.go
View File

@@ -3,7 +3,7 @@ package services
import (
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
)
type (

2
apps/system/services/dict_type.go
View File

@@ -3,7 +3,7 @@ package services
import (
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
)
type (

2
apps/system/services/menu.go
View File

@@ -3,7 +3,7 @@ package services
import (
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
)
type (

2
apps/system/services/notice.go
View File

@@ -3,7 +3,7 @@ package services
import (
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
)
type (

2
apps/system/services/post.go
View File

@@ -3,7 +3,7 @@ package services
import (
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
)
type (

2
apps/system/services/role.go
View File

@@ -4,7 +4,7 @@ import (
"errors"
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
)
type (

2
apps/system/services/role_dept.go
View File

@@ -4,7 +4,7 @@ import (
"fmt"
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
)
type (

2
apps/system/services/role_menu.go
View File

@@ -4,7 +4,7 @@ import (
"fmt"
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
)
type (

6
apps/system/services/tenant.go
View File

@@ -8,7 +8,7 @@ package services
import (
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
)
type (
@@ -38,7 +38,7 @@ func (m *SysTenantModelImpl) Insert(data entity.SysTenants) *entity.SysTenants {
func (m *SysTenantModelImpl) FindOne(tenantId int64) *entity.SysTenants {
resData := new(entity.SysTenants)
err := global.Db.Table(m.table).Where("tenant_id = ?", tenantId).First(resData).Error
err := global.Db.Table(m.table).Where("id = ?", tenantId).First(resData).Error
biz.ErrIsNil(err, "查询SysTenant失败")
return resData
}
@@ -81,5 +81,5 @@ func (m *SysTenantModelImpl) Update(data entity.SysTenants) *entity.SysTenants {
}
func (m *SysTenantModelImpl) Delete(tenantIds []int64) {
biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.SysTenants{}, "tenant_id in (?)", tenantIds).Error, "删除SysTenant失败")
biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.SysTenants{}, "id in (?)", tenantIds).Error, "删除SysTenant失败")
}

30
apps/system/services/user.go
View File

@@ -5,7 +5,8 @@ import (
"golang.org/x/crypto/bcrypt"
"pandax/apps/system/entity"
"pandax/base/biz"
"pandax/base/global"
"pandax/pkg/global"
"time"
)
type (
@@ -31,12 +32,19 @@ var SysUserModelDao SysUserModel = &sysUserModelImpl{
func (m *sysUserModelImpl) Login(u entity.Login) *entity.SysUser {
user := new(entity.SysUser)
err := global.Db.Table(m.table).Where("username = ? ", u.Username).Find(user)
biz.ErrIsNil(err.Error, "查询用户信息失败")
// 验证密码
b := kgo.KEncr.PasswordVerify([]byte(u.Password), []byte(user.Password))
biz.IsTrue(b, "密码错误")
//验证租户
if SysTenantModelDao.FindOne(user.TenantId).ExpireTime.Unix() < time.Now().Unix() {
biz.IsTrue(b, "租户已经过期")
}
return user
}
@@ -61,27 +69,25 @@ func (m *sysUserModelImpl) FindOne(data entity.SysUser) *entity.SysUserView {
if data.UserId != 0 {
db = db.Where("user_id = ?", data.UserId)
}
if data.TenantId != 0 {
db = db.Where("tenant_id = ?", data.TenantId)
}
if data.Username != "" {
db = db.Where("username = ?", data.Username)
}
if data.Password != "" {
db = db.Where("password = ?", data.Password)
}
if data.RoleId != 0 {
db = db.Where("role_id = ?", data.RoleId)
}
if data.DeptId != 0 {
db = db.Where("dept_id = ?", data.DeptId)
}
if data.PostId != 0 {
db = db.Where("post_id = ?", data.PostId)
}
biz.ErrIsNil(db.First(resData).Error, "查询用户失败")
biz.ErrIsNil(db.Preload("SysTenants").First(resData).Error, "查询用户失败")
return resData
}
@@ -96,7 +102,9 @@ func (m *sysUserModelImpl) FindListPage(page, pageSize int, data entity.SysUser)
if data.Username != "" {
db = db.Where("sys_users.username = ?", data.Username)
}
if data.TenantId != 0 {
db = db.Where("sys_users.tenant_id = ?", data.TenantId)
}
if data.NickName != "" {
db = db.Where("sys_users.nick_name like ?", "%"+data.NickName+"%")
}
@@ -113,7 +121,7 @@ func (m *sysUserModelImpl) FindListPage(page, pageSize int, data entity.SysUser)
}
db.Where("sys_users.delete_time IS NULL")
err := db.Count(&total).Error
err = db.Limit(pageSize).Offset(offset).Find(&list).Error
err = db.Limit(pageSize).Offset(offset).Preload("SysTenants").Find(&list).Error
biz.ErrIsNil(err, "查询用户分页列表失败")
return &list, total
}
@@ -126,7 +134,9 @@ func (m *sysUserModelImpl) FindList(data entity.SysUser) *[]entity.SysUserView {
if data.UserId != 0 {
db = db.Where("user_id = ?", data.UserId)
}
if data.TenantId != 0 {
db = db.Where("tenant_id = ?", data.TenantId)
}
if data.Username != "" {
db = db.Where("username = ?", data.Username)
}