云泽科技官网全新改版上线，本次改版聚焦信息架构与访问体验。
', 1, 1, 1, 0, 1, NOW()); + ('温新云科技官网全新改版上线', '本次改版聚焦信息架构与访问体验，欢迎反馈建议。', + '温新云科技官网全新改版上线，本次改版聚焦信息架构与访问体验。
', 1, 1, 1, 0, 1, NOW()); diff --git a/go/migrate_auth_conflict_20260919004551.csv b/go/migrate_auth_conflict_20260919004551.csv deleted file mode 100644 index 0e4bc1c..0000000 --- a/go/migrate_auth_conflict_20260919004551.csv +++ /dev/null @@ -1,2 +0,0 @@ -merge_key,row_count,password_variants,tids,representative_id -m:19895983967,2,2,1|2,4 diff --git a/go/migrate_auth_conflict_20260919004725.csv b/go/migrate_auth_conflict_20260919004725.csv deleted file mode 100644 index 0e4bc1c..0000000 --- a/go/migrate_auth_conflict_20260919004725.csv +++ /dev/null @@ -1,2 +0,0 @@ -merge_key,row_count,password_variants,tids,representative_id -m:19895983967,2,2,1|2,4 diff --git a/go/migrate_auth_map_20260919004727.csv b/go/migrate_auth_map_20260919004727.csv deleted file mode 100644 index 9e1fd56..0000000 --- a/go/migrate_auth_map_20260919004727.csv +++ /dev/null @@ -1,4 +0,0 @@ -old_id,old_uid,tid,identity_id,tenant_user_id,account,merge_key,conflict -2,96085169,2,1,1,test1,m:13357867407,false -1,88888888,1,2,2,hero920103,m:19895983967,true -4,67091493,2,2,3,hero920103,m:19895983967,true diff --git a/go/models/auth_tenant_apply.go b/go/models/auth_tenant_apply.go index 9525169..8dcd459 100644 --- a/go/models/auth_tenant_apply.go +++ b/go/models/auth_tenant_apply.go @@ -22,6 +22,13 @@ const ( type AuthTenantApply struct { ID uint64 `orm:"column(id);pk;auto" json:"id"` IdentityID uint64 `orm:"column(identity_id)" json:"identity_id"` + // 小程序「挂靠企业」填写的资料：姓名 / 部门 / 职位 / 微信手机号（只读，后端取身份手机号） + ApplicantName string `orm:"column(applicant_name);size(64);default('')" json:"applicant_name"` + DepartmentID uint64 `orm:"column(department_id);default(0)" json:"department_id"` + DepartmentName string `orm:"column(department_name);size(128);default('')" json:"department_name"` + PositionID uint64 `orm:"column(position_id);default(0)" json:"position_id"` + PositionName string `orm:"column(position_name);size(128);default('')" json:"position_name"` + WechatMobile string `orm:"column(wechat_mobile);size(20);default('')" json:"wechat_mobile"` Type int8 `orm:"column(type);default(1)" json:"type"` Tid uint64 `orm:"column(tid);default(0)" json:"tid"` TenantName string `orm:"column(tenant_name);size(128);default('')" json:"tenant_name"` diff --git a/go/output.log b/go/output.log deleted file mode 100644 index b475a1f..0000000 Binary files a/go/output.log and /dev/null differ diff --git a/go/routers/api/api.go b/go/routers/api/api.go index 35d9cc9..c165da9 100644 --- a/go/routers/api/api.go +++ b/go/routers/api/api.go @@ -185,4 +185,16 @@ func Register() { beego.Router("/api/guest/data/:id", &controllers.GuestController{}, "put:DataUpdate;delete:DataDelete") // 移动端用户自定义「常用功能」保存（读取随 /api/home 下发 quick_menu_ids） beego.Router("/api/quick-menus", &controllers.AppAggregateController{}, "post:SaveQuickMenus") + + // ===== 小程序新用户引导：手机号 → 设密码注册 → 创建 / 挂靠企业 ===== + // 公开路径（不在 jwt 保护前缀内）：phone / register 由微信凭证与注册票据自证， + // 其余端点由控制器自行校验 Bearer 令牌（含 tid=0 的未加入企业令牌）。 + beego.Router("/api/onboarding/phone", &controllers.OnboardingController{}, "post:Phone") + beego.Router("/api/onboarding/register", &controllers.OnboardingController{}, "post:Register") + beego.Router("/api/onboarding/status", &controllers.OnboardingController{}, "get:Status") + beego.Router("/api/onboarding/tenants", &controllers.OnboardingController{}, "get:Tenants") + beego.Router("/api/onboarding/departments", &controllers.OnboardingController{}, "get:Departments") + beego.Router("/api/onboarding/positions", &controllers.OnboardingController{}, "get:Positions") + beego.Router("/api/onboarding/apply-join", &controllers.OnboardingController{}, "post:ApplyJoin") + beego.Router("/api/onboarding/apply-create", &controllers.OnboardingController{}, "post:ApplyCreate") } diff --git a/go/services/identity_register.go b/go/services/identity_register.go index e99cc4b..abc8cd7 100644 --- a/go/services/identity_register.go +++ b/go/services/identity_register.go @@ -436,8 +436,20 @@ func SearchTenantsForRegister(keyword string) ([]TenantSearchItem, error) { return out, nil } +// JoinApplyDetail 小程序「挂靠企业」补充资料。 +// 手机号不允许前端传：统一由后端从身份表读取微信验证过的手机号。 +type JoinApplyDetail struct { + ApplicantName string + DepartmentID uint64 + DepartmentName string + PositionID uint64 + PositionName string + WechatMobile string +} + // CreateJoinApply 「绑定企业」申请：等待目标企业管理员审批 -func CreateJoinApply(identityID, tid uint64) (*models.AuthTenantApply, error) { +// detail 为可选参数，PC 两步式注册沿用原调用（不传），小程序挂靠表单传入补充资料。 +func CreateJoinApply(identityID, tid uint64, detail ...JoinApplyDetail) (*models.AuthTenantApply, error) { if identityID == 0 || tid == 0 { return nil, errors.New("参数错误") } @@ -477,7 +489,22 @@ func CreateJoinApply(identityID, tid uint64) (*models.AuthTenantApply, error) { TenantName: tenant.TenantName, Status: models.TenantApplyStatusPending, } - apply.ContactPerson = identityNickname(identity) + // 小程序挂靠表单：补充姓名 / 部门 / 职位，手机号取微信验证过的身份手机号 + if len(detail) > 0 { + d := detail[0] + apply.ApplicantName = strings.TrimSpace(d.ApplicantName) + apply.DepartmentID = d.DepartmentID + apply.DepartmentName = strings.TrimSpace(d.DepartmentName) + apply.PositionID = d.PositionID + apply.PositionName = strings.TrimSpace(d.PositionName) + apply.WechatMobile = strings.TrimSpace(d.WechatMobile) + if apply.ApplicantName != "" { + apply.ContactPerson = apply.ApplicantName + } + } + if apply.ContactPerson == "" { + apply.ContactPerson = identityNickname(identity) + } if identity.Mobile != nil { apply.ContactPhone = *identity.Mobile } @@ -622,6 +649,13 @@ func ApproveJoinApply(applyID, tid, reviewerID uint64, reviewerName string) erro if err := bindIdentityToTenant(identity, tid, models.GetTenantUserRole); err != nil { return err } + // 挂靠申请选了部门：审批通过后把 org_id 落到认证中心绑定行 + if apply.DepartmentID > 0 { + _, _ = models.Orm.QueryTable(new(models.AuthTenantUser)). + Filter("tid", tid). + Filter("identity_id", apply.IdentityID). + Update(map[string]interface{}{"org_id": apply.DepartmentID, "update_time": time.Now()}) + } return finishApply(apply, models.TenantApplyStatusPassed, "", reviewerID, reviewerName) } diff --git a/go/services/reminder_scheduler.go b/go/services/reminder_scheduler.go index 1ada761..ec21391 100644 --- a/go/services/reminder_scheduler.go +++ b/go/services/reminder_scheduler.go @@ -343,7 +343,7 @@ func (s *WechatMpSender) Send(ctx context.Context, reminder ReminderData, title, perr := wechatmp.PushToOpenID(cfg, openid, wechatmp.PushMessage{ Title: title, Content: content, - Remark: "来自云泽管理平台日程提醒", + Remark: "来自温新云平台日程提醒", }) if perr != nil { return false, perr diff --git a/go/services/wechatmini/api.go b/go/services/wechatmini/api.go index 51330db..c21547b 100644 --- a/go/services/wechatmini/api.go +++ b/go/services/wechatmini/api.go @@ -46,6 +46,8 @@ func (e *APIError) Explain() string { return "AppID 无效：请核对小程序后台「开发 → 开发管理」中的 AppID" case 40125: return "AppSecret 错误：请在小程序后台重置后复制新的 AppSecret 填入本页" + case 40164, 61004: + return "服务器出口 IP 不在白名单：请在小程序后台「开发管理 → 开发设置 → IP白名单」加入本服务器出口 IP" case 40226: return "该小程序未开通手机号快速验证能力：请在「开发管理 → 接口设置」中开通" case 45009: diff --git a/go/test-output-current.txt b/go/test-output-current.txt deleted file mode 100644 index c281cbd..0000000 Binary files a/go/test-output-current.txt and /dev/null differ diff --git a/go/test-output-tenant-login.txt b/go/test-output-tenant-login.txt deleted file mode 100644 index c281cbd..0000000 Binary files a/go/test-output-tenant-login.txt and /dev/null differ diff --git a/go/views/auth/forgot.tpl b/go/views/auth/forgot.tpl index b05367d..6f16643 100644 --- a/go/views/auth/forgot.tpl +++ b/go/views/auth/forgot.tpl @@ -187,7 +187,7 @@微信扫码登录
-使用微信「扫一扫」，扫码后在云泽小程序中点击确认
即可完成登录
使用微信「扫一扫」，扫码后在温新云小程序中点击确认
即可完成登录
二维码 5 分钟内有效，过期可点击刷新
@@ -799,7 +799,7 @@{{ form.login_title || "一次登录，全平台通行" }}
{{ form.login_subtitle || "基于 OIDC / OAuth 2.0 的统一身份底座" }}
diff --git a/platform/src/views/system/platformsettings/components/loginSettings.vue b/platform/src/views/system/platformsettings/components/loginSettings.vue
index 83d392c..74ee9f1 100644
--- a/platform/src/views/system/platformsettings/components/loginSettings.vue
+++ b/platform/src/views/system/platformsettings/components/loginSettings.vue
@@ -23,7 +23,7 @@