feat：完善项目

app/api/api/account.go

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

app/api/api/auth.go

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

app/api/api/config.go

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

app/api/api/department.go

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

app/api/api/logs.go

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

app/api/api/menu.go

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

app/api/api/role.go

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

app/api/api/tenant.go

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

app/api/api/user.go

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

app/api/controller/account.go

@@ -0,0 +1,110 @@
+package controller
+
+import (
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/handle"
+	"SciencesServer/app/service"
+	"SciencesServer/config"
+	"SciencesServer/utils"
+	"errors"
+)
+
+type Account struct{ *Platform }
+
+type AccountHandle func(session *service.Session) *Account
+
+type (
+	AccountLoginResponse struct {
+		Token      string `json:"token"`
+		EffectTime int    `json:"effect_time"`
+	}
+)
+
+// Login 登录请求
+func (c *Account) Login(account, password, captchaKey, captchaValue, equipment, ip string) (*AccountLoginResponse, error) {
+	// 验证验证码
+	if pass, _ := handle.NewCaptcha().Validate(&handle.CaptchaImage{Key: captchaKey, Captcha: captchaValue}); !pass {
+		return nil, errors.New("验证码错误")
+	}
+	mSysUser := model.NewSysUser()
+
+	isExist, err := mSysUser.GetByAccountOrMobile(account)
+
+	if err != nil {
+		return nil, err
+	} else if !isExist {
+		return nil, errors.New("该帐号信息不存在")
+	}
+	if !mSysUser.ValidatePassword(password) {
+		return nil, errors.New("密码错误")
+	}
+	session := service.NewSession()
+	session.UID = mSysUser.UUID
+	session.Name = mSysUser.Name
+	session.Mobile = mSysUser.Mobile
+	session.IsAdmin = mSysUser.IsAdminUser()
+	// 非超级管理员
+	if !session.IsAdmin {
+		// 查询相应关系
+		mSysUserTenant := model.NewSysUserTenant()
+
+		if isExist, err = model2.FirstField(mSysUserTenant.SysUserTenant, []string{"id", "tenant_id", "identity", "status"},
+			model2.NewWhere("uid", mSysUser.UUID)); err != nil {
+			return nil, err
+		} else if !isExist {
+			return nil, errors.New("当前不属于任何租户，不可登录")
+		} else if mSysUserTenant.Status != model2.SysUserTenantStatusForEnable {
+			return nil, errors.New("当前账号已禁用，不可登录，请联系管理员！")
+		}
+		if mSysUserTenant.TenantID <= 0 {
+			goto Complete
+		}
+		mSysTenant := model.NewSysTenant()
+		mSysTenant.ID = mSysUserTenant.TenantID
+
+		level := 0
+
+		for {
+			if isExist, err = model2.FirstField(mSysTenant, []string{"id", "key", "parent_id", "deadline", "status"}); err != nil {
+				return nil, err
+			} else if !isExist {
+				return nil, errors.New("租户信息不存在，不可登录")
+			} else if mSysTenant.IsInvalid() {
+				return nil, errors.New("租户协议已失效，不可登录")
+			}
+			if level <= 0 {
+				session.TenantID = mSysTenant.ID
+				session.TenantKey = mSysTenant.Key
+			}
+			// 判断是否含有含有上级
+			if mSysTenant.ParentID <= 0 {
+				goto Complete
+			}
+			level++
+			mSysTenant.ID = mSysTenant.ParentID
+		}
+	}
+Complete:
+	uid := mSysUser.UUIDString()
+
+	session.Token = utils.JWTEncrypt(config.SettingInfo.TokenEffectTime, map[string]interface{}{config.TokenForUID: uid})
+
+	service.Publish(config.EventForRedisHashProduce, config.RedisKeyForAccount, uid, session)
+
+	service.Publish(config.EventForAccountLoginProduce, session.TenantID, session.UID, equipment, ip)
+
+	return &AccountLoginResponse{Token: session.Token, EffectTime: config.SettingInfo.TokenEffectTime}, nil
+}
+
+// Logout 退出请求
+func (c *Account) Logout() error {
+	service.Publish(config.EventForRedisHashDestroy, config.RedisKeyForAccount, utils.UintToString(c.UID))
+	return nil
+}
+
+func NewAccount() AccountHandle {
+	return func(session *service.Session) *Account {
+		return &Account{Platform: &Platform{Session: session}}
+	}
+}

app/api/controller/auth/base.go

@@ -0,0 +1,60 @@
+package auth
+
+import (
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+)
+
+type (
+	// Tree 权限信息
+	Tree struct {
+		*model2.SysAuth
+		KindTitle string  `json:"kind_title"`
+		Children  []*Tree `json:"children"`
+	}
+	// TreeRole 角色权限信息
+	TreeRole struct {
+		*model2.SysAuth
+		KindTitle string      `json:"kind_title"`
+		Checked   bool        `json:"checked"`
+		Children  []*TreeRole `json:"children"`
+	}
+	// TreeChecked 角色选中状态
+	TreeChecked struct {
+		*model2.SysAuth
+		Checked  bool           `json:"checked"`
+		Children []*TreeChecked `json:"children"`
+	}
+)
+
+// tree 树状筛选
+func tree(src []*model2.SysAuth, parentID uint64) []*Tree {
+	out := make([]*Tree, 0)
+
+	for _, v := range src {
+		if v.ParentID == parentID {
+			out = append(out, &Tree{
+				SysAuth:   v,
+				KindTitle: v.KindTitle(),
+				Children:  tree(src, v.ID),
+			})
+		}
+	}
+	return out
+}
+
+// TreeCheckedFunc 树状筛选
+func TreeCheckedFunc(src []*model.SysAuthScene, parentID uint64) []*TreeChecked {
+	out := make([]*TreeChecked, 0)
+
+	for _, v := range src {
+		if v.ParentID == parentID {
+			out = append(out, &TreeChecked{
+				SysAuth:  v.SysAuth,
+				Checked:  v.SceneID > 0,
+				Children: TreeCheckedFunc(src, v.ID),
+			})
+		}
+	}
+	return out
+}

app/api/controller/auth/instance.go

