From 222c3790dc9e4e88bde93fce5e38e0623be35ab2 Mon Sep 17 00:00:00 2001 From: ouyangxq <775153912@qq.com> Date: Tue, 1 Sep 2026 19:15:32 +0800 Subject: [PATCH] feat(auth): support username or phone login --- .../controller/InternalAccountController.java | 14 +++ .../auth/dto/AccountManagementDtos.java | 19 +++- .../com/baiyue/auth/dto/LoginRequest.java | 6 +- .../auth/dto/MerchantRegisterRequest.java | 4 +- .../com/baiyue/auth/entity/AuthAccount.java | 1 + .../repository/AuthAccountRepository.java | 23 ++++ .../service/AccountManagementService.java | 46 +++++++- .../com/baiyue/auth/service/AuthService.java | 9 +- .../service/MerchantRegistrationService.java | 8 +- .../resources/db/auth-login-identifiers.sql | 43 ++++++++ auth/src/main/resources/db/auth.sql | 2 + .../service/AccountManagementServiceTest.java | 28 +++++ .../auth/service/AuthServiceSmallJwtTest.java | 28 +++++ .../baiyue/iam/client/AuthAccountClient.java | 25 ++++- .../controller/MerchantTenantController.java | 15 ++- .../java/com/baiyue/iam/dto/MemberDtos.java | 6 +- .../com/baiyue/iam/dto/OnboardingDtos.java | 4 +- .../iam/dto/PlatformInternalUserDtos.java | 6 +- .../iam/dto/PlatformUserManagementDtos.java | 2 +- .../java/com/baiyue/iam/dto/ProfileDtos.java | 7 +- .../com/baiyue/iam/service/MemberService.java | 7 +- .../iam/service/PersonalProfileService.java | 39 ++++++- .../service/PlatformInternalUserService.java | 9 +- .../PlatformUserManagementService.java | 7 +- .../iam/service/ProfileResourceService.java | 26 +++-- ...enantAdministratorProvisioningService.java | 2 +- .../com/baiyue/iam/service/TenantService.java | 5 +- iam/src/main/resources/openapi/iam-v1.yaml | 103 ++++++++++++++++-- .../baiyue/iam/service/MemberServiceTest.java | 3 + .../MerchantQualificationUploadTest.java | 19 ++++ .../service/PersonalProfileServiceTest.java | 26 ++++- .../baiyue/iam/service/TenantServiceTest.java | 12 +- 32 files changed, 486 insertions(+), 68 deletions(-) create mode 100644 auth/src/main/resources/db/auth-login-identifiers.sql diff --git a/auth/src/main/java/com/baiyue/auth/controller/InternalAccountController.java b/auth/src/main/java/com/baiyue/auth/controller/InternalAccountController.java index 643bb1607..966201676 100644 --- a/auth/src/main/java/com/baiyue/auth/controller/InternalAccountController.java +++ b/auth/src/main/java/com/baiyue/auth/controller/InternalAccountController.java @@ -85,6 +85,20 @@ public class InternalAccountController { @PathVariable Long id, @Valid @RequestBody UpdateAccountProfileRequest request) { verify(token); service.updateProfile(id, request); return ApiResponse.success(null); } + @PutMapping("/{id}/login-identifiers") + public ApiResponse loginIdentifiers( + @RequestHeader(value="X-Internal-Service-Token", required=false) String token, + @PathVariable Long id, @Valid @RequestBody ChangeLoginIdentifiersRequest request) { + verify(token); + return ApiResponse.success(service.changeLoginIdentifiers(id, request)); + } + @PutMapping("/{id}/phone") + public ApiResponse phone(@RequestHeader(value="X-Internal-Service-Token", required=false) String token, + @PathVariable Long id, @Valid @RequestBody UpdateAccountPhoneRequest request) { + verify(token); + service.updatePhone(id, request); + return ApiResponse.success(null); + } @PutMapping("/{id}/password") public ApiResponse reset(@RequestHeader(value="X-Internal-Service-Token", required=false) String token, @PathVariable Long id, @Valid @RequestBody ResetPasswordRequest request) { diff --git a/auth/src/main/java/com/baiyue/auth/dto/AccountManagementDtos.java b/auth/src/main/java/com/baiyue/auth/dto/AccountManagementDtos.java index 80dbe0f85..786deac67 100644 --- a/auth/src/main/java/com/baiyue/auth/dto/AccountManagementDtos.java +++ b/auth/src/main/java/com/baiyue/auth/dto/AccountManagementDtos.java @@ -21,7 +21,8 @@ public final class AccountManagementDtos { @Pattern(regexp = "^(?=.*[A-Za-z])(?=.*\\d).+$", message = "密码必须同时包含字母和数字") String newPassword) { } public record CreateAccountRequest(@NotNull Long accountId, - @NotBlank @Pattern(regexp = "^[A-Za-z0-9_.@-]{4,64}$") String username, + @NotBlank @Pattern(regexp = "^[A-Za-z][A-Za-z0-9_.@-]{3,63}$") String username, + @Pattern(regexp = "^1\\d{10}$") String phone, @NotBlank @Size(min = 8, max = 64) @Pattern(regexp = "^(?=.*[A-Za-z])(?=.*\\d).+$", message = "密码必须同时包含字母和数字") String password, @NotBlank String displayName, @NotNull Long tenantId, @@ -32,9 +33,19 @@ public final class AccountManagementDtos { String accountStatus) { public CreateAccountRequest(Long accountId, String username, String password, String displayName, Long tenantId, Long membershipId, String appCode) { - this(accountId, username, password, displayName, tenantId, membershipId, appCode, "ACTIVE"); + this(accountId, username, null, password, displayName, tenantId, membershipId, appCode, "ACTIVE"); + } + public CreateAccountRequest(Long accountId, String username, String password, String displayName, + Long tenantId, Long membershipId, String appCode, String accountStatus) { + this(accountId, username, null, password, displayName, tenantId, membershipId, appCode, accountStatus); } } + public record ChangeLoginIdentifiersRequest( + @NotBlank @Pattern(regexp = "^[A-Za-z][A-Za-z0-9_.@-]{3,63}$") String username, + @NotBlank @Pattern(regexp = "^1\\d{10}$") String phone, + @NotBlank String currentPassword) { } + public record UpdateAccountPhoneRequest( + @NotBlank @Pattern(regexp = "^1\\d{10}$") String phone) { } public record UpdateAccountProfileRequest(@NotBlank @Size(max = 64) String displayName) { } public record UpdateAccountStatusRequest(@NotBlank String status) { } public record RevokeAccountSessionsRequest( @@ -56,10 +67,10 @@ public final class AccountManagementDtos { public record ImpersonationExchangeRequest(@NotBlank String code) { } public record UpdateAccountScopeRequest(@NotNull Long tenantId, @NotNull Long membershipId, @NotBlank @Pattern(regexp = "MERCHANT|PLATFORM") String appCode) { } - public record AccountSummary(Long accountId, String username, String displayName, String status, + public record AccountSummary(Long accountId, String username, String phone, String displayName, String status, LocalDateTime lastLoginAt, Long tenantId, Long membershipId, String appCode) { public AccountSummary(Long accountId, String username, String displayName, String status) { - this(accountId, username, displayName, status, null, null, null, null); + this(accountId, username, null, displayName, status, null, null, null, null); } } } diff --git a/auth/src/main/java/com/baiyue/auth/dto/LoginRequest.java b/auth/src/main/java/com/baiyue/auth/dto/LoginRequest.java index db5b95596..5e09a4298 100644 --- a/auth/src/main/java/com/baiyue/auth/dto/LoginRequest.java +++ b/auth/src/main/java/com/baiyue/auth/dto/LoginRequest.java @@ -2,13 +2,15 @@ package com.baiyue.auth.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; /** * 登录请求契约，接收账号、密码和目标应用域等统一登录参数。 */ @Schema(name = "LoginRequest", description = "Unified login credentials / 统一登录凭据") public record LoginRequest( - @Schema(description = "Login username / 登录用户名", example = "merchant_admin") @NotBlank String username, + @Schema(description = "Username or mainland China mobile number / 用户名或中国大陆手机号", example = "merchant_admin") + @NotBlank @Size(max = 64) String loginId, @Schema(description = "Login password / 登录密码", example = "ChangeMe123!", format = "password") @NotBlank String password ) { -} \ No newline at end of file +} diff --git a/auth/src/main/java/com/baiyue/auth/dto/MerchantRegisterRequest.java b/auth/src/main/java/com/baiyue/auth/dto/MerchantRegisterRequest.java index 695e36832..570d4a6a9 100644 --- a/auth/src/main/java/com/baiyue/auth/dto/MerchantRegisterRequest.java +++ b/auth/src/main/java/com/baiyue/auth/dto/MerchantRegisterRequest.java @@ -8,12 +8,12 @@ import jakarta.validation.constraints.Size; @Schema(name = "MerchantRegisterRequest", description = "Phase-one merchant account registration") public record MerchantRegisterRequest( - @NotBlank @Pattern(regexp = "[A-Za-z0-9_]{4,64}") String username, + @NotBlank @Pattern(regexp = "^[A-Za-z][A-Za-z0-9_.@-]{3,63}$") String username, @NotBlank @Size(min = 8, max = 72) String password, @NotBlank @Size(max = 64) String displayName, @NotBlank @Size(max = 128) String companyName, @NotBlank @Size(max = 64) String legalPerson, - @NotBlank @Size(max = 32) String legalPhone, + @NotBlank @Pattern(regexp = "^1\\d{10}$") String legalPhone, @Email @Size(max = 128) String contactEmail, @Size(min = 2, max = 2) String countryCode, @Size(max = 255) String address diff --git a/auth/src/main/java/com/baiyue/auth/entity/AuthAccount.java b/auth/src/main/java/com/baiyue/auth/entity/AuthAccount.java index a26a18d33..22f96b839 100644 --- a/auth/src/main/java/com/baiyue/auth/entity/AuthAccount.java +++ b/auth/src/main/java/com/baiyue/auth/entity/AuthAccount.java @@ -18,6 +18,7 @@ import java.time.LocalDateTime; public class AuthAccount { @TableId private Long id; private String username; + private String phone; private String passwordHash; private String displayName; private String accountStatus; diff --git a/auth/src/main/java/com/baiyue/auth/repository/AuthAccountRepository.java b/auth/src/main/java/com/baiyue/auth/repository/AuthAccountRepository.java index f4102abb5..636a1efe0 100644 --- a/auth/src/main/java/com/baiyue/auth/repository/AuthAccountRepository.java +++ b/auth/src/main/java/com/baiyue/auth/repository/AuthAccountRepository.java @@ -22,11 +22,34 @@ public class AuthAccountRepository { .last("LIMIT 1")); } + public AuthAccount findByPhone(String phone) { + return mapper.selectOne(new LambdaQueryWrapper() + .eq(AuthAccount::getPhone, phone) + .last("LIMIT 1")); + } + public boolean existsByUsername(String username) { return mapper.selectCount(new LambdaQueryWrapper() .eq(AuthAccount::getUsername, username)) > 0; } + public boolean existsByPhone(String phone) { + return mapper.selectCount(new LambdaQueryWrapper() + .eq(AuthAccount::getPhone, phone)) > 0; + } + + public boolean existsByUsernameForOtherAccount(String username, Long accountId) { + return mapper.selectCount(new LambdaQueryWrapper() + .eq(AuthAccount::getUsername, username) + .ne(AuthAccount::getId, accountId)) > 0; + } + + public boolean existsByPhoneForOtherAccount(String phone, Long accountId) { + return mapper.selectCount(new LambdaQueryWrapper() + .eq(AuthAccount::getPhone, phone) + .ne(AuthAccount::getId, accountId)) > 0; + } + public void insert(AuthAccount account) { mapper.insert(account); } public AuthAccount findById(Long id) { diff --git a/auth/src/main/java/com/baiyue/auth/service/AccountManagementService.java b/auth/src/main/java/com/baiyue/auth/service/AccountManagementService.java index 795a40b31..651cc0b8f 100644 --- a/auth/src/main/java/com/baiyue/auth/service/AccountManagementService.java +++ b/auth/src/main/java/com/baiyue/auth/service/AccountManagementService.java @@ -71,9 +71,13 @@ public class AccountManagementService { if (repository.existsByUsername(request.username())) { throw new BizException(ResultCode.CONFLICT, "登录账号已存在"); } + if (request.phone() != null && repository.existsByPhone(request.phone())) { + throw new BizException(ResultCode.CONFLICT, "手机号已存在"); + } AuthAccount account = new AuthAccount(); account.setId(request.accountId()); account.setUsername(request.username()); + account.setPhone(request.phone()); account.setPasswordHash(passwordEncoder.encode(request.password())); account.setDisplayName(request.displayName()); account.setAccountStatus(request.accountStatus() == null ? "ACTIVE" : request.accountStatus()); @@ -117,6 +121,45 @@ public class AccountManagementService { bumpVersion(account); } + @Transactional + @BusinessAudit(event = "ACCOUNT_LOGIN_IDENTIFIERS_CHANGE", resourceType = "ACCOUNT", resourceId = "#accountId", + description = "修改本人用户名和手机号", captureAfter = false) + public AccountSummary changeLoginIdentifiers(Long accountId, ChangeLoginIdentifiersRequest request) { + AuthAccount account = required(accountId); + if (!passwordEncoder.matches(request.currentPassword(), account.getPasswordHash())) { + throw new BizException(ResultCode.UNAUTHORIZED, "当前密码错误"); + } + String username = request.username().trim(); + String phone = request.phone().trim(); + if (repository.existsByUsernameForOtherAccount(username, accountId)) { + throw new BizException(ResultCode.CONFLICT, "用户名已存在"); + } + if (repository.existsByPhoneForOtherAccount(phone, accountId)) { + throw new BizException(ResultCode.CONFLICT, "手机号已存在"); + } + if (Objects.equals(account.getUsername(), username) && Objects.equals(account.getPhone(), phone)) { + return summary(account); + } + account.setUsername(username); + account.setPhone(phone); + bumpVersion(account); + return summary(account); + } + + @Transactional + @BusinessAudit(event = "ACCOUNT_PHONE_SYNC", resourceType = "ACCOUNT", resourceId = "#accountId", + description = "同步受管账号手机号", captureAfter = false) + public void updatePhone(Long accountId, UpdateAccountPhoneRequest request) { + AuthAccount account = required(accountId); + String phone = request.phone().trim(); + if (Objects.equals(account.getPhone(), phone)) return; + if (repository.existsByPhoneForOtherAccount(phone, accountId)) { + throw new BizException(ResultCode.CONFLICT, "手机号已存在"); + } + account.setPhone(phone); + bumpVersion(account); + } + @Transactional @BusinessAudit(event = "PASSWORD_RESET", resourceType = "ACCOUNT", resourceId = "#accountId", description = "管理员重置密码", captureAfter = false) public void resetPassword(Long accountId, ResetPasswordRequest request, boolean forceChangePassword) { @@ -185,7 +228,7 @@ public class AccountManagementService { } private AccountSummary summary(AuthAccount a) { - return new AccountSummary(a.getId(), a.getUsername(), a.getDisplayName(), a.getAccountStatus(), + return new AccountSummary(a.getId(), a.getUsername(), a.getPhone(), a.getDisplayName(), a.getAccountStatus(), a.getLastLoginAt(), a.getDefaultTenantId(), a.getDefaultMembershipId(), a.getDefaultAppCode()); } @@ -201,6 +244,7 @@ public class AccountManagementService { private boolean sameIdentity(AuthAccount account, CreateAccountRequest request, String appCode) { return Objects.equals(account.getUsername(), request.username()) + && Objects.equals(account.getPhone(), request.phone()) && Objects.equals(account.getDefaultTenantId(), request.tenantId()) && Objects.equals(account.getOperatorTenantId(), request.tenantId()) && Objects.equals(account.getDefaultMembershipId(), request.membershipId()) diff --git a/auth/src/main/java/com/baiyue/auth/service/AuthService.java b/auth/src/main/java/com/baiyue/auth/service/AuthService.java index 4f80622ee..51b84a88c 100644 --- a/auth/src/main/java/com/baiyue/auth/service/AuthService.java +++ b/auth/src/main/java/com/baiyue/auth/service/AuthService.java @@ -57,10 +57,13 @@ public class AuthService { @Transactional - @BusinessAudit(event = "AUTH_LOGIN", resourceType = "ACCOUNT", resourceId = "#request.username", + @BusinessAudit(event = "AUTH_LOGIN", resourceType = "ACCOUNT", resourceId = "#request.loginId", description = "User login / 用户登录", captureAfter = false) public TokenResponse login(LoginRequest request) { - AuthAccount account = accountRepository.findByUsername(request.username()); + String loginId = request.loginId().trim(); + AuthAccount account = loginId.matches("^1\\d{10}$") + ? accountRepository.findByPhone(loginId) + : accountRepository.findByUsername(loginId); if (account == null) throw invalidCredentials(); LocalDateTime now = LocalDateTime.now(); if (!"ACTIVE".equals(account.getAccountStatus())) @@ -211,7 +214,7 @@ public class AuthService { } private static BizException invalidCredentials() { - return new BizException(ResultCode.UNAUTHORIZED, "用户名或密码错误"); + return new BizException(ResultCode.UNAUTHORIZED, "登录标识或密码错误"); } } diff --git a/auth/src/main/java/com/baiyue/auth/service/MerchantRegistrationService.java b/auth/src/main/java/com/baiyue/auth/service/MerchantRegistrationService.java index d3fa0f65f..e0fc11be3 100644 --- a/auth/src/main/java/com/baiyue/auth/service/MerchantRegistrationService.java +++ b/auth/src/main/java/com/baiyue/auth/service/MerchantRegistrationService.java @@ -36,7 +36,10 @@ public class MerchantRegistrationService { resourceId = "#request.username", description = "商户注册", captureAfter = false) public MerchantRegisterResponse register(MerchantRegisterRequest request) { if (accountRepository.existsByUsername(request.username())) { - throw new BizException(ResultCode.CONFLICT, "Username already exists"); + throw new BizException(ResultCode.CONFLICT, "用户名已存在"); + } + if (accountRepository.existsByPhone(request.legalPhone())) { + throw new BizException(ResultCode.CONFLICT, "手机号已存在"); } long accountId = IdWorker.getId(); String passwordHash = passwordEncoder.encode(request.password()); @@ -81,6 +84,7 @@ public class MerchantRegistrationService { AuthAccount account = new AuthAccount(); account.setId(accountId); account.setUsername(request.username()); + account.setPhone(request.legalPhone()); account.setPasswordHash(passwordHash); account.setDisplayName(request.displayName()); account.setAccountStatus("ACTIVE"); @@ -94,7 +98,7 @@ public class MerchantRegistrationService { try { accountRepository.insert(account); } catch (DuplicateKeyException exception) { - BizException failure = new BizException(ResultCode.CONFLICT, "Username already exists"); + BizException failure = new BizException(ResultCode.CONFLICT, "用户名或手机号已存在"); failure.addSuppressed(exception); compensateOnboarding(accountId, failure, compensationCompleted); throw failure; diff --git a/auth/src/main/resources/db/auth-login-identifiers.sql b/auth/src/main/resources/db/auth-login-identifiers.sql new file mode 100644 index 000000000..e328e69b4 --- /dev/null +++ b/auth/src/main/resources/db/auth-login-identifiers.sql @@ -0,0 +1,43 @@ +-- Auth 单一登录标识增量：用户名或中国大陆手机号。 +-- 可重复执行；手机号仅从 IAM 当前用户档案回填，无法确认的账号保持 NULL。 +USE baiyue_auth; + +DROP PROCEDURE IF EXISTS auth_add_login_phone; +DELIMITER $$ +CREATE PROCEDURE auth_add_login_phone() +BEGIN + IF NOT EXISTS ( + SELECT 1 FROM information_schema.columns + WHERE table_schema = 'baiyue_auth' AND table_name = 'auth_account' AND column_name = 'phone') THEN + ALTER TABLE auth_account ADD COLUMN phone VARCHAR(32) NULL COMMENT '全局唯一中国大陆登录手机号' AFTER username; + END IF; +END$$ +DELIMITER ; +CALL auth_add_login_phone(); +DROP PROCEDURE auth_add_login_phone; + +DROP PROCEDURE IF EXISTS auth_backfill_login_phone; +DELIMITER $$ +CREATE PROCEDURE auth_backfill_login_phone() +BEGIN + IF EXISTS ( + SELECT user.phone + FROM baiyue_iam.iam_user user + WHERE user.deleted = 0 AND user.phone REGEXP '^1[0-9]{10}$' + GROUP BY user.phone HAVING COUNT(DISTINCT user.auth_user_id) > 1) THEN + SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = 'IAM 存在重复手机号，禁止建立 Auth 唯一登录索引'; + END IF; + UPDATE auth_account account + JOIN baiyue_iam.iam_user user ON user.auth_user_id = account.id AND user.deleted = 0 + SET account.phone = user.phone + WHERE account.phone IS NULL AND user.phone REGEXP '^1[0-9]{10}$'; + IF NOT EXISTS ( + SELECT 1 FROM information_schema.statistics + WHERE table_schema = 'baiyue_auth' AND table_name = 'auth_account' + AND index_name = 'uk_auth_account_phone') THEN + ALTER TABLE auth_account ADD UNIQUE KEY uk_auth_account_phone (phone); + END IF; +END$$ +DELIMITER ; +CALL auth_backfill_login_phone(); +DROP PROCEDURE auth_backfill_login_phone; diff --git a/auth/src/main/resources/db/auth.sql b/auth/src/main/resources/db/auth.sql index a1ee7ad64..13659a4a3 100644 --- a/auth/src/main/resources/db/auth.sql +++ b/auth/src/main/resources/db/auth.sql @@ -6,6 +6,7 @@ USE baiyue_auth; CREATE TABLE IF NOT EXISTS auth_account ( id BIGINT NOT NULL COMMENT '统一登录账号ID（雪花ID）', username VARCHAR(64) NOT NULL COMMENT '全局唯一登录名', + phone VARCHAR(32) DEFAULT NULL COMMENT '全局唯一中国大陆登录手机号', password_hash VARCHAR(255) NOT NULL COMMENT 'BCrypt密码哈希，禁止保存明文密码', display_name VARCHAR(64) NOT NULL COMMENT '登录后展示名称', account_status VARCHAR(20) NOT NULL DEFAULT 'ACTIVE' COMMENT '账号状态：ACTIVE正常、DISABLED停用、LOCKED锁定', @@ -23,6 +24,7 @@ CREATE TABLE IF NOT EXISTS auth_account ( updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间', PRIMARY KEY (id), UNIQUE KEY uk_auth_account_username (username), + UNIQUE KEY uk_auth_account_phone (phone), KEY idx_auth_account_status (account_status, locked_until) ) ENGINE=InnoDB COMMENT='统一登录账号表：保存平台端和商户端共用的认证凭据及账号安全状态'; diff --git a/auth/src/test/java/com/baiyue/auth/service/AccountManagementServiceTest.java b/auth/src/test/java/com/baiyue/auth/service/AccountManagementServiceTest.java index 4578286fa..8b207c1e3 100644 --- a/auth/src/test/java/com/baiyue/auth/service/AccountManagementServiceTest.java +++ b/auth/src/test/java/com/baiyue/auth/service/AccountManagementServiceTest.java @@ -6,6 +6,7 @@ import com.baiyue.auth.dto.AccountManagementDtos.CreateAccountRequest; import com.baiyue.auth.dto.AccountManagementDtos.UpdateAccountProfileRequest; import com.baiyue.auth.dto.AccountManagementDtos.UpdateAccountStatusRequest; import com.baiyue.auth.dto.AccountManagementDtos.UpdateAccountScopeRequest; +import com.baiyue.auth.dto.AccountManagementDtos.ChangeLoginIdentifiersRequest; import com.baiyue.auth.entity.AuthAccount; import com.baiyue.auth.repository.AuthAccountRepository; import com.baiyue.common.core.exception.BizException; @@ -157,6 +158,33 @@ class AccountManagementServiceTest { verify(sessions).revokeAll(10L); } + @Test void changeLoginIdentifiersRequiresCurrentPasswordAndRevokesSessions() { + account.setUsername("old.user"); + account.setPhone("13800138000"); + when(repository.existsByUsernameForOtherAccount("new.user", 10L)).thenReturn(false); + when(repository.existsByPhoneForOtherAccount("13900139000", 10L)).thenReturn(false); + + var result = service.changeLoginIdentifiers(10L, + new ChangeLoginIdentifiersRequest("new.user", "13900139000", "OldPass1")); + + assertEquals("new.user", result.username()); + assertEquals("13900139000", result.phone()); + assertEquals(3, account.getTokenVersion()); + verify(sessions).revokeAll(10L); + } + + @Test void duplicatePhoneDoesNotChangeLoginIdentifiers() { + account.setUsername("old.user"); + account.setPhone("13800138000"); + when(repository.existsByUsernameForOtherAccount("new.user", 10L)).thenReturn(false); + when(repository.existsByPhoneForOtherAccount("13900139000", 10L)).thenReturn(true); + + assertThrows(BizException.class, () -> service.changeLoginIdentifiers(10L, + new ChangeLoginIdentifiersRequest("new.user", "13900139000", "OldPass1"))); + verify(repository, never()).save(any()); + verify(sessions, never()).revokeAll(any()); + } + @Test void rbacChangeRevokesAccessAndRefreshSessionsAndBumpsTokenVersions() { AuthAccount second = new AuthAccount(); second.setId(11L); second.setTokenVersion(7); second.setAccountStatus("ACTIVE"); diff --git a/auth/src/test/java/com/baiyue/auth/service/AuthServiceSmallJwtTest.java b/auth/src/test/java/com/baiyue/auth/service/AuthServiceSmallJwtTest.java index 4f0a36bc5..00040bbe3 100644 --- a/auth/src/test/java/com/baiyue/auth/service/AuthServiceSmallJwtTest.java +++ b/auth/src/test/java/com/baiyue/auth/service/AuthServiceSmallJwtTest.java @@ -100,6 +100,34 @@ class AuthServiceSmallJwtTest { assertThat(response.overseasExpiresIn()).isEqualTo(900); } + @Test + void mainlandPhoneIsResolvedAsTheSinglePhoneLoginIdentifier() { + AuthAccount account = new AuthAccount(); + account.setId(42L); + account.setUsername("operator"); + account.setPhone("13800138000"); + account.setPasswordHash("hash"); + account.setAccountStatus("ACTIVE"); + account.setDefaultTenantId(0L); + account.setOperatorTenantId(0L); + account.setDefaultMembershipId(84L); + account.setDefaultAppCode("PLATFORM"); + account.setTokenVersion(1); + AuthorizationSnapshot snapshot = new AuthorizationSnapshot(42L, 0L, 84L, "PLATFORM", + "WEB", Set.of(), Set.of(), 1L); + Jwt encoded = org.mockito.Mockito.mock(Jwt.class); + when(repository.findByPhone("13800138000")).thenReturn(account); + when(passwordEncoder.matches("secret", "hash")).thenReturn(true); + when(authorizationLoader.load(account)).thenReturn(snapshot); + when(jwtEncoder.encode(any())).thenReturn(encoded); + when(encoded.getTokenValue()).thenReturn("small-token"); + + service.login(new LoginRequest("13800138000", "secret")); + + verify(repository).findByPhone("13800138000"); + verify(repository, never()).findByUsername("13800138000"); + } + @Test void refreshRotatesDomesticAndOverseasTokensFromOneAuthorizationSnapshot() { AuthAccount account = new AuthAccount(); diff --git a/iam/src/main/java/com/baiyue/iam/client/AuthAccountClient.java b/iam/src/main/java/com/baiyue/iam/client/AuthAccountClient.java index 28b516d46..18abf74a6 100644 --- a/iam/src/main/java/com/baiyue/iam/client/AuthAccountClient.java +++ b/iam/src/main/java/com/baiyue/iam/client/AuthAccountClient.java @@ -21,6 +21,11 @@ public interface AuthAccountClient { @PathVariable Long id, @RequestBody StatusRequest request); @PutMapping("/{id}/profile") ApiResponse profile(@RequestHeader("X-Internal-Service-Token") String token, @PathVariable Long id, @RequestBody ProfileRequest request); + @PutMapping("/{id}/login-identifiers") ApiResponse changeLoginIdentifiers( + @RequestHeader("X-Internal-Service-Token") String token, @PathVariable Long id, + @RequestBody ChangeLoginIdentifiersRequest request); + @PutMapping("/{id}/phone") ApiResponse phone(@RequestHeader("X-Internal-Service-Token") String token, + @PathVariable Long id, @RequestBody PhoneRequest request); @PutMapping("/{id}/password") ApiResponse reset(@RequestHeader("X-Internal-Service-Token") String token, @PathVariable Long id, @RequestBody PasswordRequest request); /** Idempotently disables and revokes all accounts belonging to a customer. */ @@ -37,25 +42,35 @@ public interface AuthAccountClient { @DeleteMapping("/{id}/compensation") ApiResponse compensate(@RequestHeader("X-Internal-Service-Token") String token, @PathVariable Long id); - record CreateAccountRequest(Long accountId, String username, String password, String displayName, + record CreateAccountRequest(Long accountId, String username, String phone, String password, String displayName, Long tenantId, Long membershipId, String appCode, String accountStatus) { public CreateAccountRequest(Long accountId, String username, String password, String displayName, Long tenantId, Long membershipId) { - this(accountId, username, password, displayName, tenantId, membershipId, "MERCHANT", "ACTIVE"); + this(accountId, username, null, password, displayName, tenantId, membershipId, "MERCHANT", "ACTIVE"); } public CreateAccountRequest(Long accountId, String username, String password, String displayName, Long tenantId, Long membershipId, String appCode) { - this(accountId, username, password, displayName, tenantId, membershipId, appCode, "ACTIVE"); + this(accountId, username, null, password, displayName, tenantId, membershipId, appCode, "ACTIVE"); + } + public CreateAccountRequest(Long accountId, String username, String password, String displayName, + Long tenantId, Long membershipId, String appCode, String accountStatus) { + this(accountId, username, null, password, displayName, tenantId, membershipId, appCode, accountStatus); } } - record AccountSummary(Long accountId, String username, String displayName, String status, + record AccountSummary(Long accountId, String username, String phone, String displayName, String status, LocalDateTime lastLoginAt, Long tenantId, Long membershipId, String appCode) { public AccountSummary(Long accountId, String username, String displayName, String status) { - this(accountId, username, displayName, status, null, null, null, null); + this(accountId, username, null, displayName, status, null, null, null, null); + } + public AccountSummary(Long accountId, String username, String displayName, String status, + LocalDateTime lastLoginAt, Long tenantId, Long membershipId, String appCode) { + this(accountId, username, null, displayName, status, lastLoginAt, tenantId, membershipId, appCode); } } record StatusRequest(String status) { } record ProfileRequest(String displayName) { } + record ChangeLoginIdentifiersRequest(String username, String phone, String currentPassword) { } + record PhoneRequest(String phone) { } record PasswordRequest(String newPassword, boolean forceChangePassword) { public PasswordRequest(String newPassword) { this(newPassword, false); } } diff --git a/iam/src/main/java/com/baiyue/iam/controller/MerchantTenantController.java b/iam/src/main/java/com/baiyue/iam/controller/MerchantTenantController.java index 97a950ed2..886722e72 100644 --- a/iam/src/main/java/com/baiyue/iam/controller/MerchantTenantController.java +++ b/iam/src/main/java/com/baiyue/iam/controller/MerchantTenantController.java @@ -5,6 +5,7 @@ import com.baiyue.common.security.AuthenticatedUser; import com.baiyue.iam.dto.MemberDtos.*; import com.baiyue.iam.dto.ProfileDtos.PersonalProfileResponse; import com.baiyue.iam.dto.ProfileDtos.UpdatePersonalProfileRequest; +import com.baiyue.iam.dto.ProfileDtos.ChangeLoginIdentifiersRequest; import com.baiyue.iam.dto.TenantDtos.TenantResponse; import com.baiyue.iam.dto.TenantDtos.UpdateProfileRequest; import com.baiyue.iam.service.MemberService; @@ -54,6 +55,18 @@ public class MerchantTenantController { return ApiResponse.success(personalProfileService.update(tenantId, user.userId(), user.username(), request)); } + @PutMapping("/profile/login-identifiers") + @PreAuthorize("isAuthenticated()") + @Operation(summary = "修改当前登录用户的用户名和手机号", + description = "必须使用当前密码重新认证；成功后吊销全部会话，客户端需重新登录。") + public ApiResponse changeLoginIdentifiers( + @Valid @RequestBody ChangeLoginIdentifiersRequest request, + @AuthenticationPrincipal AuthenticatedUser user) { + TenantGuard.rejectImpersonated(user); + long tenantId = TenantGuard.tenant(user, "MERCHANT"); + return ApiResponse.success(personalProfileService.changeLoginIdentifiers(tenantId, user.userId(), request)); + } + @GetMapping("/tenant/profile") @PreAuthorize("hasAuthority('merchant:profile:view')") @Operation(summary = "Get current enterprise profile / 查询当前企业资料", description = "Tenant ID is taken only from the authenticated merchant JWT. / 租户 ID 仅从已认证商户 JWT 获取。") @@ -74,7 +87,7 @@ public class MerchantTenantController { @PostMapping("/tenant/qualifications/submit-review") @PreAuthorize("hasAuthority('merchant:qualification:upload')") - @Operation(summary = "提交当前企业资质审核", description = "校验营业执照和法人身份证齐全后创建审核单；货代资质证书和银行开户许可证选填。上传或替换文件不会自动送审。") + @Operation(summary = "提交当前企业资质审核", description = "校验营业执照齐全后创建审核单；法人身份证、货代资质证书和银行开户许可证选填。上传或替换文件不会自动送审。") public ApiResponse submitQualificationReview(@AuthenticationPrincipal AuthenticatedUser user) { return ApiResponse.success(tenantService.submitMerchantReview(TenantGuard.tenant(user, "MERCHANT"))); } diff --git a/iam/src/main/java/com/baiyue/iam/dto/MemberDtos.java b/iam/src/main/java/com/baiyue/iam/dto/MemberDtos.java index d1f6f488a..8981f2e44 100644 --- a/iam/src/main/java/com/baiyue/iam/dto/MemberDtos.java +++ b/iam/src/main/java/com/baiyue/iam/dto/MemberDtos.java @@ -14,11 +14,11 @@ public final class MemberDtos { private MemberDtos() { } public record CreateMemberRequest( - @NotBlank @Pattern(regexp = "^[A-Za-z0-9_.@-]{4,64}$") String username, + @NotBlank @Pattern(regexp = "^[A-Za-z][A-Za-z0-9_.@-]{3,63}$") String username, @NotBlank @Size(min = 8, max = 64) @Pattern(regexp = "^(?=.*[A-Za-z])(?=.*\\d).+$", message = "密码必须同时包含字母和数字") String password, @NotBlank @Size(max = 64) String displayName, - @Size(max = 32) String phone, + @Pattern(regexp = "^1\\d{10}$") String phone, @Email @Size(max = 128) String email, @NotBlank String memberType, @Size(max = 64) String memberNo, @@ -30,7 +30,7 @@ public final class MemberDtos { public record UpdateMemberRequest( @NotBlank @Size(max = 64) String displayName, - @Size(max = 32) String phone, + @Pattern(regexp = "^1\\d{10}$") String phone, @Email @Size(max = 128) String email, @NotBlank String memberType, @Size(max = 64) String memberNo, diff --git a/iam/src/main/java/com/baiyue/iam/dto/OnboardingDtos.java b/iam/src/main/java/com/baiyue/iam/dto/OnboardingDtos.java index 266bd6c2d..08bbab0ad 100644 --- a/iam/src/main/java/com/baiyue/iam/dto/OnboardingDtos.java +++ b/iam/src/main/java/com/baiyue/iam/dto/OnboardingDtos.java @@ -57,9 +57,9 @@ public final class OnboardingDtos { @NotBlank String businessLicenseDocumentUrl, LocalDate businessLicenseValidTo, boolean replaceBusinessLicense, - @NotBlank String legalPersonIdDocumentUrl, + String legalPersonIdDocumentUrl, LocalDate legalPersonIdValidTo, - boolean replaceLegalPersonId + Boolean replaceLegalPersonId ) { } public record RequiredQualificationPackageResponse( diff --git a/iam/src/main/java/com/baiyue/iam/dto/PlatformInternalUserDtos.java b/iam/src/main/java/com/baiyue/iam/dto/PlatformInternalUserDtos.java index 5e36682fa..5ccc4e106 100644 --- a/iam/src/main/java/com/baiyue/iam/dto/PlatformInternalUserDtos.java +++ b/iam/src/main/java/com/baiyue/iam/dto/PlatformInternalUserDtos.java @@ -20,9 +20,9 @@ public final class PlatformInternalUserDtos { Long authUserId, String userType, @NotBlank @Size(max = 64) String displayName, - @Size(max = 32) String phone, + @Pattern(regexp = "^1\\d{10}$") String phone, @Email @Size(max = 128) String email, - @Pattern(regexp = "^[A-Za-z0-9_.@-]{4,64}$") String username, + @Pattern(regexp = "^[A-Za-z][A-Za-z0-9_.@-]{3,63}$") String username, @Size(min = 8, max = 64) @Pattern(regexp = "^(?=.*[A-Za-z])(?=.*\\d).+$", message = "密码必须同时包含字母和数字") String password, @@ -31,7 +31,7 @@ public final class PlatformInternalUserDtos { public record UpdateInternalUserRequest( @NotBlank @Size(max = 64) String displayName, - @Size(max = 32) String phone, + @Pattern(regexp = "^1\\d{10}$") String phone, @Email @Size(max = 128) String email, @NotBlank @Size(max = 64) String memberNo, @NotNull List roleIds) { } diff --git a/iam/src/main/java/com/baiyue/iam/dto/PlatformUserManagementDtos.java b/iam/src/main/java/com/baiyue/iam/dto/PlatformUserManagementDtos.java index 79dae468b..67ae5ea6b 100644 --- a/iam/src/main/java/com/baiyue/iam/dto/PlatformUserManagementDtos.java +++ b/iam/src/main/java/com/baiyue/iam/dto/PlatformUserManagementDtos.java @@ -14,7 +14,7 @@ public final class PlatformUserManagementDtos { private PlatformUserManagementDtos() { } public record CreateUserRequest( - @NotBlank @Pattern(regexp = "^[A-Za-z0-9_.@-]{4,64}$") String username, + @NotBlank @Pattern(regexp = "^[A-Za-z][A-Za-z0-9_.@-]{3,63}$") String username, @NotBlank @Size(max = 64) String displayName, @NotBlank @Pattern(regexp = "^1\\d{10}$", message = "手机号格式不正确") String phone, @Email @Size(max = 128) String email, diff --git a/iam/src/main/java/com/baiyue/iam/dto/ProfileDtos.java b/iam/src/main/java/com/baiyue/iam/dto/ProfileDtos.java index 6dc36f880..471247703 100644 --- a/iam/src/main/java/com/baiyue/iam/dto/ProfileDtos.java +++ b/iam/src/main/java/com/baiyue/iam/dto/ProfileDtos.java @@ -2,6 +2,7 @@ package com.baiyue.iam.dto; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; import jakarta.validation.constraints.Size; /** 用户档案、地址和资质的数据契约。 */ @@ -12,9 +13,13 @@ public final class ProfileDtos { String displayName, String phone, String email) { } public record UpdatePersonalProfileRequest(@NotBlank @Size(max = 64) String displayName, - @Size(max = 32) String phone, @Email @Size(max = 128) String email) { } + public record ChangeLoginIdentifiersRequest( + @NotBlank @Pattern(regexp = "^[A-Za-z][A-Za-z0-9_.@-]{3,63}$") String username, + @NotBlank @Pattern(regexp = "^1\\d{10}$") String phone, + @NotBlank String currentPassword) { } + public record AddressRequest(@NotBlank String addressType, String countryCode, String province, String city, String district, @NotBlank String detail, String postalCode, Boolean isDefault) { } diff --git a/iam/src/main/java/com/baiyue/iam/service/MemberService.java b/iam/src/main/java/com/baiyue/iam/service/MemberService.java index 2119e6fc6..46813a762 100644 --- a/iam/src/main/java/com/baiyue/iam/service/MemberService.java +++ b/iam/src/main/java/com/baiyue/iam/service/MemberService.java @@ -93,7 +93,8 @@ public class MemberService { long userId = IdWorker.getId(); long membershipId = IdWorker.getId(); call(() -> authClient.create(internalToken, new AuthAccountClient.CreateAccountRequest( - authId, request.username(), request.password(), request.displayName(), tenantId, membershipId))); + authId, request.username(), request.phone(), request.password(), request.displayName(), + tenantId, membershipId, "MERCHANT", "ACTIVE"))); try { IamUser user = new IamUser(); user.setId(userId); user.setAuthUserId(authId); user.setUserType("ENTERPRISE"); @@ -134,6 +135,10 @@ public class MemberService { throw new BizException(ResultCode.FORBIDDEN, "企业所有者不允许通过成员管理接口编辑"); } IamUser user = requiredUser(membership.getUserId()); + if (!java.util.Objects.equals(user.getPhone(), request.phone())) { + call(() -> authClient.phone(internalToken, user.getAuthUserId(), + new AuthAccountClient.PhoneRequest(request.phone()))); + } user.setDisplayName(request.displayName()); user.setPhone(request.phone()); user.setEmail(request.email()); membership.setMemberType(request.memberType()); membership.setMemberNo(request.memberNo()); repository.saveUser(user); repository.save(membership); diff --git a/iam/src/main/java/com/baiyue/iam/service/PersonalProfileService.java b/iam/src/main/java/com/baiyue/iam/service/PersonalProfileService.java index 0bd005cad..9631735be 100644 --- a/iam/src/main/java/com/baiyue/iam/service/PersonalProfileService.java +++ b/iam/src/main/java/com/baiyue/iam/service/PersonalProfileService.java @@ -4,6 +4,8 @@ import com.baiyue.common.core.api.ResultCode; import com.baiyue.common.core.exception.BizException; import com.baiyue.iam.dto.ProfileDtos.PersonalProfileResponse; import com.baiyue.iam.dto.ProfileDtos.UpdatePersonalProfileRequest; +import com.baiyue.iam.dto.ProfileDtos.ChangeLoginIdentifiersRequest; +import com.baiyue.iam.client.AuthAccountClient; import com.baiyue.iam.entity.IamMembership; import com.baiyue.iam.entity.IamUser; import com.baiyue.iam.repository.MemberRepository; @@ -11,12 +13,19 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.baiyue.common.audit.BusinessAudit; +import com.baiyue.common.core.api.ApiResponse; +import feign.FeignException; +import org.springframework.beans.factory.annotation.Value; /** 当前用户个人资料服务，必须同时匹配认证账号与当前租户成员关系。 */ @Service public class PersonalProfileService { @Resource private MemberRepository repository; + @Resource + private AuthAccountClient authClient; + @Value("${baiyue.security.internal-service-token}") + private String internalToken; public PersonalProfileResponse get(long tenantId, Long authUserId, String username) { return response(tenantId, authUserId, username); @@ -30,12 +39,40 @@ public class PersonalProfileService { if (membership == null || !"ACTIVE".equals(membership.getStatus())) throw forbidden(); IamUser user = repository.findUser(membership.getUserId()); if (user == null || !authUserId.equals(user.getAuthUserId())) throw forbidden(); - user.setDisplayName(request.displayName()); user.setPhone(request.phone()); user.setEmail(request.email()); + user.setDisplayName(request.displayName()); user.setEmail(request.email()); repository.saveUser(user); return new PersonalProfileResponse(user.getId(), authUserId, username, user.getDisplayName(), user.getPhone(), user.getEmail()); } + @Transactional + @BusinessAudit(event = "PERSONAL_LOGIN_IDENTIFIERS_UPDATE", resourceType = "IAM_USER", + resourceId = "#authUserId", description = "修改本人用户名和手机号", captureAfter = false) + public PersonalProfileResponse changeLoginIdentifiers(long tenantId, Long authUserId, + ChangeLoginIdentifiersRequest request) { + IamMembership membership = repository.findByTenantAndAuthUser(tenantId, authUserId); + if (membership == null || !"ACTIVE".equals(membership.getStatus())) throw forbidden(); + IamUser user = repository.findUser(membership.getUserId()); + if (user == null || !authUserId.equals(user.getAuthUserId())) throw forbidden(); + AuthAccountClient.AccountSummary account; + try { + ApiResponse result = authClient.changeLoginIdentifiers( + internalToken, authUserId, new AuthAccountClient.ChangeLoginIdentifiersRequest( + request.username(), request.phone(), request.currentPassword())); + if (result == null || !result.successful() || result.data() == null) { + ResultCode code = result == null ? ResultCode.SERVICE_UNAVAILABLE : ResultCode.of(result.code()); + throw new BizException(code, result == null ? "认证账号服务暂时不可用" : result.message()); + } + account = result.data(); + } catch (FeignException ex) { + throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "认证账号服务暂时不可用"); + } + user.setPhone(account.phone()); + repository.saveUser(user); + return new PersonalProfileResponse(user.getId(), authUserId, account.username(), + user.getDisplayName(), user.getPhone(), user.getEmail()); + } + private PersonalProfileResponse response(long tenantId, Long authUserId, String username) { IamMembership membership = repository.findByTenantAndAuthUser(tenantId, authUserId); if (membership == null) throw forbidden(); diff --git a/iam/src/main/java/com/baiyue/iam/service/PlatformInternalUserService.java b/iam/src/main/java/com/baiyue/iam/service/PlatformInternalUserService.java index baa3d4658..032898b2c 100644 --- a/iam/src/main/java/com/baiyue/iam/service/PlatformInternalUserService.java +++ b/iam/src/main/java/com/baiyue/iam/service/PlatformInternalUserService.java @@ -69,8 +69,8 @@ public class PlatformInternalUserService { validateMemberNo(memberNo, null); call(() -> authClient.create(internalToken, new AuthAccountClient.CreateAccountRequest( - authUserId, request.username(), request.password(), request.displayName(), - PLATFORM_TENANT_ID, membershipId, "PLATFORM"))); + authUserId, request.username(), request.phone(), request.password(), request.displayName(), + PLATFORM_TENANT_ID, membershipId, "PLATFORM", "ACTIVE"))); try { IamUser user = newUser(userId, authUserId, request.displayName(), request.phone(), request.email()); IamMembership membership = newMembership(membershipId, userId, memberNo); @@ -96,12 +96,17 @@ public class PlatformInternalUserService { IamUser user = requiredUser(membership.getUserId()); AuthAccountClient.AccountSummary oldAccount = account(user.getAuthUserId()); boolean displayNameChanged = !Objects.equals(user.getDisplayName(), request.displayName()); + boolean phoneChanged = !Objects.equals(user.getPhone(), request.phone()); List oldRoleIds = repository.findRoleIds(PLATFORM_TENANT_ID, membershipId); boolean rolesChanged = !new java.util.HashSet<>(oldRoleIds).equals(new java.util.HashSet<>(roleIds)); if (displayNameChanged) { call(() -> authClient.profile(internalToken, user.getAuthUserId(), new AuthAccountClient.ProfileRequest(request.displayName()))); } + if (phoneChanged) { + call(() -> authClient.phone(internalToken, user.getAuthUserId(), + new AuthAccountClient.PhoneRequest(request.phone()))); + } try { user.setDisplayName(request.displayName()); user.setPhone(request.phone()); diff --git a/iam/src/main/java/com/baiyue/iam/service/PlatformUserManagementService.java b/iam/src/main/java/com/baiyue/iam/service/PlatformUserManagementService.java index 7d9b01f52..a277858ae 100644 --- a/iam/src/main/java/com/baiyue/iam/service/PlatformUserManagementService.java +++ b/iam/src/main/java/com/baiyue/iam/service/PlatformUserManagementService.java @@ -81,8 +81,8 @@ public class PlatformUserManagementService { long membershipId = IdWorker.getId(); String appCode = appCode(tenantId); call(() -> authClient.create(internalToken, new AuthAccountClient.CreateAccountRequest( - authUserId, request.username().trim(), request.password(), request.displayName().trim(), - tenantId, membershipId, appCode, request.status()))); + authUserId, request.username().trim(), request.phone().trim(), request.password(), + request.displayName().trim(), tenantId, membershipId, appCode, request.status()))); try { IamUser user = new IamUser(); user.setId(userId); @@ -137,12 +137,15 @@ public class PlatformUserManagementService { } AuthAccountClient.AccountSummary oldAccount = account(user.getAuthUserId()); boolean profileChanged = !Objects.equals(user.getDisplayName(), request.displayName().trim()); + boolean phoneChanged = !Objects.equals(user.getPhone(), request.phone().trim()); boolean scopeChanged = oldTenantId != newTenantId; boolean rolesChanged = !new java.util.HashSet<>(oldRoleIds).equals(new java.util.HashSet<>(roleIds)); boolean warehouseChanged = !Objects.equals(membership.getOverseasWarehouseId(), overseasWarehouseId); if (profileChanged) call(() -> authClient.profile(internalToken, user.getAuthUserId(), new AuthAccountClient.ProfileRequest(request.displayName().trim()))); + if (phoneChanged) call(() -> authClient.phone(internalToken, user.getAuthUserId(), + new AuthAccountClient.PhoneRequest(request.phone().trim()))); if (scopeChanged) call(() -> authClient.scope(internalToken, user.getAuthUserId(), new AuthAccountClient.ScopeRequest(newTenantId, membershipId, appCode(newTenantId)))); try { diff --git a/iam/src/main/java/com/baiyue/iam/service/ProfileResourceService.java b/iam/src/main/java/com/baiyue/iam/service/ProfileResourceService.java index 0d5f25b1f..af90e9bf5 100644 --- a/iam/src/main/java/com/baiyue/iam/service/ProfileResourceService.java +++ b/iam/src/main/java/com/baiyue/iam/service/ProfileResourceService.java @@ -160,24 +160,32 @@ public class ProfileResourceService { List businessLicenses = currentQualifications(locked, "BUSINESS_LICENSE"); List legalPersonIds = currentQualifications(locked, "LEGAL_PERSON_ID"); requireReplaceAllowed(businessLicenses, request.replaceBusinessLicense(), "营业执照"); - requireReplaceAllowed(legalPersonIds, request.replaceLegalPersonId(), "法人身份证"); + boolean hasLegalPersonId = StringUtils.hasText(request.legalPersonIdDocumentUrl()); + if (hasLegalPersonId) { + requireReplaceAllowed(legalPersonIds, Boolean.TRUE.equals(request.replaceLegalPersonId()), "法人身份证"); + } else if (Boolean.TRUE.equals(request.replaceLegalPersonId())) { + throw new BizException(ResultCode.BAD_REQUEST, "未上传法人身份证时不能选择替换"); + } String replacedBusinessLicenseUrl = supersede(businessLicenses, replacementComment); - String replacedLegalPersonIdUrl = supersede(legalPersonIds, replacementComment); + String replacedLegalPersonIdUrl = hasLegalPersonId ? supersede(legalPersonIds, replacementComment) : null; IamTenantQualification businessLicense = createQualification(tenant.getId(), "BUSINESS_LICENSE", creditCode, request.businessLicenseDocumentUrl()); businessLicense.setValidTo(request.businessLicenseValidTo()); repository.saveQualification(businessLicense); - IamTenantQualification legalPersonId = createQualification(tenant.getId(), "LEGAL_PERSON_ID", - null, request.legalPersonIdDocumentUrl()); - legalPersonId.setValidTo(request.legalPersonIdValidTo()); - repository.saveQualification(legalPersonId); + IamTenantQualification legalPersonId = null; + if (hasLegalPersonId) { + legalPersonId = createQualification(tenant.getId(), "LEGAL_PERSON_ID", + null, request.legalPersonIdDocumentUrl().trim()); + legalPersonId.setValidTo(request.legalPersonIdValidTo()); + repository.saveQualification(legalPersonId); + } if (!creditCode.equals(tenant.getUnifiedSocialCreditCode())) { tenant.setUnifiedSocialCreditCode(creditCode); tenantRepository.saveTenant(tenant); } return new RequiredQualificationPackageResponse( - businessLicense.getId(), legalPersonId.getId(), tenant.getStatus(), + businessLicense.getId(), legalPersonId == null ? null : legalPersonId.getId(), tenant.getStatus(), replacedBusinessLicenseUrl, replacedLegalPersonIdUrl); } @@ -206,9 +214,9 @@ public class ProfileResourceService { } private void requireOptionalQualificationType(String type) { - if ("BUSINESS_LICENSE".equals(type) || "LEGAL_PERSON_ID".equals(type)) { + if ("BUSINESS_LICENSE".equals(type)) { throw new BizException(ResultCode.BAD_REQUEST, - "Required qualifications must be uploaded as one package / 营业执照、统一社会信用代码和法人身份证必须整包上传"); + "The business license must be uploaded in the required package / 营业执照和统一社会信用代码必须通过必填资质包上传"); } } diff --git a/iam/src/main/java/com/baiyue/iam/service/TenantAdministratorProvisioningService.java b/iam/src/main/java/com/baiyue/iam/service/TenantAdministratorProvisioningService.java index 6e1a6adbc..83b298eed 100644 --- a/iam/src/main/java/com/baiyue/iam/service/TenantAdministratorProvisioningService.java +++ b/iam/src/main/java/com/baiyue/iam/service/TenantAdministratorProvisioningService.java @@ -215,7 +215,7 @@ public class TenantAdministratorProvisioningService implements TenantApprovalIni IamTenant tenant, long membershipId) { try { ApiResponse response = authClient.create(internalToken, - new AuthAccountClient.CreateAccountRequest(authUserId, username, password, + new AuthAccountClient.CreateAccountRequest(authUserId, username, tenant.getContactPhone(), password, tenant.getContactName(), tenant.getId(), membershipId, "MERCHANT", "ACTIVE")); if (response == null) throw unavailable(); if (!response.successful()) { diff --git a/iam/src/main/java/com/baiyue/iam/service/TenantService.java b/iam/src/main/java/com/baiyue/iam/service/TenantService.java index f93c268cc..a8a7835d5 100644 --- a/iam/src/main/java/com/baiyue/iam/service/TenantService.java +++ b/iam/src/main/java/com/baiyue/iam/service/TenantService.java @@ -52,8 +52,7 @@ import java.util.stream.Collectors; */ @Service public class TenantService { - private static final Set REQUIRED_QUALIFICATION_TYPES = Set.of( - "BUSINESS_LICENSE", "LEGAL_PERSON_ID"); + private static final Set REQUIRED_QUALIFICATION_TYPES = Set.of("BUSINESS_LICENSE"); @Resource private TenantRepository repository; @Resource @@ -456,7 +455,7 @@ public class TenantService { var qualifications = profileRepository.findQualifications(tenantId); if (!hasAllPendingQualifications(qualifications)) { throw new BizException(ResultCode.BAD_REQUEST, - "Business license and legal-person ID are required / 营业执照和法人身份证为必填资质"); + "Business license is required / 营业执照为必填资质"); } IamTenantReview review = new IamTenantReview(); review.setId(IdWorker.getId()); review.setTenantId(tenantId); diff --git a/iam/src/main/resources/openapi/iam-v1.yaml b/iam/src/main/resources/openapi/iam-v1.yaml index fa52a8d25..cba1b2b57 100644 --- a/iam/src/main/resources/openapi/iam-v1.yaml +++ b/iam/src/main/resources/openapi/iam-v1.yaml @@ -17,6 +17,56 @@ tags: - name: RBAC description: Platform and merchant role-permission management / 平台端与商户端角色权限管理 paths: + /api/merchant/v1/iam/profile: + get: + tags: [Merchant Tenant / 商户企业] + summary: 查看当前登录用户个人资料 + responses: + '200': + description: 查询成功 + content: + application/json: + schema: {$ref: '#/components/schemas/PersonalProfileApiResponse'} + '401': {$ref: '#/components/responses/Unauthorized'} + '403': {$ref: '#/components/responses/Forbidden'} + put: + tags: [Merchant Tenant / 商户企业] + summary: 修改当前登录用户普通资料 + description: 仅修改显示名称和邮箱；用户名、手机号必须走敏感标识接口。 + requestBody: + required: true + content: + application/json: + schema: {$ref: '#/components/schemas/UpdatePersonalProfileRequest'} + responses: + '200': + description: 修改成功 + content: + application/json: + schema: {$ref: '#/components/schemas/PersonalProfileApiResponse'} + '400': {$ref: '#/components/responses/BadRequest'} + '401': {$ref: '#/components/responses/Unauthorized'} + '403': {$ref: '#/components/responses/Forbidden'} + /api/merchant/v1/iam/profile/login-identifiers: + put: + tags: [Merchant Tenant / 商户企业] + summary: 修改当前登录用户的用户名和手机号 + description: 仅允许当前非代登录用户修改本人标识，必须用当前密码重新认证；成功后全部 Token 和会话失效，需重新登录。权限为已认证客户本人，无额外权限码。 + requestBody: + required: true + content: + application/json: + schema: {$ref: '#/components/schemas/ChangeLoginIdentifiersRequest'} + responses: + '200': + description: 修改成功并已吊销会话 + content: + application/json: + schema: {$ref: '#/components/schemas/PersonalProfileApiResponse'} + '400': {$ref: '#/components/responses/BadRequest'} + '401': {$ref: '#/components/responses/Unauthorized'} + '403': {$ref: '#/components/responses/Forbidden'} + '409': {$ref: '#/components/responses/Conflict'} /api/platform/v1/iam/tenants/contact-phone-availability: get: tags: [Platform Tenant / 平台租户] @@ -924,6 +974,35 @@ components: ServiceUnavailable: {description: Authentication service unavailable / 认证服务不可用, content: {application/json: {schema: {$ref: '#/components/schemas/ApiResponse'}}}} UnprocessableEntity: {description: 参数校验失败, content: {application/json: {schema: {$ref: '#/components/schemas/ApiResponse'}}}} schemas: + PersonalProfileResponse: + type: object + required: [userId, authUserId, username, displayName, phone] + properties: + userId: {type: string, pattern: '^\d+$'} + authUserId: {type: string, pattern: '^\d+$'} + username: {type: string, pattern: '^[A-Za-z][A-Za-z0-9_.@-]{3,63}$'} + displayName: {type: string, maxLength: 64} + phone: {type: string, pattern: '^1\d{10}$'} + email: {type: string, format: email, nullable: true} + UpdatePersonalProfileRequest: + type: object + required: [displayName] + properties: + displayName: {type: string, minLength: 1, maxLength: 64} + email: {type: string, format: email, maxLength: 128, nullable: true} + ChangeLoginIdentifiersRequest: + type: object + required: [username, phone, currentPassword] + properties: + username: {type: string, pattern: '^[A-Za-z][A-Za-z0-9_.@-]{3,63}$'} + phone: {type: string, pattern: '^1\d{10}$'} + currentPassword: {type: string, format: password, writeOnly: true} + PersonalProfileApiResponse: + allOf: + - {$ref: '#/components/schemas/ApiResponse'} + - type: object + properties: + data: {$ref: '#/components/schemas/PersonalProfileResponse'} ApiResponse: type: object required: [code, message, timestamp] @@ -1206,22 +1285,22 @@ components: reviewComment: {type: string} RequiredQualificationPackageRequest: type: object - required: [tenantId, unifiedSocialCreditCode, businessLicenseDocumentUrl, replaceBusinessLicense, legalPersonIdDocumentUrl, replaceLegalPersonId] + required: [tenantId, unifiedSocialCreditCode, businessLicenseDocumentUrl, replaceBusinessLicense] properties: tenantId: {type: string, pattern: '^\d+$'} unifiedSocialCreditCode: {type: string, pattern: '^[0-9A-Za-z]{18}$'} businessLicenseDocumentUrl: {type: string, minLength: 1} businessLicenseValidTo: {type: string, format: date, nullable: true} replaceBusinessLicense: {type: boolean} - legalPersonIdDocumentUrl: {type: string, minLength: 1} + legalPersonIdDocumentUrl: {type: string, minLength: 1, nullable: true, description: 法人身份证选填} legalPersonIdValidTo: {type: string, format: date, nullable: true} - replaceLegalPersonId: {type: boolean} + replaceLegalPersonId: {type: boolean, nullable: true, default: false} RequiredQualificationPackageResponse: type: object - required: [businessLicenseQualificationId, legalPersonIdQualificationId, tenantStatus] + required: [businessLicenseQualificationId, tenantStatus] properties: businessLicenseQualificationId: {type: string, pattern: '^\d+$'} - legalPersonIdQualificationId: {type: string, pattern: '^\d+$'} + legalPersonIdQualificationId: {type: string, pattern: '^\d+$', nullable: true} tenantStatus: {type: string, enum: [PROFILE_REQUIRED, REJECTED]} replacedBusinessLicenseDocumentUrl: {type: string, nullable: true} replacedLegalPersonIdDocumentUrl: {type: string, nullable: true} @@ -1317,7 +1396,7 @@ components: type: object required: [username, displayName, phone, tenantId, roleIds, password, status] properties: - username: {type: string, minLength: 4, maxLength: 64} + username: {type: string, pattern: '^[A-Za-z][A-Za-z0-9_.@-]{3,63}$'} displayName: {type: string, maxLength: 64} phone: {type: string, pattern: '^1\\d{10}$'} email: {type: string, format: email, maxLength: 128} @@ -1342,10 +1421,10 @@ components: properties: authUserId: {type: integer, format: int64, description: 兼容旧接口；填写后关联已有认证账号} userType: {type: string, enum: [INTERNAL, PLATFORM], description: 兼容旧接口，可省略} - username: {type: string, minLength: 4, maxLength: 64} + username: {type: string, pattern: '^[A-Za-z][A-Za-z0-9_.@-]{3,63}$'} password: {type: string, format: password, minLength: 8, maxLength: 64, writeOnly: true} displayName: {type: string, maxLength: 64} - phone: {type: string, maxLength: 32} + phone: {type: string, pattern: '^1\d{10}$'} email: {type: string, format: email, maxLength: 128} memberNo: {type: string, maxLength: 64} roleIds: {type: array, items: {type: integer, format: int64}} @@ -1354,7 +1433,7 @@ components: required: [displayName, memberNo, roleIds] properties: displayName: {type: string, maxLength: 64} - phone: {type: string, maxLength: 32} + phone: {type: string, pattern: '^1\d{10}$'} email: {type: string, format: email, maxLength: 128} memberNo: {type: string, maxLength: 64} roleIds: {type: array, items: {type: integer, format: int64}} @@ -1413,10 +1492,10 @@ components: type: object required: [username, password, displayName, memberType] properties: - username: {type: string, minLength: 4, maxLength: 64} + username: {type: string, pattern: '^[A-Za-z][A-Za-z0-9_.@-]{3,63}$'} password: {type: string, format: password, minLength: 8, maxLength: 64} displayName: {type: string, maxLength: 64} - phone: {type: string, maxLength: 32} + phone: {type: string, pattern: '^1\d{10}$'} email: {type: string, format: email, maxLength: 128} memberType: {type: string, enum: [EMPLOYEE]} memberNo: {type: string} @@ -1429,7 +1508,7 @@ components: required: [displayName, memberType] properties: displayName: {type: string, maxLength: 64} - phone: {type: string, maxLength: 32} + phone: {type: string, pattern: '^1\d{10}$'} email: {type: string, format: email, maxLength: 128} memberType: {type: string, enum: [EMPLOYEE]} memberNo: {type: string, maxLength: 64} diff --git a/iam/src/test/java/com/baiyue/iam/service/MemberServiceTest.java b/iam/src/test/java/com/baiyue/iam/service/MemberServiceTest.java index 6b12c273d..29f97b03f 100644 --- a/iam/src/test/java/com/baiyue/iam/service/MemberServiceTest.java +++ b/iam/src/test/java/com/baiyue/iam/service/MemberServiceTest.java @@ -161,6 +161,8 @@ class MemberServiceTest { @Test void shouldHandleCase08() { IamRole role = activeMerchantRole(50L, 100L); when(roleMapper.selectById(50L)).thenReturn(role); + when(auth.phone(eq("internal-token"), eq(40L), any())) + .thenReturn(ApiResponse.success(null)); UpdateMemberRequest request = new UpdateMemberRequest("新姓名", "13800138000", null, "EMPLOYEE", "M-001", List.of(50L)); @@ -169,6 +171,7 @@ class MemberServiceTest { assertEquals("新姓名", result.displayName()); verify(repository).saveUser(user); verify(repository).replaceRoles(100L, 20L, List.of(50L)); + verify(auth).phone(eq("internal-token"), eq(40L), any()); } @Test void shouldHandleCase09() { diff --git a/iam/src/test/java/com/baiyue/iam/service/MerchantQualificationUploadTest.java b/iam/src/test/java/com/baiyue/iam/service/MerchantQualificationUploadTest.java index f99a921a9..24429a27a 100644 --- a/iam/src/test/java/com/baiyue/iam/service/MerchantQualificationUploadTest.java +++ b/iam/src/test/java/com/baiyue/iam/service/MerchantQualificationUploadTest.java @@ -83,6 +83,25 @@ class MerchantQualificationUploadTest { verify(tenantRepository).saveTenant(tenant); } + @Test + void requiredPackageAcceptsAnEmptyOptionalLegalPersonId() { + IamTenant tenant = new IamTenant(); + tenant.setId(10001L); + tenant.setTenantType("MERCHANT"); + tenant.setStatus("PROFILE_REQUIRED"); + when(tenantRepository.findTenantForUpdate(10001L)).thenReturn(tenant); + when(profileRepository.findQualificationsForUpdate(10001L)).thenReturn(List.of()); + + var response = service.submitRequiredQualificationPackage(new RequiredQualificationPackageRequest( + 10001L, "91310101abcde12345", + "/api/merchant/v1/files/qualifications/license.png", null, false, + null, null, null)); + + assertNull(response.legalPersonIdQualificationId()); + verify(profileRepository, times(1)).insertQualification(any()); + verify(tenantRepository).saveTenant(tenant); + } + @Test void requiredPackageCannotOverwriteAnEstablishedCreditCode() { IamTenant tenant = new IamTenant(); diff --git a/iam/src/test/java/com/baiyue/iam/service/PersonalProfileServiceTest.java b/iam/src/test/java/com/baiyue/iam/service/PersonalProfileServiceTest.java index 8f66b3ed4..287c962af 100644 --- a/iam/src/test/java/com/baiyue/iam/service/PersonalProfileServiceTest.java +++ b/iam/src/test/java/com/baiyue/iam/service/PersonalProfileServiceTest.java @@ -2,6 +2,9 @@ package com.baiyue.iam.service; import com.baiyue.common.core.exception.BizException; import com.baiyue.iam.dto.ProfileDtos.UpdatePersonalProfileRequest; +import com.baiyue.iam.dto.ProfileDtos.ChangeLoginIdentifiersRequest; +import com.baiyue.iam.client.AuthAccountClient; +import com.baiyue.common.core.api.ApiResponse; import com.baiyue.iam.entity.IamMembership; import com.baiyue.iam.entity.IamUser; import com.baiyue.iam.repository.MemberRepository; @@ -10,14 +13,17 @@ import org.junit.jupiter.api.Test; import jakarta.annotation.Resource; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.springframework.test.context.TestPropertySource; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; @DisplayName("个人资料服务") @SpringJUnitConfig(PersonalProfileService.class) +@TestPropertySource(properties = "baiyue.security.internal-service-token=test-internal-token") class PersonalProfileServiceTest { @MockBean private MemberRepository repository; + @MockBean private AuthAccountClient authClient; @Resource private PersonalProfileService service; @Test void canOnlyModifyOwnProfileWithinCurrentTenant() { @@ -26,11 +32,29 @@ class PersonalProfileServiceTest { when(repository.findByTenantAndAuthUser(1L, 2L)).thenReturn(membership); when(repository.findUser(3L)).thenReturn(user); var result = service.update(1L, 2L, "tester", - new UpdatePersonalProfileRequest("新姓名", "13800138000", "a@example.com")); + new UpdatePersonalProfileRequest("新姓名", "a@example.com")); assertEquals("新姓名", result.displayName()); verify(repository).saveUser(user); } + + @Test void sensitiveLoginIdentifiersAreChangedOnlyThroughAuthReauthentication() { + IamMembership membership = new IamMembership(); membership.setUserId(3L); membership.setStatus("ACTIVE"); + IamUser user = new IamUser(); user.setId(3L); user.setAuthUserId(2L); user.setDisplayName("测试用户"); + when(repository.findByTenantAndAuthUser(1L, 2L)).thenReturn(membership); + when(repository.findUser(3L)).thenReturn(user); + when(authClient.changeLoginIdentifiers(any(), eq(2L), any())).thenReturn(ApiResponse.success( + new AuthAccountClient.AccountSummary(2L, "new.user", "13900139000", "测试用户", "ACTIVE", + null, 1L, 4L, "MERCHANT"))); + + var result = service.changeLoginIdentifiers(1L, 2L, + new ChangeLoginIdentifiersRequest("new.user", "13900139000", "CurrentPass1")); + + assertEquals("new.user", result.username()); + assertEquals("13900139000", result.phone()); + verify(repository).saveUser(user); + } + @Test void crossTenantIdentityIsRejected() { assertThrows(BizException.class, () -> service.get(9L, 2L, "tester")); } diff --git a/iam/src/test/java/com/baiyue/iam/service/TenantServiceTest.java b/iam/src/test/java/com/baiyue/iam/service/TenantServiceTest.java index eb7bb54dc..6233f0642 100644 --- a/iam/src/test/java/com/baiyue/iam/service/TenantServiceTest.java +++ b/iam/src/test/java/com/baiyue/iam/service/TenantServiceTest.java @@ -369,11 +369,11 @@ class TenantServiceTest { } @Test - void explicitSubmissionRequiresOnlyBusinessLicenseAndLegalPersonIdAndCreatesReview() { + void explicitSubmissionRequiresBusinessLicenseAndCreatesReview() { IamTenant tenant = merchant(10001L, "PROFILE_REQUIRED"); when(repository.findTenantForUpdate(10001L)).thenReturn(tenant); when(profileRepository.findQualifications(10001L)).thenReturn(List.of( - qualification("BUSINESS_LICENSE"), qualification("LEGAL_PERSON_ID"))); + qualification("BUSINESS_LICENSE"))); var submitted = service.submitMerchantReview(10001L); @@ -383,10 +383,10 @@ class TenantServiceTest { } @Test - void explicitSubmissionRejectsAnIncompleteQualificationSet() { + void explicitSubmissionRejectsMissingBusinessLicense() { when(repository.findTenantForUpdate(10001L)).thenReturn(merchant(10001L, "PROFILE_REQUIRED")); when(profileRepository.findQualifications(10001L)).thenReturn(List.of( - qualification("BUSINESS_LICENSE"))); + qualification("LEGAL_PERSON_ID"))); BizException exception = assertThrows(BizException.class, () -> service.submitMerchantReview(10001L)); @@ -480,8 +480,8 @@ class TenantServiceTest { void shouldHandleCase01() { when(repository.findTenant(10001L)).thenReturn(merchant(10001L, "ACTIVE")); when(profileRepository.findQualifications(10001L)).thenReturn( - List.of(approvedQualification("BUSINESS_LICENSE")), - List.of(approvedQualification("BUSINESS_LICENSE"), approvedQualification("LEGAL_PERSON_ID"), + List.of(), + List.of(approvedQualification("BUSINESS_LICENSE"), rejectedQualification("FREIGHT_FORWARDER_CERTIFICATE"))); var withoutQualification = service.orderEligibility(10001L);