From ed0cc7561575434dc83c9b201cf500b7f5d88fb7 Mon Sep 17 00:00:00 2001 From: WangLX <519407855@qq.com> Date: Fri, 18 Sep 2026 19:06:18 +0800 Subject: [PATCH] fix admin invitations api url and account settings --- .../controlplane/auth/AuthController.java | 9 +++ .../moyi/controlplane/auth/AuthService.java | 65 +++++++++++++++++-- ...nvitation_secrets_and_account_settings.sql | 5 ++ docs/09-java-control-plane-node.md | 2 + docs/13-model-groups-registration-credit.md | 5 +- prototype/src/App.vue | 19 +++++- prototype/src/components/AccountAdmin.vue | 32 +++++++-- prototype/src/components/AccountSettings.vue | 60 +++++++++++++++++ prototype/src/services/auth.ts | 9 +++ prototype/src/services/catalog.ts | 9 ++- 10 files changed, 201 insertions(+), 14 deletions(-) create mode 100644 control-plane-java/src/main/resources/db/migration/V11__invitation_secrets_and_account_settings.sql create mode 100644 prototype/src/components/AccountSettings.vue diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java index 5b2bea5..071fcf2 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthController.java @@ -16,6 +16,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -59,6 +60,7 @@ public class AuthController { public record RoleRequest(String role) {} public record CreateUserRequest(String account, String password, String displayName) {} + public record AccountSettingsRequest(String displayName, String currentPassword, String newPassword) {} @PostMapping("/admin/users") public ResponseEntity> createUser(@RequestBody CreateUserRequest input, HttpServletRequest request) { @@ -102,6 +104,13 @@ public class AuthController { return Map.of("user", authService.requireUser(sessionToken(request))); } + @PatchMapping("/auth/account") + public Map updateAccount(@RequestBody AccountSettingsRequest input, HttpServletRequest request) { + return Map.of("user", authService.updateAccount( + sessionToken(request), input.displayName(), input.currentPassword(), input.newPassword(), meta(request) + )); + } + @GetMapping("/admin/users") public Map users(HttpServletRequest request) { return Map.of("users", authService.listUsers(sessionToken(request))); diff --git a/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthService.java b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthService.java index 6411139..e9081dd 100644 --- a/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthService.java +++ b/control-plane-java/src/main/java/com/moyi/controlplane/auth/AuthService.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.moyi.controlplane.common.ApiException; +import com.moyi.controlplane.security.SecretCipher; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -18,6 +19,7 @@ import java.util.Map; import java.util.UUID; import java.util.regex.Pattern; import org.springframework.beans.factory.annotation.Value; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; @@ -31,17 +33,31 @@ public class AuthService { private final PasswordHasher passwordHasher; private final ObjectMapper objectMapper; private final int sessionTtlHours; + private final SecretCipher secretCipher; + /** Kept for isolated unit tests that do not exercise encrypted invitation display. */ public AuthService( JdbcTemplate jdbc, PasswordHasher passwordHasher, ObjectMapper objectMapper, @Value("${moyi.auth.session-ttl-hours}") int sessionTtlHours + ) { + this(jdbc, passwordHasher, objectMapper, sessionTtlHours, null); + } + + @Autowired + public AuthService( + JdbcTemplate jdbc, + PasswordHasher passwordHasher, + ObjectMapper objectMapper, + @Value("${moyi.auth.session-ttl-hours}") int sessionTtlHours, + SecretCipher secretCipher ) { this.jdbc = jdbc; this.passwordHasher = passwordHasher; this.objectMapper = objectMapper; this.sessionTtlHours = sessionTtlHours; + this.secretCipher = secretCipher; } public record UserView( @@ -209,6 +225,37 @@ public class AuthService { return toView(findUserById(userId), null); } + @Transactional + public UserView updateAccount( + String token, + String displayNameInput, + String currentPassword, + String newPassword, + RequestMeta meta + ) { + UserRow user = requireUserRow(token); + String displayName = displayNameInput == null ? user.displayName() : displayNameInput.trim(); + if (displayName.isBlank() || displayName.length() > 80) { + throw new ApiException("INVALID_NAME", "显示名称不能为空且最多 80 字符", 400); + } + boolean changingPassword = newPassword != null && !newPassword.isBlank(); + if (changingPassword) { + if (currentPassword == null || currentPassword.isBlank() || !passwordHasher.matches(currentPassword, user.passwordHash())) { + throw new ApiException("INVALID_CURRENT_PASSWORD", "当前密码错误", 403); + } + if (newPassword.length() > 256 || (!"super_admin".equals(user.role()) && newPassword.length() < 8)) { + throw new ApiException("WEAK_PASSWORD", "普通用户新密码长度为 8 至 256 位", 400); + } + } + if (changingPassword) { + jdbc.update("UPDATE users SET display_name = ?, password_hash = ?, updated_at = ? WHERE id = ?", displayName, passwordHasher.hash(newPassword), now(), user.id()); + } else { + jdbc.update("UPDATE users SET display_name = ?, updated_at = ? WHERE id = ?", displayName, now(), user.id()); + } + audit("user.account_updated", user.id(), meta, Map.of("passwordChanged", changingPassword)); + return toView(findUserById(user.id()), null); + } + private boolean isAdminRole(String role) { return "admin".equals(role) || "super_admin".equals(role); } @@ -267,8 +314,9 @@ public class AuthService { OffsetDateTime createdAt = now(); int allowedUses = maxUses == null ? 1 : Math.max(1, maxUses); jdbc.update( - "INSERT INTO invitation_codes (id, code_hash, code_prefix, label, max_uses, used_count, expires_at, created_by, created_at) VALUES (?, ?, ?, ?, ?, 0, ?, ?, ?)", + "INSERT INTO invitation_codes (id, code_hash, code_prefix, code_ciphertext, label, max_uses, used_count, expires_at, created_by, created_at) VALUES (?, ?, ?, ?, ?, ?, 0, ?, ?, ?)", id, hashSecret(code), code.substring(0, Math.min(code.length(), 10)), + secretCipher == null ? null : secretCipher.encrypt(code), label == null || label.isBlank() ? "内测邀请码" : label.trim(), allowedUses, expiresAt, admin.id(), createdAt ); audit("invitation.created", admin.id(), meta, Map.of("invitationId", id)); @@ -276,19 +324,20 @@ public class AuthService { "code", code, "invitation", invitationView(id, code.substring(0, Math.min(code.length(), 10)), label == null || label.isBlank() ? "内测邀请码" : label.trim(), allowedUses, 0, - expiresAt, null, admin.id(), createdAt) + expiresAt, null, admin.id(), createdAt, code) ); } public List> listInvitations(String token) { requireAdmin(token); return jdbc.query( - "SELECT id, code_prefix, label, max_uses, used_count, expires_at, disabled_at, created_by, created_at FROM invitation_codes ORDER BY created_at DESC", + "SELECT id, code_prefix, code_ciphertext, label, max_uses, used_count, expires_at, disabled_at, created_by, created_at FROM invitation_codes ORDER BY created_at DESC", (resultSet, rowNumber) -> invitationView( resultSet.getObject("id", UUID.class), resultSet.getString("code_prefix"), resultSet.getString("label"), resultSet.getInt("max_uses"), resultSet.getInt("used_count"), resultSet.getObject("expires_at", OffsetDateTime.class), resultSet.getObject("disabled_at", OffsetDateTime.class), - resultSet.getObject("created_by", UUID.class), resultSet.getObject("created_at", OffsetDateTime.class) + resultSet.getObject("created_by", UUID.class), resultSet.getObject("created_at", OffsetDateTime.class), + decryptInvitationCode(resultSet.getString("code_ciphertext")) ) ); } @@ -398,11 +447,12 @@ public class AuthService { private Map invitationView( UUID id, String prefix, String label, int maxUses, int usedCount, OffsetDateTime expiresAt, - OffsetDateTime disabledAt, UUID createdBy, OffsetDateTime createdAt + OffsetDateTime disabledAt, UUID createdBy, OffsetDateTime createdAt, String code ) { Map result = new java.util.LinkedHashMap<>(); result.put("id", id); result.put("codePrefix", prefix); + if (code != null && !code.isBlank()) result.put("code", code); result.put("label", label); result.put("maxUses", maxUses); result.put("usedCount", usedCount); @@ -413,6 +463,11 @@ public class AuthService { return result; } + private String decryptInvitationCode(String ciphertext) { + if (ciphertext == null || ciphertext.isBlank() || secretCipher == null) return null; + return secretCipher.decrypt(ciphertext); + } + private Map readJson(String value) { try { return objectMapper.readValue(value, new TypeReference<>() {}); diff --git a/control-plane-java/src/main/resources/db/migration/V11__invitation_secrets_and_account_settings.sql b/control-plane-java/src/main/resources/db/migration/V11__invitation_secrets_and_account_settings.sql new file mode 100644 index 0000000..3d42a66 --- /dev/null +++ b/control-plane-java/src/main/resources/db/migration/V11__invitation_secrets_and_account_settings.sql @@ -0,0 +1,5 @@ +ALTER TABLE invitation_codes + ADD COLUMN IF NOT EXISTS code_ciphertext text; + +COMMENT ON COLUMN invitation_codes.code_ciphertext IS + 'Reversible encrypted invitation code for authorized admin display; code_hash remains the lookup value.'; diff --git a/docs/09-java-control-plane-node.md b/docs/09-java-control-plane-node.md index 0c49bb1..e977db5 100644 --- a/docs/09-java-control-plane-node.md +++ b/docs/09-java-control-plane-node.md @@ -19,6 +19,7 @@ | `POST /api/auth/login` | 公开 | 账号密码登录 | | `POST /api/auth/register` | 公开 | 邀请码注册 | | `GET /api/auth/me` | 登录用户 | 当前会话用户 | +| `PATCH /api/auth/account` | 登录用户 | 修改显示名称或密码 | | `POST /api/auth/logout` | 登录用户 | 撤销当前会话 | | `GET /api/models` | 登录用户 | 用户端模型广场目录 | | `GET/POST /api/projects` | 登录用户 | 工作区/项目基础管理 | @@ -54,6 +55,7 @@ - `V6__seed_catalog.sql`:本地首批模型目录初始数据,可由管理员继续增删改造。 - `V7__async_tasks.sql`:3D/视频异步任务、状态和结果元数据。 - `V8__usage_payload_audit.sql`:调用/任务输入输出、分发 Key、供应商、错误、管理员备注和软删除字段。 +- `V11__invitation_secrets_and_account_settings.sql`:保存新邀请码的加密副本,支持管理端记录页再次复制。 Java 版本沿用现有 TypeScript 服务的表命名,便于后续迁移 RDS;供应商密钥只返回掩码,数据库保存 AES-GCM 密文,主密钥由 `CREDENTIAL_ENCRYPTION_KEY` 注入。生产环境应进一步使用 KMS/RAM 托管该主密钥。 diff --git a/docs/13-model-groups-registration-credit.md b/docs/13-model-groups-registration-credit.md index 41e7970..ddaa262 100644 --- a/docs/13-model-groups-registration-credit.md +++ b/docs/13-model-groups-registration-credit.md @@ -8,12 +8,15 @@ - Key:先选模型,再勾选该模型的分组,可继续切换模型配置其他分组。授权只包含已保存的分组,不自动扩展到未来新增分组。清空授权后 Key 不能调用模型。 - 在线调试:模型和分组直接下拉选择;无需返回模型广场。 - 用户与额度:管理员可直接开通普通账号、创建邀请、发放人民币金额并查看流水;只有超级管理员能升降管理员角色。 +- 邀请记录:新创建的邀请码会以加密形式保存在专用数据库中,管理员可在“用户与额度 → 邀请码记录”再次复制或停用;升级前已经创建的旧邀请码只保留哈希和前缀,不能恢复原文。 +- 账号设置:用户菜单中的“账号设置”可以修改显示名称和密码;修改密码必须验证当前密码,普通用户新密码至少 8 位,超级管理员沿用其自定义长度规则。 +- 统一 API 地址:生产前端按当前访问域名生成 `https://<域名>/v1`,本地开发仍使用开发环境的 Control Plane 地址。 `/api/models` 保留 `models`(分组/调用路由列表),新增 `logicalModels`(模型定义)。调用仍使用分组的 `id` 作为 `/v1/chat/completions` 的 `model` 值;`modelKey` 是可编辑的展示标识,不是自动路由或授权通配符。 ## 旧数据升级 -Flyway V10 自动将每条旧目录项转换为一个模型和一个既有分组;保留旧调用 ID、Key 权限及凭据。为避免错误合并,不按名称自动合并旧模型。需要合并时,在“编辑分组”中更改所属模型,再停用已无分组的旧模型即可。 +Flyway V10 自动将每条旧目录项转换为一个模型和一个既有分组;V11 为新邀请码增加加密副本;保留旧调用 ID、Key 权限及凭据。为避免错误合并,不按名称自动合并旧模型。需要合并时,在“编辑分组”中更改所属模型,再停用已无分组的旧模型即可。 停用渠道、模型或分组后,对应调用立即不可用;旧 Key 的既有授权仍保留,重新启用后恢复。不能给 Key 新增已停用分组的权限。同一模型内分组名称不能重复。 diff --git a/prototype/src/App.vue b/prototype/src/App.vue index 9492798..1c878cb 100644 --- a/prototype/src/App.vue +++ b/prototype/src/App.vue @@ -17,6 +17,7 @@ import { adminNavigation, userNavigation } from './data' import AuthView from './views/AuthView.vue' import AdminConsole from './views/AdminConsole.vue' import UserConsole from './views/UserConsole.vue' +import AccountSettings from './components/AccountSettings.vue' import type { Portal } from './types' import { authClient, type AuthUser } from './services/auth' @@ -30,6 +31,7 @@ const authUser = ref() const accountMenuOpen = ref(false) const userName = ref('') const availableCredit = ref() +const accountSettingsOpen = ref(false) onMounted(async () => { try { @@ -93,8 +95,13 @@ function logout() { function openAccountSettings() { accountMenuOpen.value = false - if (portal.value === 'admin') navigate('admin-settings') - else notify('账号设置将在后续阶段开放') + accountSettingsOpen.value = true +} + +function accountSaved(user: AuthUser) { + authUser.value = user + userName.value = user.displayName + accountSettingsOpen.value = false } @@ -173,5 +180,13 @@ function openAccountSettings() { + +
{{ toastMessage }}
diff --git a/prototype/src/components/AccountAdmin.vue b/prototype/src/components/AccountAdmin.vue index c0f8c44..3f517a5 100644 --- a/prototype/src/components/AccountAdmin.vue +++ b/prototype/src/components/AccountAdmin.vue @@ -1,13 +1,14 @@