@@ -0,0 +1,34 @@
+package auth
+
+import (
+	"SciencesServer/app/api/controller"
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+)
+
+type Instance struct{ *controller.Platform }
+
+type InstanceHandle func(session *service.Session) *Instance
+
+// List 列表信息
+func (c *Instance) List() ([]*Tree, error) {
+	mSysAuth := model.NewSysAuth()
+
+	where := []*model2.ModelWhereOrder{
+		&model2.ModelWhereOrder{Order: model2.NewOrder("parent_id", model2.OrderModeToAsc)},
+		&model2.ModelWhereOrder{Order: model2.NewOrder("sort", model2.OrderModeToDesc)},
+	}
+	out := make([]*model2.SysAuth, 0)
+
+	if err := model2.Scan(mSysAuth, &out, where...); err != nil {
+		return nil, err
+	}
+	return tree(out, 0), nil
+}
+
+func NewInstance() InstanceHandle {
+	return func(session *service.Session) *Instance {
+		return &Instance{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/controller/base.go

@@ -0,0 +1,38 @@
+package controller
+
+import (
+	"SciencesServer/app/service"
+	"SciencesServer/config"
+	"SciencesServer/serve/cache"
+	"SciencesServer/utils"
+)
+
+// Platform
+type Platform struct{ *service.Session }
+
+func (c *Platform) Format() string {
+	return c.TenantKey
+}
+
+// ReturnPages 分页数据
+type ReturnPages struct {
+	Page       int         `json:"page"`
+	Data       interface{} `json:"data"`
+	TotalCount int64       `json:"total_count"`
+}
+
+type Key struct{}
+
+// Generate 生成秘钥
+func (*Key) Generate(len int) string {
+	key := utils.GetRandomString(len)
+	for {
+		isExist, _ := cache.Cache.SIsMember(config.RedisKeyForTenantKeys, key)
+
+		if !isExist {
+			_ = cache.Cache.SAdd(config.RedisKeyForTenantKeys, key)
+			return key
+		}
+		key = utils.GetRandomString(len)
+	}
+}

app/api/controller/config.go

@@ -0,0 +1,64 @@
+package controller
+
+import (
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/config"
+	"SciencesServer/serve/orm"
+	"errors"
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Config struct{}
+
+type ConfigHandle func() *Config
+
+func (c *Config) Config(kind, page, pageSize int) (*ReturnPages, error) {
+	mSysConfig := model.NewSysConfig()
+
+	where := []*model2.ModelWhereOrder{
+		&model2.ModelWhereOrder{Order: model2.NewOrder("kind", model2.OrderModeToAsc)},
+	}
+	if kind > 0 {
+		where = append(where, &model2.ModelWhereOrder{Where: model2.NewWhere("kind", kind)})
+	}
+	out := make([]*model2.SysConfig, 0)
+
+	var count int64
+
+	if err := model2.Pages(mSysConfig.SysConfig, &out, page, pageSize, &count, where...); err != nil {
+		return nil, err
+	}
+	return &ReturnPages{Data: out, Page: page, TotalCount: count}, nil
+}
+
+func (c *Config) Form(params map[string]interface{}) error {
+	if len(params) <= 0 {
+		return nil
+	}
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		mSysConfig := model.NewSysConfig()
+		now := time.Now()
+
+		for k, v := range params {
+			if _, has := config.SystemConfig[k]; !has {
+				return errors.New("UnKnown Config Key ：" + k)
+			}
+			if err := model2.UpdatesWhere(mSysConfig.SysConfig, map[string]interface{}{
+				"value": v, "updated_at": now,
+			}, []*model2.ModelWhere{model2.NewWhere("key", k)}, tx); err != nil {
+				return err
+			}
+			config.SystemConfig[k] = v
+		}
+		return nil
+	})
+}
+
+func NewConfig() ConfigHandle {
+	return func() *Config {
+		return &Config{}
+	}
+}

app/api/controller/department.go

@@ -0,0 +1,98 @@
+package controller
+
+import (
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"time"
+)
+
+type Department struct{ *Platform }
+
+type DepartmentHandle func(session *service.Session) *Department
+
+type DepartmentParams struct {
+	ID, ParentID                uint64
+	Title, Name, Mobile, Remark string
+}
+
+type DepartmentTree struct {
+	*model2.SysDepartment
+	Children []*DepartmentTree `json:"children"`
+}
+
+func (c *Department) tree(src []*model2.SysDepartment, parentID uint64) []*DepartmentTree {
+	out := make([]*DepartmentTree, 0)
+
+	for _, v := range src {
+		if v.ParentID == parentID {
+			out = append(out, &DepartmentTree{
+				SysDepartment: v,
+				Children:      c.tree(src, v.ID),
+			})
+		}
+	}
+	return out
+}
+
+func (c *Department) List() ([]*DepartmentTree, error) {
+	mSysDepartment := model.NewSysDepartment()
+
+	out := make([]*model2.SysDepartment, 0)
+
+	if err := model2.Scan(mSysDepartment.SysDepartment, &out, &model2.ModelWhereOrder{
+		Where: model2.NewWhere("tenant_id", c.TenantID),
+		Order: model2.NewOrder("parent_id", model2.OrderModeToAsc)}); err != nil {
+		return nil, err
+	}
+	return c.tree(out, 0), nil
+}
+
+func (c *Department) Select() ([]*DepartmentTree, error) {
+	mSysDepartment := model.NewSysDepartment()
+
+	out := make([]*model2.SysDepartment, 0)
+
+	if err := model2.ScanFields(mSysDepartment.SysDepartment, &out, []string{"id", "name"}, &model2.ModelWhereOrder{
+		Where: model2.NewWhere("tenant_id", c.TenantID),
+		Order: model2.NewOrder("parent_id", model2.OrderModeToAsc)}); err != nil {
+		return nil, err
+	}
+	return c.tree(out, 0), nil
+}
+
+func (c *Department) Data(params *DepartmentParams) error {
+	mSysDepartment := model.NewSysDepartment()
+
+	if params.ID <= 0 {
+		mSysDepartment.ParentID = params.ParentID
+		mSysDepartment.Title = params.Title
+		mSysDepartment.Name = params.Name
+		mSysDepartment.Mobile = params.Mobile
+		mSysDepartment.Remark = params.Remark
+
+		return model2.Create(mSysDepartment.SysDepartment)
+	}
+	mSysDepartment.ID = params.ID
+
+	return model2.Updates(mSysDepartment.SysDepartment, map[string]interface{}{
+		"parent_id": params.ParentID, "title": params.Title, "name": params.Name,
+		"mobile": params.Mobile, "remark": params.Remark, "updated_at": time.Now(),
+	})
+}
+
+func (c *Department) Delete(id uint64) error {
+	mSysDepartment := model.NewSysDepartment()
+	mSysDepartment.ID = id
+
+	if err := model2.Delete(mSysDepartment.SysDepartment); err != nil {
+		return err
+	}
+	return nil
+}
+
+func NewDepartment() DepartmentHandle {
+	return func(session *service.Session) *Department {
+		return &Department{Platform: &Platform{Session: session}}
+	}
+}

app/api/controller/logs.go

@@ -0,0 +1,57 @@
+package controller
+
+import (
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"SciencesServer/tools/ip"
+)
+
+type Log struct{ *Platform }
+
+type LogHandle func(session *service.Session) *Log
+
+type (
+	// LogForLogin 登录日志
+	LogForLogin struct {
+		*model.SysUserLoginLogInfo
+		IPAddress string `json:"ip_address"`
+	}
+)
+
+// Login 登录日志
+func (c *Log) Login(name string, page, pageSize int) (*ReturnPages, error) {
+	mSysUserLoginLogs := model.NewSysUserLoginLog()
+
+	where := make([]*model2.ModelWhere, 0)
+
+	if c.TenantID > 0 {
+		where = append(where, model2.NewWhere("l.tenant_id", c.TenantID))
+	}
+	if name != "" {
+		where = append(where, model2.NewWhereLike("u.name", name))
+	}
+	var count int64
+
+	out, err := mSysUserLoginLogs.Logs(page, pageSize, &count, where...)
+
+	if err != nil {
+		return nil, err
+	}
+	list := make([]*LogForLogin, 0)
+
+	for _, v := range out {
+		ipAddress, _ := ip.Find(v.IP)
+
+		list = append(list, &LogForLogin{
+			SysUserLoginLogInfo: v, IPAddress: string(ipAddress),
+		})
+	}
+	return &ReturnPages{Data: list, Page: page, TotalCount: count}, nil
+}
+
+func NewLog() LogHandle {
+	return func(session *service.Session) *Log {
+		return &Log{Platform: &Platform{Session: session}}
+	}
+}

app/api/controller/menu/base.go

@@ -0,0 +1,97 @@
+package menu
+
+import (
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+)
+
+type (
+	Tree struct {
+		*model2.SysMenu
+		Children []*Tree `json:"children"`
+	}
+	TreeChecked struct {
+		*model2.SysMenuBasic
+		Checked  bool           `json:"checked"`
+		Children []*TreeChecked `json:"children"`
+	}
+)
+
+// tree 树状筛选
+func tree(src []*model2.SysMenu, parentID uint64) []*Tree {
+	out := make([]*Tree, 0)
+
+	for _, v := range src {
+		if v.ParentID == parentID {
+			out = append(out, &Tree{
+				SysMenu:  v,
+				Children: tree(src, v.ID),
+			})
+		}
+	}
+	return out
+}
+
+// TreeCheckedFunc 树状筛选
+func TreeCheckedFunc(src []*model.SysMenuScene, parentID uint64) []*TreeChecked {
+	out := make([]*TreeChecked, 0)
+
+	for _, v := range src {
+		if v.ParentID == parentID {
+			out = append(out, &TreeChecked{
+				SysMenuBasic: v.SysMenuBasic,
+				Checked:      v.SceneID > 0,
+				Children:     TreeCheckedFunc(src, v.ID),
+			})
+		}
+	}
+	return out
+}
+
+// menuForSystem 系统管理员菜单
+func menuForSystem(iModel model2.IModel, where ...*model2.ModelWhere) ([]*Tree, error) {
+	out, err := iModel.(*model.SysMenu).SystemMenu(where...)
+
+	if err != nil {
+		return nil, err
+	}
+	return tree(out, 0), nil
+}
+
+// MenuForSystem 系统管理员菜单
+func MenuForSystem(iModel model2.IModel, where ...*model2.ModelWhere) ([]*Tree, error) {
+	out, err := iModel.(*model.SysMenu).SystemMenu(where...)
+
+	if err != nil {
+		return nil, err
+	}
+	return tree(out, 0), nil
+}
+
+// MenuForTenant 租户人员菜单
+func MenuForTenant(iModel model2.IModel, tenantID uint64) ([]*TreeChecked, error) {
+	out, err := iModel.(*model.SysMenu).TenantMenu(tenantID)
+
+	if err != nil {
+		return nil, err
+	}
+	return TreeCheckedFunc(out, 0), nil
+}
+
+func MenuForRole(iModel model2.IModel, tenantID uint64, roleID uint64) ([]*TreeChecked, error) {
+	out, err := iModel.(*model.SysMenu).RoleMenu(tenantID, roleID)
+
+	if err != nil {
+		return nil, err
+	}
+	return TreeCheckedFunc(out, 0), nil
+}
+
+// MenuForUser 当前用户菜单
+func MenuForUser(iModel model2.IModel, tenantID uint64, uid uint64) ([]*TreeChecked, error) {
+	out, err := iModel.(*model.SysMenu).UserMenu(tenantID, uid)
+	if err != nil {
+		return nil, err
+	}
+	return TreeCheckedFunc(out, 0), nil
+}

app/api/controller/menu/menu.go

@@ -0,0 +1,113 @@
+package menu
+
+import (
+	"SciencesServer/app/api/controller"
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"errors"
+	"time"
+)
+
+// Instance 菜单管理
+type Instance struct{ *controller.Platform }
+
+type InstanceHandle func(session *service.Session) *Instance
+
+type (
+	// InstanceParams 菜单参数
+	InstanceParams struct {
+		ID, ParentID                uint64
+		Kind, Auth                  int
+		Name, Link, Component, Icon string
+		Sort, Status                int
+		Remark                      string
+	}
+)
+
+// List 列表信息
+func (c *Instance) List() ([]*Tree, error) {
+	mSysMenu := model.NewSysMenu()
+
+	auth := []model2.SysMenuAuth{model2.SysMenuAuthForOrdinary}
+
+	if c.IsAdmin {
+		auth = append(auth, model2.SysMenuAuthForSystem)
+	}
+	return menuForSystem(mSysMenu, model2.NewWhereIn("auth", auth))
+}
+
+// Form 数据操作
+func (c *Instance) Form(params *InstanceParams) error {
+	if params.ID <= 0 {
+		return model2.Create(&model2.SysMenu{
+			SysMenuBasic: model2.SysMenuBasic{
+				ParentID:  params.ParentID,
+				Name:      params.Name,
+				Kind:      model2.SysMenuKind(params.Kind),
+				Link:      params.Link,
+				Component: params.Component,
+				Icon:      params.Icon,
+			},
+			Auth:   model2.SysMenuAuth(params.Auth),
+			Sort:   params.Sort,
+			Status: model2.SysMenuStatusForNormal,
+			Remark: params.Remark,
+		})
+	}
+	out := model.NewSysMenu()
+	out.ID = params.ID
+
+	isExist, err := model2.FirstWhere(out.SysMenu)
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("菜单信息不存在")
+	}
+	out.ParentID = params.ParentID
+	out.Name = params.Name
+	out.Kind = model2.SysMenuKind(params.Kind)
+	out.Link = params.Link
+	out.Component = params.Component
+	out.Icon = params.Icon
+	out.Auth = model2.SysMenuAuth(params.Auth)
+	out.Sort = params.Sort
+	out.Status = model2.SysMenuStatus(params.Status)
+	out.Remark = params.Remark
+
+	if err = model2.Save(out); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Status 状态操作
+func (c *Instance) Status(id uint64, status int) error {
+	mSysMenu := model.NewSysMenu()
+	mSysMenu.ID = id
+
+	if err := model2.Updates(mSysMenu.SysMenu, map[string]interface{}{
+		"status": status, "updated_at": time.Now(),
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Delete 删除操作
+func (c *Instance) Delete(id uint64) error {
+	mSysMenu := model.NewSysMenu()
+	mSysMenu.ID = id
+
+	if err := model2.Delete(mSysMenu.SysMenu); err != nil {
+		return err
+	}
+	return nil
+}
+
+func NewInstance() InstanceHandle {
+	return func(session *service.Session) *Instance {
+		return &Instance{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/controller/role/auth.go

@@ -0,0 +1,88 @@
+package role
+
+import (
+	"SciencesServer/app/api/controller"
+	auth2 "SciencesServer/app/api/controller/auth"
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"SciencesServer/serve/logger"
+	"SciencesServer/serve/orm"
+	"SciencesServer/utils"
+
+	"gorm.io/gorm"
+)
+
+type Auth struct{ *controller.Platform }
+
+type AuthHandle func(session *service.Session) *Auth
+
+// List 角色权限列表
+func (c *Auth) List(roleID uint64) ([]*auth2.TreeChecked, error) {
+	mSysAuth := model.NewSysAuth()
+
+	out, err := mSysAuth.RoleAuth(c.TenantID, roleID)
+
+	if err != nil {
+		return nil, err
+	}
+	return auth2.TreeCheckedFunc(out, 0), nil
+}
+
+// Bind 角色权限绑定
+func (c *Auth) Bind(roleID uint64, authIDs []uint64) error {
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		mSysRoleAuth := model.NewSysRoleAuth()
+
+		err := model2.DeleteWhere(mSysRoleAuth.SysRoleAuth, []*model2.ModelWhere{model2.NewWhere("role_id", roleID)}, tx)
+
+		if err != nil {
+			return err
+		}
+		// 查询权限信息
+		mSysAuth := model.NewSysAuth()
+
+		auths := make([]*model2.SysAuth, 0)
+
+		if err = model2.Find(mSysAuth.SysAuth, &auths, &model2.ModelWhereOrder{Where: model2.NewWhereIn("id", authIDs)}); err != nil {
+			return err
+		}
+		authRequests := make([]*service.AuthRequest, 0)
+
+		roles := make([]*model2.SysRoleAuth, 0)
+
+		for _, v := range auths {
+			roles = append(roles, &model2.SysRoleAuth{
+				ModelTenant: model2.ModelTenant{TenantID: c.TenantID}, RoleID: roleID, AuthID: v.ID,
+			})
+			if v.Auth == "" {
+				continue
+			}
+			authRequests = append(authRequests, &service.AuthRequest{Url: v.Auth, Method: "*"})
+		}
+		if err = model2.Creates(mSysRoleAuth.SysRoleAuth, roles, tx); err != nil {
+			return err
+		}
+		go utils.TryCatch(func() {
+			permission := service.NewPermission([]string{utils.UintToString(roleID)}, authRequests...)(c.TenantKey, "")
+			// 删除角色权限
+			if _, err = permission.RemoveRolePolicy(); err != nil {
+				logger.ErrorF("删除角色【%d】规则信息错误：%v", roleID, err)
+				return
+			}
+			if len(authRequests) > 0 {
+				if _, err = permission.AddPolicies(); err != nil {
+					logger.ErrorF("创建角色【%d】规则信息错误：%v", roleID, err)
+					return
+				}
+			}
+		})
+		return nil
+	})
+}
+
+func NewAuth() AuthHandle {
+	return func(session *service.Session) *Auth {
+		return &Auth{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/controller/role/instance.go

@@ -0,0 +1,174 @@
+package role
+
+import (
+	"SciencesServer/app/api/controller"
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"SciencesServer/serve/logger"
+	"SciencesServer/utils"
+	"errors"
+	"time"
+)
+
+type Instance struct{ *controller.Platform }
+
+type InstanceHandle func(session *service.Session) *Instance
+
+type (
+	// InstanceInfo 角色信息
+	InstanceInfo struct {
+		*model2.SysRole
+		StatusTitle string `json:"status_title"`
+	}
+	// InstanceBasicInfo 角色基本信息
+	InstanceBasicInfo struct {
+		ID   uint64 `json:"id"`
+		Name string `json:"name"`
+	}
+)
+
+// List 列表信息
+func (c *Instance) List(name string, status, page, pageSize int) (*controller.ReturnPages, error) {
+	mSysRole := model.NewSysRole()
+
+	where := []*model2.ModelWhereOrder{
+		&model2.ModelWhereOrder{
+			Where: model2.NewWhere("tenant_id", c.TenantID),
+			Order: model2.NewOrder("sort", model2.OrderModeToDesc),
+		},
+		&model2.ModelWhereOrder{
+			Order: model2.NewOrder("id", model2.OrderModeToDesc),
+		},
+	}
+	if name != "" {
+		where = append(where, &model2.ModelWhereOrder{
+			Where: model2.NewWhere("tenant_id", c.TenantID),
+		})
+	}
+	if status > 0 {
+		where = append(where, &model2.ModelWhereOrder{
+			Where: model2.NewWhere("status", status),
+		})
+	}
+	var count int64
+
+	out := make([]*model2.SysRole, 0)
+
+	if err := model2.Pages(mSysRole.SysRole, &out, page, pageSize, &count, where...); err != nil {
+		return nil, err
+	}
+	list := make([]*InstanceInfo, 0)
+
+	for _, v := range out {
+		list = append(list, &InstanceInfo{SysRole: v, StatusTitle: v.StatusTitle()})
+	}
+	return &controller.ReturnPages{Data: list, Page: page, TotalCount: count}, nil
+
+}
+
+// Select 筛选信息
+func (c *Instance) Select() ([]*InstanceBasicInfo, error) {
+	mSysRole := model.NewSysRole()
+
+	where := []*model2.ModelWhereOrder{
+		&model2.ModelWhereOrder{
+			Where: model2.NewWhere("tenant_id", c.TenantID),
+			Order: model2.NewOrder("sort", model2.OrderModeToDesc),
+		},
+		&model2.ModelWhereOrder{
+			Where: model2.NewWhere("status", model2.SysRoleStatusForNormal),
+			Order: model2.NewOrder("id", model2.OrderModeToDesc),
+		},
+	}
+	out := make([]*InstanceBasicInfo, 0)
+
+	if err := model2.Scan(mSysRole.SysRole, &out, where...); err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Data 数据操作
+func (c *Instance) Data(id uint64, name, remark string, sort int) error {
+	mSysRole := model.NewSysRole()
+
+	if id <= 0 {
+		mSysRole.TenantID = c.TenantID
+		mSysRole.Name = name
+		mSysRole.Remark = remark
+		mSysRole.Sort = sort
+		mSysRole.Status = model2.SysRoleStatusForNormal
+
+		if err := model2.Create(mSysRole.SysRole); err != nil {
+			return err
+		}
+		return nil
+	}
+	mSysRole.ID = id
+
+	if err := model2.Updates(mSysRole.SysRole, map[string]interface{}{
+		"name": name, "remark": remark, "sort": sort,
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Status 状态操作
+func (c *Instance) Status(id uint64, status int) error {
+	mSysRole := model.NewSysRole()
+	mSysRole.ID = id
+
+	isExist, err := model2.FirstWhere(mSysRole.SysRole)
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("角色不存在")
+	}
+	if c.TenantID > 0 && c.TenantID != mSysRole.TenantID {
+		return errors.New("不可操作其他租户角色")
+	}
+	if err = model2.Updates(mSysRole.SysRole, map[string]interface{}{
+		"status": status, "updated_at": time.Now(),
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Delete 删除操作
+func (c *Instance) Delete(id uint64) error {
+	mSysRole := model.NewSysRole()
+	mSysRole.ID = id
+
+	isExist, err := model2.FirstWhere(mSysRole.SysRole)
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("角色不存在")
+	}
+	if c.TenantID > 0 && c.TenantID != mSysRole.TenantID {
+		return errors.New("不可删除其他租户角色")
+	}
+	if err = model2.Delete(mSysRole.SysRole); err != nil {
+		return err
+	}
+	go utils.TryCatch(func() {
+		permission := service.NewPermission([]string{utils.UintToString(id)})(c.TenantKey, "")
+		// 删除角色权限
+		if _, err = permission.RemoveRolePolicy(); err != nil {
+			logger.ErrorF("删除租户【%s】下角色【%d】权限信息错误：%v", c.TenantKey, id, err)
+			return
+		}
+	})
+	return nil
+}
+
+func NewInstance() InstanceHandle {
+	return func(session *service.Session) *Instance {
+		return &Instance{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/controller/role/menu.go

@@ -0,0 +1,74 @@
+package role
+
+import (
+	"SciencesServer/app/api/controller"
+	menu2 "SciencesServer/app/api/controller/menu"
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"SciencesServer/serve/orm"
+	"errors"
+
+	"gorm.io/gorm"
+)
+
+type Menu struct{ *controller.Platform }
+
+type MenuHandle func(session *service.Session) *Menu
+
+// List 菜单列表
+func (c *Menu) List(roleID uint64) ([]*menu2.TreeChecked, error) {
+	mSysMenu := model.NewSysMenu()
+	return menu2.MenuForRole(mSysMenu, c.TenantID, roleID)
+}
+
+// Bind 绑定菜单
+func (c *Menu) Bind(roleID uint64, menuIDs []uint64) error {
+	if len(menuIDs) > 0 {
+		var count int64
+
+		mSysMenu := model.NewSysMenu()
+
+		if err := model2.Count(mSysMenu.SysMenu, &count, model2.NewWhereIn("id", menuIDs),
+			model2.NewWhere("auth", model2.SysMenuAuthForSystem)); err != nil {
+			return err
+		} else if count > 0 {
+			return errors.New("不可设置超管菜单")
+		}
+	}
+	mSysRoleMenu := model.NewSysRoleMenu()
+
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		err := model2.DeleteWhere(mSysRoleMenu.SysRoleMenu, []*model2.ModelWhere{model2.NewWhere("role_id", roleID)}, tx)
+
+		if err != nil {
+			return err
+		}
+		if len(menuIDs) <= 0 {
+			return nil
+		}
+		menus := make([]*model2.SysRoleMenu, 0)
+
+		mark := make(map[uint64]uint64, 0)
+
+		for _, v := range menuIDs {
+			if _, has := mark[v]; has {
+				continue
+			}
+			menus = append(menus, &model2.SysRoleMenu{
+				ModelTenant: model2.ModelTenant{TenantID: c.TenantID}, RoleID: roleID, MenuID: v,
+			})
+			mark[v] = v
+		}
+		if err = model2.Creates(mSysRoleMenu.SysRoleMenu, menus, tx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func NewMenu() MenuHandle {
+	return func(session *service.Session) *Menu {
+		return &Menu{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/controller/role/user.go

@@ -0,0 +1,81 @@
+package role
+
+import (
+	"SciencesServer/app/api/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/serve/logger"
+
+	"SciencesServer/app/api/model"
+	"SciencesServer/app/service"
+	"SciencesServer/serve/orm"
+	"SciencesServer/utils"
+
+	"gorm.io/gorm"
+)
+
+type User struct{ *controller.Platform }
+
+type UserHandle func(session *service.Session) *User
+
+// List 列表信息
+func (c *User) List(uid uint64) ([]*model.SysRoleUserInfo, error) {
+	mSysRole := model.NewSysRole()
+
+	out, err := mSysRole.UserRole(uid)
+
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Bind 绑定角色
+func (c *User) Bind(uid uint64, roleIDs []uint64) error {
+	mSysUserRole := model.NewSysUserRole()
+
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		err := model2.DeleteWhere(mSysUserRole.SysUserRole, []*model2.ModelWhere{model2.NewWhere("uid", uid)}, tx)
+
+		if err != nil {
+			return err
+		}
+		roles := make([]*model2.SysUserRole, 0)
+		obj := make([]string, 0)
+
+		mark := make(map[uint64]uint64, 0)
+
+		for _, v := range roleIDs {
+			if _, has := mark[v]; has {
+				continue
+			}
+			obj = append(obj, utils.UintToString(v))
+
+			roles = append(roles, &model2.SysUserRole{
+				UID: uid, RoleID: v,
+			})
+			mark[v] = v
+		}
+		if err = model2.Creates(mSysUserRole.SysUserRole, roles, tx); err != nil {
+			return err
+		}
+		go utils.TryCatch(func() {
+			permission := service.NewPermission(obj)(c.TenantKey, utils.UintToString(uid))
+
+			if _, err = permission.DeleteRolesForUser(false); err != nil {
+				logger.ErrorF("删除用户【%d】角色权限错误：%v", uid, err)
+				return
+			}
+			if _, err = permission.AddRoleForUser(); err != nil {
+				logger.ErrorF("添加用户【%d】角色权限错误：%v", uid, err)
+				return
+			}
+		})
+		return nil
+	})
+}
+
+func NewUser() UserHandle {
+	return func(session *service.Session) *User {
+		return &User{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/controller/tenant/auth.go

@@ -0,0 +1,107 @@
+package tenant
+
+import (
+	"SciencesServer/app/api/controller"
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"SciencesServer/serve/logger"
+	"SciencesServer/serve/orm"
+	"SciencesServer/utils"
+	"errors"
+
+	"gorm.io/gorm"
+)
+
+type Auth struct{ *controller.Platform }
+
+type AuthHandle func(session *service.Session) *Auth
+
+// delete 删除所有权限
+func (c *Auth) delete(tenantID uint64, tenantKey string, tx *gorm.DB) error {
+	mSysRoleAuth := model.NewSysRoleAuth()
+
+	err := model2.DeleteWhere(mSysRoleAuth.SysRoleAuth, []*model2.ModelWhere{model2.NewWhere("tenant_id", tenantID)}, tx)
+
+	if err != nil {
+		return err
+	}
+	go utils.TryCatch(func() {
+		permission := service.NewPermission(nil)(tenantKey, "")
+
+		if succ, err := permission.RemoveFilteredGroupingPolicy(); err != nil {
+			logger.ErrorF("删除租户【%s】权限信息错误：%v", tenantKey, err)
+		} else if !succ {
+			logger.ErrorF("删除租户【%s】权限信息失败", tenantKey)
+		}
+	})
+	return nil
+}
+
+// revoke 撤销某些权限
+func (c *Auth) revoke(tenantID uint64, tenantKey string, authIDs []uint64, tx *gorm.DB) error {
+	// 查询该租户下不含有的权限信息
+	mSysRuleAuth := model.NewSysRoleAuth()
+
+	out, err := mSysRuleAuth.Auths(model2.NewWhere("r.tenant_id", tenantID), model2.NewWhereNotIn("r_a.auth_id", authIDs))
+
+	if err != nil {
+		return err
+	}
+	if len(out) <= 0 {
+		return nil
+	}
+	roleAuthIDs := make([]uint64, 0)
+	roleIDs := make([]string, 0)
+	auths := make([]*service.AuthRequest, 0)
+
+	for _, v := range out {
+		roleAuthIDs = append(roleAuthIDs, v.ID)
+		roleIDs = append(roleIDs, utils.UintToString(v.RoleID))
+		auths = append(auths, &service.AuthRequest{Url: v.Auth, Method: "*"})
+	}
+	if err = model2.DeleteWhere(mSysRuleAuth.SysRoleAuth, []*model2.ModelWhere{model2.NewWhereIn("id", roleAuthIDs)}); err != nil {
+		return err
+	}
+	go utils.TryCatch(func() {
+		permission := service.NewPermission(roleIDs, auths...)(c.TenantKey, "")
+		// 删除角色权限
+		if _, err = permission.RemoveNamedGroupingPolicies(); err != nil {
+			logger.ErrorF("删除租户【%s】下角色权限错误：%v", tenantKey, err)
+			return
+		}
+	})
+	return nil
+}
+
+// Bind 绑定权限
+func (c *Auth) Bind(tenantID uint64, authIDs []uint64) error {
+	mSysTenant := model.NewSysTenant()
+	mSysTenant.ID = tenantID
+
+	isExist, err := model2.FirstField(mSysTenant.SysTenant, []string{"id", "key"})
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("租户/公司信息不存在或已被删除")
+	}
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		mSysTenantAuth := model.NewSysTenantAuth()
+
+		if err = model2.DeleteWhere(mSysTenantAuth.SysTenantAuth, []*model2.ModelWhere{model2.NewWhere("tenant_id", mSysTenant.ID)}, tx); err != nil {
+			return err
+		}
+		if len(authIDs) <= 0 {
+			// 删除租户下所有角色的权限
+			return c.delete(mSysTenant.ID, mSysTenant.Key, tx)
+		}
+		return c.revoke(mSysTenant.ID, mSysTenant.Key, authIDs, tx)
+	})
+}
+
+func NewAuth() AuthHandle {
+	return func(session *service.Session) *Auth {
+		return &Auth{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/controller/tenant/instance.go

@@ -0,0 +1,450 @@
+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/service"
+	"SciencesServer/config"
+	"SciencesServer/serve/orm"
+	"SciencesServer/utils"
+	"errors"
+	"fmt"
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Instance struct{ *controller.Platform }
+
+type InstanceHandle func(session *service.Session) *Instance
+
+type (
+	// InstanceInfo 租户信息
+	InstanceInfo struct {
+		*model.SysTenantInfo
+		Config *model2.SysTenantConfig `json:"config"`
+	}
+	// InstanceParams 租户参数信息
+	InstanceParams struct {
+		ID                                        uint64
+		Image, Name, Account, Password, RepeatPwd string
+		Deadline, Remark                          string
+	}
+	// InstanceBasicInfo 租户基本信息
+	InstanceBasicInfo struct {
+		ID   uint64 `json:"id"`
+		Name string `json:"name"`
+	}
+	// InstanceDetailType 租户信息类型
+	InstanceDetailType int
+)
+
+const (
+	// InstanceDetailTypeForBasic 基本信息
+	InstanceDetailTypeForBasic InstanceDetailType = iota + 1
+	// InstanceDetailTypeForMember 成员信息
+	InstanceDetailTypeForMember
+	// InstanceDetailTypeForAuth 权限信息
+	InstanceDetailTypeForAuth
+)
+
+// instanceDetailGetHandle 详细信息获取操作
+var instanceDetailGetHandle = map[InstanceDetailType]func(id uint64) func(args ...interface{}) (interface{}, error){
+	InstanceDetailTypeForBasic:  basic,
+	InstanceDetailTypeForMember: member,
+	InstanceDetailTypeForAuth:   auth,
+}
+
+// basic 基本信息
+func basic(id uint64) func(args ...interface{}) (interface{}, error) {
+	return func(args ...interface{}) (interface{}, error) {
+		mSysTenant := model.NewSysTenant()
+		mSysTenant.ID = id
+		isExist, err := model2.FirstWhere(mSysTenant.SysTenant)
+
+		if err != nil {
+			return nil, err
+		} else if !isExist {
+			return nil, errors.New("信息不存在")
+		}
+		return &InstanceInfo{SysTenantInfo: &model.SysTenantInfo{
+			SysTenant: mSysTenant.SysTenant,
+		}, Config: mSysTenant.ConfigInfo()}, nil
+	}
+}
+
+// member 人员信息
+func member(id uint64) func(args ...interface{}) (interface{}, error) {
+	return func(args ...interface{}) (interface{}, error) {
+		mSysUserTenant := model.NewSysUserTenant()
+
+		page := args[0].(int)
+		pageSize := args[1].(int)
+
+		where := []*model2.ModelWhere{model2.NewWhere("u_t.tenant_id", id)}
+
+		if args[2] != nil && args[2] != "" {
+			where = append(where, model2.NewWhereLike("u.name", args[2]))
+		}
+		if args[3] != nil && args[3].(int) > 0 {
+			where = append(where, model2.NewWhere("u_t.status", args[3]))
+		}
+		var count int64
+
+		out, err := mSysUserTenant.Member(page, pageSize, &count, where...)
+
+		if err != nil {
+			return nil, err
+		}
+		return &controller.ReturnPages{Data: out, Page: page, TotalCount: count}, nil
+	}
+}
+
+// auth 权限信息
+func auth(id uint64) func(args ...interface{}) (interface{}, error) {
+	return func(args ...interface{}) (interface{}, error) {
+		mSysMenu := model.NewSysMenu()
+
+		_menu, err := mSysMenu.TenantMenu(id)
+
+		if err != nil {
+			return nil, err
+		}
+		mSysAuth := model.NewSysAuth()
+
+		_auth := make([]*model.SysAuthScene, 0)
+
+		if _auth, err = mSysAuth.TenantAuth(id); err != nil {
+			return nil, err
+		}
+		return map[string]interface{}{
+			"menu": menu2.TreeCheckedFunc(_menu, 0), "auth": auth2.TreeCheckedFunc(_auth, 0),
+		}, nil
+	}
+}
+
+// validateForCustomerCount 验证最大客户数
+func (c *Instance) validateForCustomerCount(tenantID uint64, sysValue, srcValue int) (bool, error) {
+	if srcValue > sysValue {
+		return true, nil
+	}
+	mSysTenant := model.NewSysTenant()
+
+	var count int64
+
+	if err := model2.Count(mSysTenant.SysTenant, &count, model2.NewWhere("parent_id", tenantID)); err != nil {
+		return false, err
+	}
+	return int(count) <= srcValue, nil
+}
+
+// List 列表信息
+func (c *Instance) List(name string, status, page, pageSize int) (*controller.ReturnPages, error) {
+	mSysTenant := model.NewSysTenant()
+
+	var count int64
+
+	where := []*model2.ModelWhere{model2.NewWhere("t.parent_id", 0)}
+
+	if name != "" {
+		where = append(where, model2.NewWhereLike("t.name", name))
+	}
+	if status > 0 {
+		where = append(where, model2.NewWhere("t.status", status))
+	}
+	out, err := mSysTenant.Tenants(page, pageSize, &count, where...)
+
+	if err != nil {
+		return nil, err
+	}
+	list := make([]*InstanceInfo, 0)
+
+	for _, v := range out {
+		v.Image.Image = v.Image.Analysis(config.SettingInfo.Domain)
+
+		list = append(list, &InstanceInfo{SysTenantInfo: v, Config: v.ConfigInfo()})
+	}
+	return &controller.ReturnPages{Data: list, Page: page, TotalCount: count}, nil
+}
+
+// Add 数据处理
+func (c *Instance) Add(params *InstanceParams) error {
+	mSysTenant := model.NewSysTenant()
+
+	if params.Password != params.RepeatPwd {
+		return errors.New("密码不一致")
+	}
+	isExist, err := model2.FirstWhere(mSysTenant.SysTenant, model2.NewWhere("name", params.Name))
+
+	if err != nil {
+		return err
+	} else if isExist {
+		return errors.New("该租户/公司名称已存在")
+	}
+	mSysUser := model.NewSysUser()
+
+	if isExist, err = model2.FirstWhere(mSysUser.SysUser, model2.NewWhere("account", params.Account)); err != nil {
+		return err
+	} else if isExist {
+		return errors.New("登录用户名已存在")
+	}
+	if err = orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		mSysTenant.Image.Image = params.Image
+		mSysTenant.Name = params.Name
+		mSysTenant.Config = utils.AnyToJSON(&model2.SysTenantConfig{MaxDevices: 0, MaxCustomer: 0, Protocol: 0})
+		mSysTenant.Deadline = utils.DateTimeToTime(params.Deadline + " 23:59:59")
+		mSysTenant.Remark = params.Remark
+
+		if err = model2.Create(mSysTenant.SysTenant, tx); err != nil {
+			return err
+		}
+		mSysUser.Name = mSysTenant.Name
+		mSysUser.Account = params.Account
+		mSysUser.Password = params.Password
+
+		if err = model2.Create(mSysUser.SysUser, tx); err != nil {
+			return err
+		}
+		mSysUserTenant := model.NewSysUserTenant()
+		mSysUserTenant.TenantID = mSysTenant.ID
+		mSysUserTenant.UID = mSysUser.UUID
+		mSysUserTenant.Identity = model2.SysUserTenantIdentityForSystemAdmin
+
+		if err = model2.Create(mSysUserTenant.SysUserTenant, tx); err != nil {
+			return err
+		}
+		return nil
+	}); err != nil {
+		return err
+	}
+	service.Publish(config.EventForRedisListProduce, config.RedisKeyForTenant, mSysTenant.Key)
+
+	return nil
+}
+
+// Edit 修改信息
+func (c *Instance) Edit(params *InstanceParams) error {
+	mSysTenant := model.NewSysTenant()
+	mSysTenant.ID = params.ID
+
+	isExist, err := model2.FirstWhere(mSysTenant.SysTenant)
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("租户/公司信息不存在")
+	} else if c.TenantID > 0 {
+		if mSysTenant.ParentID <= 0 {
+			return errors.New("不可修改其他租户/公司的信息")
+		} else if c.TenantID != mSysTenant.ParentID {
+			return errors.New("不可修改其他租户/公司的客户信息")
+		}
+	}
+	if mSysTenant.Name != params.Name {
+		if isExist, err = model2.FirstWhere(mSysTenant.SysTenant, model2.NewWhere("name", params.Name)); err != nil {
+			return err
+		} else if isExist {
+			return errors.New("该租户/公司名称已存在")
+		}
+	}
+	if err = model2.Updates(mSysTenant.SysTenant, map[string]interface{}{
+		"name": params.Name, "image": params.Image, "remark": params.Remark, "updated_at": time.Now(),
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+// EditPassword 修改信息
+func (c *Instance) EditPassword(params *InstanceParams) error {
+	mSysTenant := model.NewSysTenant()
+	mSysTenant.ID = params.ID
+
+	isExist, err := model2.FirstWhere(mSysTenant.SysTenant)
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("租户/公司信息不存在")
+	} else if c.TenantID > 0 {
+		if mSysTenant.ParentID <= 0 {
+			return errors.New("不可修改其他租户/公司的用户密码信息")
+		} else if c.TenantID != mSysTenant.ParentID {
+			return errors.New("不可修改其他租户/公司的用户密码信息")
+		}
+	}
+	if params.Password != params.RepeatPwd {
+		return errors.New("密码不一致")
+	}
+	// 查询该租户下管理员信息
+	mSysUserTenant := model.NewSysUserTenant()
+
+	if isExist, err = model2.FirstField(mSysUserTenant.SysUserTenant, []string{"id", "uid", "identity"},
+		model2.NewWhere("tenant_id", params.ID), model2.NewWhere("identity", model2.SysUserTenantIdentityForSystemAdmin)); err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("该租户/公司下管理员信息不存在或已被删除")
+	}
+	mSysUser := model.NewSysUser()
+	mSysUser.Password = params.Password
+	mSysUser.Pass()
+
+	if err = model2.UpdatesWhere(mSysUser.SysUser, map[string]interface{}{
+		"password": mSysUser.Password, "salt": mSysUser.Salt, "updated_at": time.Now(),
+	}, []*model2.ModelWhere{model2.NewWhere("uuid", mSysUserTenant.UID)}); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Detail 详细信息
+func (c *Instance) Detail(id uint64, tType InstanceDetailType, page, pageSize int, name string, status int) (interface{}, error) {
+	handle, has := instanceDetailGetHandle[tType]
+
+	if !has {
+		return nil, errors.New(fmt.Sprintf("Unknown Tenant Detail Type：%d", tType))
+	}
+	out, err := handle(id)(page, pageSize, name, status)
+
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Renewal 续期操作
+func (c *Instance) Renewal(id uint64, deadline string) error {
+	mSysTenant := model.NewSysTenant()
+	mSysTenant.ID = id
+
+	isExist, err := model2.FirstWhere(mSysTenant.SysTenant)
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("租户/公司信息不存在")
+	} else if c.TenantID > 0 {
+		if mSysTenant.ParentID <= 0 {
+			return errors.New("非超级管理员，不可操作")
+		} else if c.TenantID != mSysTenant.ParentID {
+			return errors.New("非法操作，不可续期他人客户使用期限")
+		}
+	}
+	now := time.Now()
+
+	updates := make(map[string]interface{}, 0)
+	updates["updated_at"] = now
+
+	_deadline := utils.DateTimeToTime(deadline + " 23:59:59")
+
+	if _deadline.Before(mSysTenant.Deadline) {
+		return errors.New("续期时间异常")
+	}
+	updates["deadline"] = _deadline
+
+	if mSysTenant.Status != model2.SysTenantStatusForNormal && _deadline.After(now) {
+		updates["status"] = model2.SysTenantStatusForNormal
+	}
+	if err = model2.Updates(mSysTenant.SysTenant, updates); err != nil {
+		return err
+	}
+	service.Publish(config.EventForRedisListProduce, config.RedisKeyForTenant, mSysTenant.Key)
+	return nil
+}
+
+// StartUp 启用处理
+func (c *Instance) StartUp(id uint64) error {
+	mSysTenant := model.NewSysTenant()
+	mSysTenant.ID = id
+
+	isExist, err := model2.FirstWhere(mSysTenant.SysTenant)
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("租户/公司/客户信息不存在")
+	} else if c.TenantID > 0 {
+		if mSysTenant.ParentID <= 0 {
+			return errors.New("非超级管理员，不可操作")
+		} else if c.TenantID != mSysTenant.ParentID {
+			return errors.New("不可启用其他租户/公司客户")
+		}
+	} else if mSysTenant.Status == model2.SysTenantStatusForNormal {
+		return errors.New("该租户/公司/客户已是启用状态")
+	}
+	status := model2.SysTenantStatusForNormal
+
+	now := time.Now()
+
+	if mSysTenant.Deadline.Before(now) {
+		status = model2.SysTenantStatusForExpired
+	}
+	if err = model2.Updates(mSysTenant.SysTenant, map[string]interface{}{
+		"status": status, "updated_at": now,
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Disable 禁用处理
+func (c *Instance) Disable(id uint64) error {
+	mSysTenant := model.NewSysTenant()
+	mSysTenant.ID = id
+
+	isExist, err := model2.FirstWhere(mSysTenant.SysTenant)
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("租户/公司/客户信息不存在")
+	} else if c.TenantID > 0 {
+		if mSysTenant.ParentID <= 0 {
+			return errors.New("非超级管理员，不可操作")
+		} else if c.TenantID != mSysTenant.ParentID {
+			return errors.New("不可启用其他租户/公司/客户")
+		}
+	} else if mSysTenant.Status == model2.SysTenantStatusForDisable {
+		return errors.New("该租户/公司/客户已是禁用状态")
+	}
+	if err = model2.Updates(mSysTenant.SysTenant, map[string]interface{}{
+		"status": model2.SysTenantStatusForDisable, "updated_at": time.Now(),
+	}); err != nil {
+		return err
+	}
+	// TODO：推送用户强制退出，并强行删除所有产品数据
+	service.Publish(config.EventForRedisListDestroy, config.RedisKeyForTenant, mSysTenant.Key)
+	return nil
+}
+
+// MemberBind 人员绑定/解绑
+func (c *Instance) MemberBind(id uint64, status int) error {
+	mSysUserTenant := model.NewSysUserTenant()
+	mSysUserTenant.ID = id
+
+	isExist, err := model2.FirstField(mSysUserTenant.SysUserTenant, []string{"id", "tenant_id", "identity"})
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("用户信息不存在")
+	}
+	if model2.SysUserTenantStatus(status) == mSysUserTenant.Status {
+		return errors.New("状态异常，不可操作")
+	}
+	if err := model2.Updates(mSysUserTenant.SysUserTenant, map[string]interface{}{
+		"status": status, "updated_at": time.Now(),
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+func NewInstance() InstanceHandle {
+	return func(session *service.Session) *Instance {
+		return &Instance{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/controller/tenant/menu.go

@@ -0,0 +1,88 @@
+package tenant
+
+import (
+	"SciencesServer/app/api/controller"
+	menu2 "SciencesServer/app/api/controller/menu"
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"SciencesServer/serve/orm"
+	"errors"
+
+	"gorm.io/gorm"
+)
+
+type Menu struct{ *controller.Platform }
+
+type MenuHandle func(session *service.Session) *Menu
+
+// List 菜单列表
+func (c *Menu) List(tenantID uint64) ([]*menu2.TreeChecked, error) {
+	mSysMenu := model.NewSysMenu()
+	return menu2.MenuForTenant(mSysMenu, tenantID)
+}
+
+// Bind 绑定菜单
+func (c *Menu) Bind(tenantID uint64, menuIDs []uint64) error {
+	if len(menuIDs) > 0 {
+		var count int64
+
+		mSysMenu := model.NewSysMenu()
+
+		if err := model2.Count(mSysMenu.SysMenu, &count, model2.NewWhereIn("id", menuIDs),
+			model2.NewWhere("auth", model2.SysMenuAuthForSystem)); err != nil {
+			return err
+		} else if count > 0 {
+			return errors.New("不可设置超管菜单")
+		}
+	}
+	mSysTenantMenu := model.NewSysTenantMenu()
+
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		// TODO：先全部删除，后期考虑局部删除
+		err := model2.DeleteWhere(mSysTenantMenu.SysTenantMenu, []*model2.ModelWhere{model2.NewWhere("tenant_id", tenantID)}, tx)
+
+		if err != nil {
+			return err
+		}
+		// 租户角色的菜单
+		mSysRoleMenu := model.NewSysRoleMenu()
+
+		if len(menuIDs) <= 0 {
+			if err = model2.DeleteWhere(mSysRoleMenu.SysRoleMenu, []*model2.ModelWhere{model2.NewWhere("tenant_id", tenantID)}, tx); err != nil {
+				return err
+			}
+			return nil
+		}
+		menus := make([]*model2.SysTenantMenu, 0)
+
+		mark := make(map[uint64]uint64, 0)
+
+		for _, v := range menuIDs {
+			if _, has := mark[v]; has {
+				continue
+			}
+			menus = append(menus, &model2.SysTenantMenu{
+				ModelTenant: model2.ModelTenant{TenantID: tenantID}, MenuID: v,
+			})
+			mark[v] = v
+		}
+		if err = model2.Creates(mSysTenantMenu.SysTenantMenu, menus, tx); err != nil {
+			return err
+		}
+		// 删除租户下角色不存在的菜单
+		if err = model2.DeleteWhere(mSysRoleMenu.SysRoleMenu, []*model2.ModelWhere{
+			model2.NewWhere("tenant_id", tenantID),
+			model2.NewWhereNotIn("menu_id", menuIDs),
+		}); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func NewMenu() MenuHandle {
+	return func(session *service.Session) *Menu {
+		return &Menu{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/controller/tenant/struct.go

@@ -0,0 +1,20 @@
+package tenant
+
+// InstanceParamsForProtocol 协议参数
+type InstanceParamsForSetting struct {
+	Protocol                []uint
+	MaxDevices, MaxCustomer int
+}
+
+// NewProtocol 消息协议
+func (c *InstanceParamsForSetting) NewProtocol() uint {
+	// &（与）：0&0=0 0&1=0 1&0=0 1&1=1
+	// |（或）：0&0=0 0&1=1 1&0=1 1&1=1
+	// ^（非）：0^0=0 0&1=1 1^0=1 1^1=0
+	var protocol uint
+
+	for i := 0; i < len(c.Protocol); i++ {
+
+	}
+	return protocol
+}

app/api/controller/tenant/sub.go

@@ -0,0 +1,44 @@
+package tenant
+
+import (
+	model2 "SciencesServer/app/common/model"
+
+	"SciencesServer/config"
+	"fmt"
+
+	"gorm.io/gorm"
+)
+
+type Sub struct{}
+
+type SubHandle func() *Sub
+
+// database 数据表
+func (c *Sub) database(key string) string {
+	return model2.SubDatabase + "_" + key
+}
+
+// sync 同步数据
+func (c *Sub) sync(tx *gorm.DB, database string) error {
+	// TODO：生成租户对应数据库，并生成对应数据表
+	err := tx.Exec(fmt.Sprintf("CREATE DATABASE %s;", database)).Error
+
+	if err != nil {
+		return err
+	}
+	// 使用生成后的数据库
+	if err = tx.Exec(fmt.Sprintf("use %s;", database)).Error; err != nil {
+		return err
+	}
+	iModels := []model2.IModel{}
+
+	for _, v := range iModels {
+		if err = tx.Migrator().CreateTable(v); err != nil {
+			return err
+		}
+	}
+	// 重新使用默认的数据库
+	tx.Exec(fmt.Sprintf("use %s;", config.SettingInfo.Engine.Mysql.DBName))
+
+	return nil
+}

app/api/controller/user/instance.go

@@ -0,0 +1,249 @@
+package user
+
+import (
+	"SciencesServer/app/api/controller"
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"SciencesServer/serve/orm"
+	"SciencesServer/utils"
+	"errors"
+	"strings"
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Instance struct{ *controller.Platform }
+
+type InstanceHandle func(session *service.Session) *Instance
+
+type (
+	// InstanceInfo 基本信息
+	InstanceInfo struct {
+		UID    string `json:"uid"`
+		Name   string `json:"name"`
+		Email  string `json:"email"`
+		Mobile string `json:"mobile"`
+		Remark string `json:"remark"`
+	}
+	// InstanceUserInfo 用户信息
+	InstanceUserInfo struct {
+		*model.SysUserTenantUser
+		UID string `json:"uid"`
+	}
+)
+
+// InstanceForm 表单信息
+type InstanceForm struct {
+	ID                                      uint64 // 租户用户主键ID
+	Account, Name, Mobile, Password, Remark string
+	Gender                                  int
+	Departments, Roles                      []uint64
+}
+
+// Info 用户信息
+func (c *Instance) Info() (*InstanceInfo, error) {
+	mSysUser := model.NewSysUser()
+
+	_, err := model2.FirstWhere(mSysUser.SysUser, model2.NewWhere("uuid", c.UID))
+
+	if err != nil {
+		return nil, err
+	}
+	return &InstanceInfo{
+		UID: mSysUser.UUIDString(), Name: mSysUser.Name, Email: mSysUser.Email, Mobile: mSysUser.Mobile, Remark: mSysUser.Remark,
+	}, nil
+}
+
+// List 列表信息
+func (c *Instance) List(name, mobile string, status, page, pageSize int) (*controller.ReturnPages, error) {
+	mSysUserTenant := model.NewSysUserTenant()
+
+	where := []*model2.ModelWhere{model2.NewWhere("u_t.tenant_id", c.TenantID)}
+
+	if name != "" {
+		where = append(where, model2.NewWhereLike("u.name", name))
+	}
+	if mobile != "" {
+		where = append(where, model2.NewWhereLike("u.mobile", mobile))
+	}
+	if status > 0 {
+		where = append(where, model2.NewWhere("u_t.status", status))
+	}
+	var count int64
+
+	out, err := mSysUserTenant.User(page, pageSize, &count, where...)
+
+	if err != nil {
+		return nil, err
+	}
+	list := make([]*InstanceUserInfo, 0)
+
+	for _, v := range out {
+		list = append(list, &InstanceUserInfo{SysUserTenantUser: v, UID: utils.UintToString(v.UID)})
+	}
+	return &controller.ReturnPages{Data: list, Page: page, TotalCount: count}, nil
+}
+
+// Add 添加用户
+func (c *Instance) Add(params *InstanceForm) error {
+	if utils.ValidateMobile(params.Mobile) {
+		return errors.New("手机号码格式错误")
+	}
+	mSysUser := model.NewSysUser()
+	// 查询登录账户或手机号码是否注册
+	var count int64
+
+	err := model2.Count(mSysUser.SysUser, &count, model2.NewWhere("account", params.Account))
+
+	if err != nil {
+		return err
+	}
+	if err = model2.Count(mSysUser.SysUser, &count, model2.NewWhere("mobile", params.Mobile)); err != nil {
+		return err
+	}
+	mSysUser.Account = params.Account
+	mSysUser.Name = params.Name
+	mSysUser.Mobile = params.Mobile
+	mSysUser.Gender.Gender = model2.GenderKind(params.Gender)
+	mSysUser.Password = params.Password
+	mSysUser.Remark = params.Remark
+
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		if err = model2.Create(mSysUser.SysUser, tx); err != nil {
+			return err
+		}
+		mSysUserTenant := model.NewSysUserTenant()
+		mSysUserTenant.TenantID = c.TenantID
+		mSysUserTenant.UID = mSysUser.UUID
+		if len(params.Departments) > 0 {
+			mSysUserTenant.Department = strings.Join(utils.ArrayStrings(params.Departments), ",")
+		}
+		if len(params.Roles) > 0 {
+			mSysUserTenant.Role = strings.Join(utils.ArrayStrings(params.Roles), ",")
+		}
+		mSysUserTenant.Identity = model2.SysUserTenantIdentityForSystemUser
+
+		if err = model2.Create(mSysUserTenant.SysUserTenant, tx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+// Edit 修改用户信息
+func (c *Instance) Edit(params *InstanceForm) error {
+	if utils.ValidateMobile(params.Mobile) {
+		return errors.New("手机号码格式错误")
+	}
+	mSysUserTenant := model.NewSysUserTenant()
+	mSysUserTenant.ID = params.ID
+
+	isExist, err := model2.FirstField(mSysUserTenant.SysUserTenant, []string{"id", "tenant_id", "identity"})
+
+	if err != nil {
+		return nil
+	} else if !isExist {
+		return errors.New("用户信息不存在")
+	} else if mSysUserTenant.TenantID != c.TenantID {
+		return errors.New("不可修改他人用户信息")
+	}
+	// 查询用户信息
+	mSysUser := model.NewSysUser()
+
+	if isExist, err = model2.FirstWhere(mSysUser.SysUser, model2.NewWhere("uuid", mSysUserTenant.UID)); err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("用户信息不存在")
+	}
+	if params.Mobile != mSysUser.Mobile {
+		var count int64
+
+		if err = model2.Count(mSysUser.SysUser, &count, model2.NewWhere("mobile", params.Mobile)); err != nil {
+			return err
+		} else if count > 0 {
+			return errors.New("该手机号码已注册")
+		}
+	}
+	now := time.Now()
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		if err = model2.Updates(mSysUserTenant.SysUserTenant, map[string]interface{}{
+			"department": strings.Join(utils.ArrayStrings(params.Departments), ","),
+			"role":       strings.Join(utils.ArrayStrings(params.Roles), ","),
+			"updated_at": now,
+		}, tx); err != nil {
+			return err
+		}
+		if err = model2.Updates(mSysUser.SysUser, map[string]interface{}{
+			"name": params.Name, "mobile": params.Mobile, "gender": params.Gender, "remark": params.Remark, "updated_at": now,
+		}, tx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (c *Instance) Password(id uint64, password, repeatPwd string) error {
+	if password != repeatPwd {
+		return errors.New("两次密码不一致")
+	}
+	mSysUserTenant := model.NewSysUserTenant()
+	mSysUserTenant.ID = id
+
+	isExist, err := model2.FirstField(mSysUserTenant.SysUserTenant, []string{"id", "tenant_id", "identity"})
+
+	if err != nil {
+		return nil
+	} else if !isExist {
+		return errors.New("用户信息不存在")
+	} else if mSysUserTenant.TenantID != c.TenantID {
+		return errors.New("不可修改他人用户密码")
+	}
+	mSysUser := model.NewSysUser()
+	mSysUser.Password = password
+	mSysUser.Pass()
+
+	if err = model2.UpdatesWhere(mSysUser.SysUser, map[string]interface{}{
+		"password": mSysUser.Password, "salt": mSysUser.Salt, "updated_at": time.Now(),
+	}, []*model2.ModelWhere{
+		model2.NewWhere("uuid", mSysUserTenant.UID),
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (c *Instance) Delete(id uint64) error {
+	mSysUserTenant := model.NewSysUserTenant()
+	mSysUserTenant.ID = id
+
+	isExist, err := model2.FirstField(mSysUserTenant.SysUserTenant, []string{"id", "tenant_id", "identity"})
+
+	if err != nil {
+		return nil
+	} else if !isExist {
+		return errors.New("用户信息不存在")
+	} else if mSysUserTenant.TenantID != c.TenantID {
+		return errors.New("不可删除他人用户信息")
+	}
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		if err = model2.Delete(mSysUserTenant.SysUserTenant, tx); err != nil {
+			return err
+		}
+		mSysUser := model.NewSysUser()
+
+		if err = model2.DeleteWhere(mSysUser.SysUser, []*model2.ModelWhere{
+			model2.NewWhere("uuid", mSysUserTenant.UID),
+		}, tx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func NewInstance() InstanceHandle {
+	return func(session *service.Session) *Instance {
+		return &Instance{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/controller/user/menu.go

@@ -0,0 +1,40 @@
+package user
+
+import (
+	"SciencesServer/app/api/controller"
+	menu2 "SciencesServer/app/api/controller/menu"
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+)
+
+type Menu struct{ *controller.Platform }
+
+type MenuHandle func(session *service.Session) *Menu
+
+// List 菜单列表
+func (c *Menu) List() (interface{}, error) {
+	mSysMenu := model.NewSysMenu()
+
+	if c.IsAdmin {
+		return menu2.MenuForSystem(mSysMenu)
+	}
+	mSysUserTenant := model.NewSysUserTenant()
+
+	if isExist, err := model2.FirstField(mSysUserTenant.SysUserTenant, []string{"id", "identity"},
+		model2.NewWhere("tenant_id", c.TenantID), model2.NewWhere("uid", c.UID)); err != nil {
+		return nil, err
+	} else if !isExist {
+		return nil, nil
+	}
+	if mSysUserTenant.Identity == model2.SysUserTenantIdentityForSystemAdmin {
+		return menu2.MenuForTenant(mSysMenu, c.TenantID)
+	}
+	return menu2.MenuForUser(mSysMenu, c.TenantID, c.UID)
+}
+
+func NewMenu() MenuHandle {
+	return func(session *service.Session) *Menu {
+		return &Menu{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/controller/user/person.go

@@ -0,0 +1,47 @@
+package user
+
+import (
+	"SciencesServer/app/api/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/service"
+	"errors"
+	"time"
+)
+
+type Person struct{ *service.Session }
+
+type PersonHandle func(session *service.Session) *Person
+
+// EditPassword 修改密码
+func (c *Person) EditPassword(oldPassword, password, repeatPwd string) error {
+	if password != repeatPwd {
+		return errors.New("两次密码不一致")
+	}
+	mSysUser := model.NewSysUser()
+
+	isExist, err := model2.FirstWhere(mSysUser.SysUser, model2.NewWhere("uuid", c.UID))
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("用户信息不存在或已被删除")
+	}
+	if !mSysUser.ValidatePassword(oldPassword) {
+		return errors.New("旧密码错误")
+	}
+	mSysUser.Password = password
+	mSysUser.Pass()
+
+	if err = model2.Updates(mSysUser.SysUser, map[string]interface{}{
+		"password": mSysUser.Password, "salt": mSysUser.Salt, "updated_at": time.Now(),
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+func NewPerson() PersonHandle {
+	return func(session *service.Session) *Person {
+		return &Person{Session: session}
+	}
+}

app/api/controller/user/role.go

@@ -0,0 +1,81 @@
+package user
+
+import (
+	"SciencesServer/app/api/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/serve/logger"
+
+	"SciencesServer/app/api/model"
+	"SciencesServer/app/service"
+	"SciencesServer/serve/orm"
+	"SciencesServer/utils"
+
+	"gorm.io/gorm"
+)
+
+type Role struct{ *controller.Platform }
+
+type RoleHandle func(session *service.Session) *Role
+
+// List 列表信息
+func (c *Role) List(uid uint64) ([]*model.SysRoleUserInfo, error) {
+	mSysRole := model.NewSysRole()
+
+	out, err := mSysRole.UserRole(uid)
+
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Bind 绑定角色
+func (c *Role) Bind(uid uint64, roleIDs []uint64) error {
+	mSysUserRole := model.NewSysUserRole()
+
+	return orm.GetDB().Transaction(func(tx *gorm.DB) error {
+		err := model2.DeleteWhere(mSysUserRole.SysUserRole, []*model2.ModelWhere{model2.NewWhere("uid", uid)}, tx)
+
+		if err != nil {
+			return err
+		}
+		roles := make([]*model2.SysUserRole, 0)
+		obj := make([]string, 0)
+
+		mark := make(map[uint64]uint64, 0)
+
+		for _, v := range roleIDs {
+			if _, has := mark[v]; has {
+				continue
+			}
+			obj = append(obj, utils.UintToString(v))
+
+			roles = append(roles, &model2.SysUserRole{
+				UID: uid, RoleID: v,
+			})
+			mark[v] = v
+		}
+		if err = model2.Creates(mSysUserRole.SysUserRole, roles, tx); err != nil {
+			return err
+		}
+		go utils.TryCatch(func() {
+			permission := service.NewPermission(obj)(c.TenantKey, utils.UintToString(uid))
+
+			if _, err = permission.DeleteRolesForUser(false); err != nil {
+				logger.ErrorF("删除用户【%d】角色权限错误：%v", uid, err)
+				return
+			}
+			if _, err = permission.AddRoleForUser(); err != nil {
+				logger.ErrorF("添加用户【%d】角色权限错误：%v", uid, err)
+				return
+			}
+		})
+		return nil
+	})
+}
+
+func NewRole() RoleHandle {
+	return func(session *service.Session) *Role {
+		return &Role{Platform: &controller.Platform{Session: session}}
+	}
+}

app/api/model/sys_auth.go

@@ -0,0 +1,62 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+)
+
+type SysAuth struct {
+	*model.SysAuth
+}
+
+// SysAuthScene 信息
+type SysAuthScene struct {
+	*model.SysAuth
+	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
+}
+
+func NewSysAuth() *SysAuth {
+	return &SysAuth{SysAuth: model.NewSysAuth()}
+}

app/api/model/sys_config.go

@@ -0,0 +1,11 @@
+package model
+
+import "SciencesServer/app/common/model"
+
+type SysConfig struct {
+	*model.SysConfig
+}
+
+func NewSysConfig() *SysConfig {
+	return &SysConfig{}
+}

app/api/model/sys_deparement.go

@@ -0,0 +1,11 @@
+package model
+
+import "SciencesServer/app/common/model"
+
+type SysDepartment struct {
+	*model.SysDepartment
+}
+
+func NewSysDepartment() *SysDepartment {
+	return &SysDepartment{SysDepartment: model.NewSysDepartment()}
+}

app/api/model/sys_log.go

@@ -0,0 +1,13 @@
+package model
+
+import (
+	model2 "SciencesServer/app/common/model"
+)
+
+type SysLog struct {
+	*model2.SysLog
+}
+
+func NewSysLog() *SysLog {
+	return &SysLog{}
+}

app/api/model/sys_menu.go

@@ -0,0 +1,117 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+)
+
+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(tenantID, 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.tenant_id = ? AND u_r.uid = ? AND u_r.is_deleted = ?", tenantID, 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()}
+}

app/api/model/sys_role.go

@@ -0,0 +1,45 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+)
+
+type SysRole struct {
+	*model.SysRole
+}
+
+// SysRoleBasic 基本信息
+type SysRoleBasic struct {
+	ID   uint64 `json:"id"`
+	Name string `json:"name"`
+}
+
+// SysRoleUserInfo 用户角色信息
+type SysRoleUserInfo struct {
+	*SysRoleBasic
+	UserRoleID uint64 `json:"user_role_id"`
+}
+
+// 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
+}
+
+func NewSysRole() *SysRole {
+	return &SysRole{SysRole: model.NewSysRole()}
+}

app/api/model/sys_role_auth.go

@@ -0,0 +1,47 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+)
+
+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()}
+}

app/api/model/sys_role_menu.go

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

app/api/model/sys_tenant.go

@@ -0,0 +1,85 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+	"time"
+)
+
+type SysTenant struct {
+	*model.SysTenant
+}
+
+type (
+	// SysTenantBasic 租户基本信息
+	SysTenantBasic struct {
+	}
+	// SysTenantInfo 租户信息
+	SysTenantInfo struct {
+		*model.SysTenant
+		DeviceCount         int `json:"device_count"`
+		CustomerDeviceCount int `json:"customer_device_count"`
+	}
+	// SysTenantSubsetInfo 租户子集信息
+	SysTenantSubsetInfo struct {
+		ID          uint64 `json:"id"`
+		ParentID    uint64 `json:"parent_id"`
+		Name        string `json:"name"`
+		DeviceCount int    `json:"device_count"`
+	}
+	// SysTenantDeviceCount 设备数量
+	SysTenantDeviceCount struct {
+		TenantID      uint64 `json:"tenant_id"`
+		Count         int    `json:"count"`
+		CustomerCount int    `json:"customer_count"`
+	}
+)
+
+// IsInvalid 判断是否有效
+func (m *SysTenant) IsInvalid() bool {
+	return m.Status == model.SysTenantStatusForDisable || m.Status == model.SysTenantStatusForExpired || m.Deadline.Before(time.Now())
+}
+
+// Tenants 租户信息
+func (m *SysTenant) Tenants(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*SysTenantInfo, error) {
+
+	db := orm.GetDB().Table(m.TableName()).Where("is_deleted = ?", model.DeleteStatusForNot)
+
+	if len(where) > 0 {
+		for _, wo := range where {
+			db = db.Where(wo.Condition, wo.Value)
+		}
+	}
+	out := make([]*SysTenantInfo, 0)
+
+	if err := db.Count(count).Error; err != nil {
+		return nil, err
+	}
+	if err := db.Order("id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// TenantSubset 租户子集信息
+func (m *SysTenant) TenantSubset(tenantID uint64) ([]*SysTenantSubsetInfo, error) {
+
+	sql := fmt.Sprintf(`SELECT t3.id, t3.parent_id, t3.name, d.count AS device_count FROM 
+(SELECT t1.id, t1.parent_id, t1.name, IF(FIND_IN_SET( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS is_child 
+FROM (SELECT id, parent_id, name FROM %s WHERE is_deleted = 0 ORDER BY id DESC) AS t1, 
+(SELECT @pids := %d) AS t2) AS t3 
+LEFT JOIN (SELECT tenant_id, COUNT(id) AS count FROM %s WHERE is_deleted = 0 GROUP BY tenant_id) AS d ON t3.id = d.tenant_id
+WHERE is_child != 0`, m.TableName(), tenantID, "数据表")
+
+	out := make([]*SysTenantSubsetInfo, 0)
+
+	if err := orm.GetDB().Raw(sql).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func NewSysTenant() *SysTenant {
+	return &SysTenant{SysTenant: model.NewSysTenant()}
+}

app/api/model/sys_tenant_auth.go

@@ -0,0 +1,11 @@
+package model
+
+import "SciencesServer/app/common/model"
+
+type SysTenantAuth struct {
+	*model.SysTenantAuth
+}
+
+func NewSysTenantAuth() *SysTenantAuth {
+	return &SysTenantAuth{SysTenantAuth: model.NewSysTenantAuth()}
+}

app/api/model/sys_tenant_menu.go

@@ -0,0 +1,11 @@
+package model
+
+import "SciencesServer/app/common/model"
+
+type SysTenantMenu struct {
+	*model.SysTenantMenu
+}
+
+func NewSysTenantMenu() *SysTenantMenu {
+	return &SysTenantMenu{SysTenantMenu: model.NewSysTenantMenu()}
+}

app/api/model/sys_user.go

@@ -0,0 +1,40 @@
+package model
+
+import (
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"SciencesServer/utils"
+	"errors"
+
+	"gorm.io/gorm"
+)
+
+// SysUser 用户信息
+type SysUser struct {
+	*model2.SysUser
+}
+
+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
+}
+
+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)
+
+	if err := db.First(m.SysUser).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return false, nil
+		}
+		return false, err
+	}
+	return true, nil
+}
+
+func NewSysUser() *SysUser {
+	return &SysUser{SysUser: model2.NewSysUser()}
+}

app/api/model/sys_user_login_log.go

@@ -0,0 +1,45 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+)
+
+type SysUserLoginLog struct {
+	*model.SysUserLoginLog
+}
+
+type SysUserLoginLogInfo struct {
+	*model.SysUserLoginLog
+	TenantName string `json:"tenant_name"`
+	Username   string `json:"username"`
+}
+
+// Logs 日志信息
+func (m *SysUserLoginLog) Logs(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*SysUserLoginLogInfo, error) {
+	db := orm.GetDB().Table(m.TableName()+" AS l").
+		Select("l.*, t.name AS tenant_name, u.name AS username").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS t ON l.tenant_id = t.id", NewSysTenant().TableName())).
+		Joins(fmt.Sprintf("LEFT JOIN %s AS u ON l.uid = u.uuid", NewSysUser().TableName())).
+		Where("l.is_deleted = ?", model.DeleteStatusForNot)
+
+	if len(where) > 0 {
+		for _, wo := range where {
+			db = db.Where(wo.Condition, wo.Value)
+		}
+	}
+	out := make([]*SysUserLoginLogInfo, 0)
+
+	if err := db.Count(count).Error; err != nil {
+		return nil, err
+	}
+	if err := db.Order("l.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func NewSysUserLoginLog() *SysUserLoginLog {
+	return &SysUserLoginLog{SysUserLoginLog: model.NewSysUserLoginLog()}
+}

app/api/model/sys_user_role.go

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

app/api/model/sys_user_tenant.go

@@ -0,0 +1,83 @@
+package model
+
+import (
+	"SciencesServer/app/common/model"
+	"SciencesServer/serve/orm"
+	"fmt"
+)
+
+type SysUserTenant struct {
+	*model.SysUserTenant
+}
+
+type (
+	// SysUserTenantBasic 基本信息
+	SysUserTenantBasic struct {
+		ID     uint64                    `json:"id"`
+		Name   string                    `json:"name"`
+		Mobile string                    `json:"mobile"`
+		Status model.SysUserTenantStatus `json:"status"`
+	}
+	// SysUserTenantUser 用户信息
+	SysUserTenantUser struct {
+		*SysUserTenantBasic
+		UID      uint64                      `json:"uid"`
+		Email    string                      `json:"email"`
+		Identity model.SysUserTenantIdentity `json:"identity"`
+		Remark   string                      `json:"remark"`
+	}
+)
+
+// Member 成员信息
+func (m *SysUserTenant) Member(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*SysUserTenantBasic, error) {
+	mSysUser := NewSysUser()
+
+	db := orm.GetDB().Table(m.TableName()+" AS u_t").
+		Select("u_t.id, u.name, u.mobile, u_t.status").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS u ON u_t.uid = u.uuid", mSysUser.TableName())).
+		Where("u_t.is_deleted = ? AND u.is_deleted = ?", model.DeleteStatusForNot, model.DeleteStatusForNot)
+
+	if len(where) > 0 {
+		for _, wo := range where {
+			db = db.Where(wo.Condition, wo.Value)
+		}
+	}
+	out := make([]*SysUserTenantBasic, 0)
+
+	if err := db.Count(count).Error; err != nil {
+		return nil, err
+	}
+	if err := db.Order("u_t.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// User 用户信息
+func (m *SysUserTenant) User(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*SysUserTenantUser, error) {
+	mSysUser := NewSysUser()
+
+	db := orm.GetDB().Table(m.TableName()+" AS u_t").
+		Select("u_t.id, u_t.uid, u.name, u.mobile, u.email, u_t.identity, u_t.status, u.remark, u_t.created_at").
+		Joins(fmt.Sprintf("LEFT JOIN %s AS u ON u_t.uid = u.uuid", mSysUser.TableName())).
+		Where("u_t.is_deleted = ? AND u.is_deleted = ?", model.DeleteStatusForNot, model.DeleteStatusForNot)
+
+	if len(where) > 0 {
+		for _, wo := range where {
+			db = db.Where(wo.Condition, wo.Value)
+		}
+	}
+	out := make([]*SysUserTenantUser, 0)
+
+	if err := db.Count(count).Error; err != nil {
+		return nil, err
+	}
+	if err := db.Order("u_t.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func NewSysUserTenant() *SysUserTenant {
+	return &SysUserTenant{SysUserTenant: model.NewSysUserTenant()}
+}