hero920103/go-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新结构

Browse Source
This commit is contained in:
hero920103
2026-04-01 16:41:41 +08:00
parent e830896d47
commit 106abeeff6
14 changed files with 357 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/admin_user.go
+73
View File
@@ -0,0 +1,73 @@
package services
import (
"strings"
"server/models"
"server/pkg/passwordutil"
)
func NormalizeAccount(s string) string {
return strings.TrimSpace(s)
}
func CreateAdminUser(account, password string, name, phone, email, qq, avatar *string, sex uint8, roleID uint64, status uint8) (uint64, error) {
hashed, err := passwordutil.Hash(password)
if err != nil {
return 0, err
}
u := &models.AdminUser{
Account: NormalizeAccount(account),
Password: hashed,
Name: name,
Phone: phone,
Email: email,
Qq: qq,
Avatar: avatar,
Sex: sex,
RoleID: roleID,
Status: status,
}
id, err := models.Orm.Insert(u)
return uint64(id), err
}
func GetAdminUserByID(id uint64) (*models.AdminUser, error) {
u := &models.AdminUser{ID: id}
if err := models.Orm.Read(u); err != nil {
return nil, err
}
return u, nil
}
func UpdateAdminUser(id uint64, fields map[string]interface{}) error {
_, err := models.Orm.QueryTable(new(models.AdminUser)).Filter("id", id).Update(fields)
return err
}
func DeleteAdminUser(id uint64) error {
_, err := models.Orm.QueryTable(new(models.AdminUser)).Filter("id", id).Delete()
return err
}
func ChangeAdminUserPassword(id uint64, newPassword string) error {
hashed, err := passwordutil.Hash(newPassword)
if err != nil {
return err
}
_, err = models.Orm.QueryTable(new(models.AdminUser)).Filter("id", id).Update(map[string]interface{}{
"password": hashed,
})
return err
}
func ListAdminUsers() ([]models.AdminUser, int64, error) {
var rows []models.AdminUser
total, err := models.Orm.QueryTable(new(models.AdminUser)).Count()
if err != nil {
return nil, 0, err
}
_, err = models.Orm.QueryTable(new(models.AdminUser)).OrderBy("-id").All(&rows)
return rows, total, err
}
services/permission.go
+51
View File
@@ -0,0 +1,51 @@
package services
import (
"encoding/json"
"strings"
"server/models"
)
// CheckUserPermission 校验用户是否拥有指定权限标识。
// 兼容 rights 为 JSON 数组 / 逗号分隔字符串；解析失败时默认放行，避免历史数据阻断请求。
func CheckUserPermission(userID int, permission string) (bool, error) {
if permission == "" || userID <= 0 {
return true, nil
}
var user models.AdminUser
if err := models.Orm.QueryTable(new(models.AdminUser)).Filter("id", userID).One(&user); err != nil {
return false, err
}
var role models.AdminRole
if err := models.Orm.QueryTable(new(models.AdminRole)).Filter("id", user.RoleID).One(&role); err != nil {
return false, err
}
if role.Rights == nil || strings.TrimSpace(*role.Rights) == "" {
return true, nil
}
rightsRaw := strings.TrimSpace(*role.Rights)
// 1) JSON 数组格式
var arr []string
if err := json.Unmarshal([]byte(rightsRaw), &arr); err == nil {
for _, p := range arr {
if strings.TrimSpace(p) == permission {
return true, nil
}
}
return false, nil
}
// 2) 逗号分隔字符串
for _, p := range strings.Split(rightsRaw, ",") {
if strings.TrimSpace(p) == permission {
return true, nil
}
}
return false, nil
}
services/platform_auth.go
+42 -18
View File
@@ -1,19 +1,19 @@
package services
import (
"crypto/md5"
"encoding/hex"
"errors"
"strings"
"server/models"
"server/pkg/jwtutil"
"server/pkg/passwordutil"
)
type PlatformLoginUser struct {
ID uint64
Account string
Name string
Tid uint64
Rid uint64
Avatar string
RoleName string
@@ -44,53 +44,77 @@ func toPlatformLoginUser(user *models.AdminUser) *PlatformLoginUser {
ID: user.ID,
Account: user.Account,
Name: name,
Tid: 0,
Rid: user.RoleID,
Avatar: avatar,
RoleName: adminRoleNameByID(user.RoleID),
}
}
func md5Hex(s string) string {
sum := md5.Sum([]byte(s))
return hex.EncodeToString(sum[:])
}
// PlatformLogin 平台登录业务（仅允许平台用户 yz_system_admin_user 登录）
func PlatformLogin(account, password string) (string, *PlatformLoginUser, error) {
// PlatformLogin 登录业务：先校验租户，再校验租户下用户
func PlatformLogin(tenantName, account, password string) (string, *PlatformLoginUser, error) {
tenantName = strings.TrimSpace(tenantName)
account = strings.TrimSpace(account)
password = strings.TrimSpace(password)
if account == "" || password == "" {
return "", nil, errors.New("用户名或密码不能为空")
if tenantName == "" || account == "" || password == "" {
return "", nil, errors.New("租户名称、用户名或密码不能为空")
}
var user models.AdminUser
err := models.Orm.QueryTable(new(models.AdminUser)).
// 1) 校验租户名称
var tenant models.Tenant
err := models.Orm.QueryTable(new(models.Tenant)).
Filter("tenant_name", tenantName).
One(&tenant)
if err != nil {
return "", nil, errors.New("租户不存在")
}
if tenant.Status != 1 {
return "", nil, errors.New("租户已停用")
}
// 2) 在 tid 下校验租户用户账号和密码
var tenantUser models.TenantUser
err = models.Orm.QueryTable(new(models.TenantUser)).
Filter("tid", tenant.ID).
Filter("account", account).
One(&user)
One(&tenantUser)
if err != nil {
return "", nil, errors.New("用户名或密码错误")
}
if user.Password != md5Hex(password) {
if tenantUser.Status == 0 {
return "", nil, errors.New("账号已禁用")
}
if tenantUser.Password == nil || !passwordutil.Verify(*tenantUser.Password, password) {
return "", nil, errors.New("用户名或密码错误")
}
// 3) 读取用户主档用于返回资料与角色信息
var user models.AdminUser
err = models.Orm.QueryTable(new(models.AdminUser)).
Filter("id", tenantUser.Uid).
One(&user)
if err != nil {
return "", nil, errors.New("用户不存在")
}
if user.Status == 0 {
return "", nil, errors.New("账号已禁用")
}
const fakeTenantID = 0
tenantID := int(tenant.ID)
const userType = "platform"
token, err := jwtutil.GenerateToken(int(user.ID), user.Account, fakeTenantID, userType)
token, err := jwtutil.GenerateToken(int(user.ID), user.Account, tenantID, userType)
if err != nil {
return "", nil, err
}
loginUser := toPlatformLoginUser(&user)
loginUser.Tid = tenant.ID
return token, loginUser, nil
}
// PlatformGetCurrentUser 根据平台管理员用户 ID 返回登录用户信息（含角色名称）
func PlatformGetCurrentUser(uid uint64) (*PlatformLoginUser, error) {
u, err := models.GetAdminUserByID(uid)
u, err := GetAdminUserByID(uid)
if err != nil {
return nil, errors.New("用户不存在")
}
services/tenant_user.go
+83
View File
@@ -0,0 +1,83 @@
package services
import "server/models"
// BindTenantUser 绑定用户到租户（若已存在则更新状态/默认值）
func BindTenantUser(tid, uid uint64, account, name, phone, email, password *string, isDefault, status int8, remark *string) (uint64, error) {
var existed models.TenantUser
err := models.Orm.QueryTable(new(models.TenantUser)).
Filter("tid", tid).
Filter("uid", uid).
One(&existed)
if err == nil {
update := map[string]interface{}{
"account": account,
"name": name,
"phone": phone,
"email": email,
"password": password,
"status": status,
"is_default": isDefault,
"remark": remark,
}
_, uErr := models.Orm.QueryTable(new(models.TenantUser)).Filter("id", existed.ID).Update(update)
return existed.ID, uErr
}
m := &models.TenantUser{
Tid: tid,
Uid: uid,
Account: account,
Name: name,
Phone: phone,
Email: email,
Password: password,
IsDefault: isDefault,
Status: status,
Remark: remark,
}
id, iErr := models.Orm.Insert(m)
return uint64(id), iErr
}
// UnbindTenantUser 删除绑定关系
func UnbindTenantUser(id uint64) error {
_, err := models.Orm.QueryTable(new(models.TenantUser)).Filter("id", id).Delete()
return err
}
// ListTenantUsersByTid 根据租户ID查询绑定关系
func ListTenantUsersByTid(tid uint64) ([]models.TenantUser, error) {
var rows []models.TenantUser
_, err := models.Orm.QueryTable(new(models.TenantUser)).
Filter("tid", tid).
OrderBy("-is_default", "-id").
All(&rows)
return rows, err
}
// ListTenantBindingsByUid 根据用户ID查询绑定关系
func ListTenantBindingsByUid(uid uint64) ([]models.TenantUser, error) {
var rows []models.TenantUser
_, err := models.Orm.QueryTable(new(models.TenantUser)).
Filter("uid", uid).
OrderBy("-is_default", "-id").
All(&rows)
return rows, err
}
// SetDefaultTenant 设置用户默认租户（同一用户仅一个默认）
func SetDefaultTenant(uid, tid uint64) error {
_, err := models.Orm.QueryTable(new(models.TenantUser)).Filter("uid", uid).Update(map[string]interface{}{
"is_default": 0,
})
if err != nil {
return err
}
_, err = models.Orm.QueryTable(new(models.TenantUser)).
Filter("uid", uid).
Filter("tid", tid).
Update(map[string]interface{}{"is_default": 1})
return err
}