更新密码找回uniapp
This commit is contained in:
1 parent
7f9a66da0f
commit
3fdda89833
1304 files changed
+3503
-26132
No files matched your search
@@ -17,7 +17,6 @@ import (
|
||||
beego "github.com/beego/beego/v2/server/web"
|
||||
)
|
||||
|
||||
// PlatformTenantController ĺšłĺ°çŤŻç§ćˇçŽĄç?
|
||||
type PlatformTenantController struct {
|
||||
beego.Controller
|
||||
}
|
||||
@@ -32,15 +31,12 @@ type tenantDTO struct {
|
||||
Address string `json:"address"`
|
||||
Worktime string `json:"worktime"`
|
||||
Status int8 `json:"status"`
|
||||
// 套餐与用户数配额
|
||||
PackageID uint64 `json:"package_id"`
|
||||
PackageName string `json:"package_name"`
|
||||
// PackageExpireTime 套餐计费到期时间(NULL-永久有效);DaysRemaining 剩余天数
|
||||
PackageExpireTime *time.Time `json:"package_expire_time"`
|
||||
DaysRemaining int `json:"days_remaining"`
|
||||
UserQuota int `json:"user_quota"`
|
||||
UserUsed int `json:"user_used"`
|
||||
// StorageQuotaMB 附件空间基础额度(MB)
|
||||
StorageQuotaMB int `json:"storage_quota_mb"`
|
||||
Remark string `json:"remark"`
|
||||
CreateTime *time.Time `json:"create_time,omitempty"`
|
||||
@@ -48,7 +44,6 @@ type tenantDTO struct {
|
||||
DeleteTime *time.Time `json:"delete_time,omitempty"`
|
||||
}
|
||||
|
||||
// tenantPackageNameMap 套餐ID -> 套餐名称
|
||||
func tenantPackageNameMap() map[uint64]string {
|
||||
result := map[uint64]string{}
|
||||
var rows []models.SystemTenantPackage
|
||||
@@ -62,7 +57,6 @@ func tenantPackageNameMap() map[uint64]string {
|
||||
return result
|
||||
}
|
||||
|
||||
// tenantUserCountMap 租户ID -> 有效用户数
|
||||
func tenantUserCountMap() map[uint64]int {
|
||||
result := map[uint64]int{}
|
||||
var rows []models.SystemTenantUser
|
||||
@@ -119,8 +113,6 @@ func toTenantDTO(t models.SystemTenant) tenantDTO {
|
||||
}
|
||||
}
|
||||
|
||||
// GetTenant čˇĺç§ćˇĺ襨
|
||||
// GET /platform/tenant/getTenant?page=1&pageSize=10&tenant_name=...&tenant_code=...&contact_person=...&contact_phone=...
|
||||
func (c *PlatformTenantController) GetTenant() {
|
||||
page, _ := c.GetInt("page", 1)
|
||||
pageSize, _ := c.GetInt("pageSize", 10)
|
||||
@@ -186,8 +178,6 @@ func (c *PlatformTenantController) GetTenant() {
|
||||
_ = c.ServeJSON()
|
||||
}
|
||||
|
||||
// GetTenantDetail čˇĺç§ćˇčŻŚć
|
||||
// GET /platform/tenant/getTenantDetail/:id
|
||||
func (c *PlatformTenantController) GetTenantDetail() {
|
||||
id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
|
||||
if err != nil || id == 0 {
|
||||
@@ -207,7 +197,6 @@ func (c *PlatformTenantController) GetTenantDetail() {
|
||||
dto := toTenantDTO(t)
|
||||
if pkg, err := services.GetTenantPackage(t.ID); err == nil && pkg != nil {
|
||||
if pkg.ID != t.PackageID {
|
||||
// 套餐已因到期自动降级,原到期时间不再有效
|
||||
dto.PackageExpireTime = nil
|
||||
dto.DaysRemaining = 0
|
||||
}
|
||||
@@ -235,16 +224,11 @@ type tenantPayload struct {
|
||||
Address string `json:"address"`
|
||||
Worktime string `json:"worktime"`
|
||||
Status *int8 `json:"status"`
|
||||
// 套餐与用户数上限(可选)
|
||||
PackageID *uint64 `json:"package_id"`
|
||||
UserQuota *int `json:"user_quota"`
|
||||
// StorageQuotaMB 附件空间基础额度(MB,可选)
|
||||
StorageQuotaMB *int `json:"storage_quota_mb"`
|
||||
Remark string `json:"remark"`
|
||||
|
||||
// 指定租户管理员(可选):把已有认证身份绑定为该租户管理员。
|
||||
// AdminIdentityID 直接指定身份;也可只传 AdminAccount/AdminPhone/AdminEmail 按归并键定位。
|
||||
// 统一认证原则:不新建账号、不覆盖原密码,只建「身份-企业」绑定并授予租户管理员角色。
|
||||
AdminIdentityID uint64 `json:"admin_identity_id"`
|
||||
AdminAccount string `json:"admin_account"`
|
||||
AdminPhone string `json:"admin_phone"`
|
||||
@@ -252,7 +236,6 @@ type tenantPayload struct {
|
||||
}
|
||||
|
||||
func (c *PlatformTenantController) parseTenantPayload() (tenantPayload, error) {
|
||||
// äźĺ
äťčĄ¨ĺ话ĺďźcreateTenant ä˝żç¨ multipart/form-dataďź?
|
||||
p := tenantPayload{
|
||||
TenantCode: strings.TrimSpace(c.GetString("tenant_code")),
|
||||
TenantName: strings.TrimSpace(c.GetString("tenant_name")),
|
||||
@@ -293,7 +276,6 @@ func (c *PlatformTenantController) parseTenantPayload() (tenantPayload, error) {
|
||||
p.AdminPhone = strings.TrimSpace(c.GetString("admin_phone"))
|
||||
p.AdminEmail = strings.TrimSpace(c.GetString("admin_email"))
|
||||
|
||||
// ĺŚćĺ
łéŽĺ掾为犺ďźĺ°čŻäť JSON body č§ŁćďźeditTenant éťčޤ JSONďź?
|
||||
if p.TenantName == "" && p.TenantCode == "" {
|
||||
raw, _ := io.ReadAll(c.Ctx.Request.Body)
|
||||
if len(raw) > 0 {
|
||||
@@ -303,9 +285,6 @@ func (c *PlatformTenantController) parseTenantPayload() (tenantPayload, error) {
|
||||
return p, nil
|
||||
}
|
||||
|
||||
// bindTenantAdminFromPayload 把已有认证身份绑定为新租户的管理员(不新建账号、不覆盖密码)。
|
||||
// 优先 AdminIdentityID;否则按 AdminAccount/AdminPhone/AdminEmail 归并键(手机>邮箱>账号)定位。
|
||||
// 返回 (是否绑定, 错误);未指定管理员时返回 (false, nil)。
|
||||
func bindTenantAdminFromPayload(tid uint64, p tenantPayload) (bool, error) {
|
||||
identityID := p.AdminIdentityID
|
||||
if identityID == 0 && (p.AdminAccount != "" || p.AdminPhone != "" || p.AdminEmail != "") {
|
||||
@@ -316,7 +295,7 @@ func bindTenantAdminFromPayload(tid uint64, p tenantPayload) (bool, error) {
|
||||
identityID = existed.ID
|
||||
}
|
||||
if identityID == 0 {
|
||||
return false, nil // 未指定管理员,跳过
|
||||
return false, nil
|
||||
}
|
||||
|
||||
identity, err := authsvc.GetIdentityByID(identityID)
|
||||
@@ -324,7 +303,6 @@ func bindTenantAdminFromPayload(tid uint64, p tenantPayload) (bool, error) {
|
||||
return false, errors.New("认证身份不存在")
|
||||
}
|
||||
|
||||
// 企业内账号:显式指定 > 身份手机号 > user{id};姓名取身份昵称
|
||||
account := p.AdminAccount
|
||||
if account == "" && identity.Mobile != nil {
|
||||
account = strings.TrimSpace(*identity.Mobile)
|
||||
@@ -337,19 +315,16 @@ func bindTenantAdminFromPayload(tid uint64, p tenantPayload) (bool, error) {
|
||||
name = strings.TrimSpace(*identity.Nickname)
|
||||
}
|
||||
|
||||
// 老表镜像身份层现有密码哈希(登录仍以认证中心为准,不在建租户时改密)
|
||||
var pwd *string
|
||||
if identity.PasswordHash != nil {
|
||||
h := *identity.PasswordHash
|
||||
pwd = &h
|
||||
}
|
||||
|
||||
// isDefault=0:不改变该用户当前的默认企业
|
||||
if _, err := services.BindTenantUser(tid, identity.ID, &account, &name, identity.Mobile, identity.Email, nil, nil, pwd, 0, 1, nil); err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
// 绑定全局「租户管理员」角色(拥有 backend 全权限)
|
||||
if adminRoleID, err := models.GetTenantAdminRole(); err == nil && adminRoleID > 0 {
|
||||
_, _ = models.Orm.QueryTable(new(models.SystemTenantUser)).
|
||||
Filter("tid", tid).
|
||||
@@ -357,7 +332,6 @@ func bindTenantAdminFromPayload(tid uint64, p tenantPayload) (bool, error) {
|
||||
Update(map[string]interface{}{"group_id": adminRoleID})
|
||||
}
|
||||
|
||||
// 双写:同步到统一认证中心(建 yz_auth_tenant_user 绑定)
|
||||
var row models.SystemTenantUser
|
||||
if e := models.Orm.QueryTable(new(models.SystemTenantUser)).
|
||||
Filter("tid", tid).
|
||||
@@ -369,8 +343,6 @@ func bindTenantAdminFromPayload(tid uint64, p tenantPayload) (bool, error) {
|
||||
return true, nil
|
||||
}
|
||||
|
||||
// CreateTenant ĺĺťşç§ćˇ
|
||||
// POST /platform/tenant/createTenant
|
||||
func (c *PlatformTenantController) CreateTenant() {
|
||||
p, _ := c.parseTenantPayload()
|
||||
if strings.TrimSpace(p.TenantName) == "" {
|
||||
@@ -384,7 +356,6 @@ func (c *PlatformTenantController) CreateTenant() {
|
||||
return
|
||||
}
|
||||
|
||||
// ć ĄéŞçźç ĺŻä¸
|
||||
cnt, err := models.Orm.QueryTable(new(models.SystemTenant)).Filter("tenant_code", p.TenantCode).Count()
|
||||
if err != nil {
|
||||
c.Data["json"] = map[string]interface{}{"code": 500, "msg": "ĺ坺夹贼: " + err.Error()}
|
||||
@@ -402,10 +373,8 @@ func (c *PlatformTenantController) CreateTenant() {
|
||||
status = *p.Status
|
||||
}
|
||||
|
||||
// 套餐与用户数上限:未指定套餐时使用默认套餐,用户数取其包含用户数(兜底 20)
|
||||
packageID := uint64(0)
|
||||
userQuota := services.DefaultTenantUserQuota
|
||||
// 显式选择的套餐按套餐有效时长计费;未指定而兜底绑定默认套餐的不设置到期时间
|
||||
explicitPackage := p.PackageID != nil && *p.PackageID > 0
|
||||
var packageExpire *time.Time
|
||||
if explicitPackage {
|
||||
@@ -440,7 +409,6 @@ func (c *PlatformTenantController) CreateTenant() {
|
||||
if userQuota <= 0 {
|
||||
userQuota = services.DefaultTenantUserQuota
|
||||
}
|
||||
// 附件空间基础额度:未显式指定时按 500MB
|
||||
storageQuota := services.DefaultTenantStorageMB
|
||||
if p.StorageQuotaMB != nil && *p.StorageQuotaMB > 0 {
|
||||
storageQuota = *p.StorageQuotaMB
|
||||
@@ -469,8 +437,6 @@ func (c *PlatformTenantController) CreateTenant() {
|
||||
return
|
||||
}
|
||||
|
||||
// 指定已有身份为租户管理员(可选):只建绑定,不新建账号、不改密码。
|
||||
// 绑定失败不影响租户创建结果,仅返回警告信息。
|
||||
adminBound := false
|
||||
adminWarn := ""
|
||||
if bound, bErr := bindTenantAdminFromPayload(uint64(id), p); bErr != nil {
|
||||
@@ -492,8 +458,6 @@ func (c *PlatformTenantController) CreateTenant() {
|
||||
_ = c.ServeJSON()
|
||||
}
|
||||
|
||||
// EditTenant çźčžç§ćˇ
|
||||
// POST /platform/tenant/editTenant/:id
|
||||
func (c *PlatformTenantController) EditTenant() {
|
||||
id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
|
||||
if err != nil || id == 0 {
|
||||
@@ -524,20 +488,17 @@ func (c *PlatformTenantController) EditTenant() {
|
||||
if p.PackageID != nil {
|
||||
pkgID := *p.PackageID
|
||||
if pkgID > 0 {
|
||||
// 套餐切换/续费:按套餐有效时长重新计费(同套餐未到期在原到期时间上顺延),不动用户数上限
|
||||
if _, err := services.ApplyPackageToTenant(id, pkgID, false); err != nil {
|
||||
c.Data["json"] = map[string]interface{}{"code": 400, "msg": err.Error()}
|
||||
_ = c.ServeJSON()
|
||||
return
|
||||
}
|
||||
} else {
|
||||
// 解绑套餐:回退未绑定状态(视为默认套餐),清除计费到期时间
|
||||
update["package_id"] = 0
|
||||
update["package_expire_time"] = nil
|
||||
}
|
||||
}
|
||||
if p.UserQuota != nil {
|
||||
// 用户数上限只增不减:不允许调低到当前已开用户数以下
|
||||
used, _ := services.CountTenantUsers(id)
|
||||
quota := *p.UserQuota
|
||||
if quota > 0 && quota < used {
|
||||
@@ -553,7 +514,6 @@ func (c *PlatformTenantController) EditTenant() {
|
||||
}
|
||||
}
|
||||
if p.StorageQuotaMB != nil {
|
||||
// 附件空间基础额度:允许平台赠送/降级;0 视为恢复默认 500MB
|
||||
storageQuota := *p.StorageQuotaMB
|
||||
if storageQuota <= 0 {
|
||||
storageQuota = services.DefaultTenantStorageMB
|
||||
@@ -572,8 +532,6 @@ func (c *PlatformTenantController) EditTenant() {
|
||||
_ = c.ServeJSON()
|
||||
}
|
||||
|
||||
// DeleteTenant ĺ é¤ç§ćˇ
|
||||
// DELETE /platform/tenant/deleteTenant/:id
|
||||
func (c *PlatformTenantController) DeleteTenant() {
|
||||
id, err := strconv.ParseUint(c.Ctx.Input.Param(":id"), 10, 64)
|
||||
if err != nil || id == 0 {
|
||||
@@ -593,9 +551,6 @@ func (c *PlatformTenantController) DeleteTenant() {
|
||||
_ = c.ServeJSON()
|
||||
}
|
||||
|
||||
// FindTenantCode ć ĄéŞç§ćˇçźç ćŻĺŚéĺ¤
|
||||
// GET /platform/tenant/findTenantCode?tenant_code=xxxxxx
|
||||
// čżĺ code=200 襨示ĺŻç¨ďźé200襨示éĺ¤/ä¸ĺŻç¨ďźĺ獯äźčŞĺ¨éć°çćďź
|
||||
func (c *PlatformTenantController) FindTenantCode() {
|
||||
code := strings.TrimSpace(c.GetString("tenant_code"))
|
||||
if code == "" {
|
||||
|
||||
Reference in new issue
Block a user