feat: 完善个人主页账户设置与真实学习统计

CLAUDE.md

@@ -352,7 +352,7 @@ infrastructure/messaging/{rabbitmq|kafka}/{module}
 ```text
 infrastructure/storage
 ├── ObjectStorageProvider.java
-└── aliyun
+└── qiniu
 infrastructure/cdn
 infrastructure/config/ObjectStorageProperties.java
 infrastructure/config/CdnProperties.java

backend/unispeaking-server/pom.xml

@@ -26,15 +26,18 @@
 		<tag/>
 		<url/>
 	</scm>
+
 	<properties>
 		<java.version>21</java.version>
 		<mybatis-plus.version>3.5.17</mybatis-plus.version>
+		<qiniu-java-sdk.version>7.19.0</qiniu-java-sdk.version>
 		<jacoco.version>0.8.13</jacoco.version>
 		<testcontainers.version>2.0.5</testcontainers.version>
 		<skipUnitTests>false</skipUnitTests>
 		<skipIntegrationTests>true</skipIntegrationTests>
 		<jacoco.unit.argLine/>
 		<jacoco.integration.argLine/>
+
 	</properties>
 		<dependencies>
 			<dependency>
@@ -66,11 +69,16 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.postgresql</groupId>
-			<artifactId>postgresql</artifactId>
-			<scope>runtime</scope>
-		</dependency>
+			<dependency>
+				<groupId>org.postgresql</groupId>
+				<artifactId>postgresql</artifactId>
+				<scope>runtime</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.qiniu</groupId>
+				<artifactId>qiniu-java-sdk</artifactId>
+				<version>${qiniu-java-sdk.version}</version>
+			</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-flyway</artifactId>

backend/unispeaking-server/src/main/java/com/unispeaking/common/exception/GlobalExceptionHandler.java

@@ -17,7 +17,12 @@ public ResponseEntity<ApiResponse<Void>> handleBusinessException(BusinessExcepti
 			case "AUTHENTICATION_REQUIRED", "INVALID_ACCESS_TOKEN", "ACCESS_TOKEN_REVOKED",
 					"INVALID_CREDENTIALS", "USER_NOT_ACTIVE" -> HttpStatus.UNAUTHORIZED;
 			case "SESSION_ACCESS_DENIED" -> HttpStatus.FORBIDDEN;
-			case "USERNAME_ALREADY_EXISTS" -> HttpStatus.CONFLICT;
+			case "USERNAME_ALREADY_EXISTS", "PASSWORD_UPDATE_CONFLICT",
+					"PROFILE_UPDATE_CONFLICT" -> HttpStatus.CONFLICT;
+			case "AVATAR_STORAGE_FAILED" -> HttpStatus.BAD_GATEWAY;
+			case "AVATAR_STORAGE_UNAVAILABLE" -> HttpStatus.SERVICE_UNAVAILABLE;
+			case "AVATAR_DIMENSION_INVALID", "AVATAR_CONTENT_INVALID" ->
+					HttpStatus.UNPROCESSABLE_ENTITY;
 			default -> HttpStatus.BAD_REQUEST;
 		};
 		return ResponseEntity.status(status)

backend/unispeaking-server/src/main/java/com/unispeaking/controller/AuthController.java

@@ -1,6 +1,8 @@
 package com.unispeaking.controller;
 
 import com.unispeaking.domain.dto.auth.AuthResponse;
+import com.unispeaking.domain.dto.auth.ChangePasswordRequest;
+import com.unispeaking.domain.dto.auth.ChangePasswordResponse;
 import com.unispeaking.domain.dto.auth.LoginRequest;
 import com.unispeaking.domain.dto.auth.RegisterRequest;
 import com.unispeaking.domain.dto.auth.UserAccountResponse;
@@ -9,6 +11,7 @@
 import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -37,4 +40,10 @@ public ApiResponse<AuthResponse> login(@Valid @RequestBody LoginRequest request)
 	public ApiResponse<UserAccountResponse> me() {
 		return ApiResponse.success(authService.currentUser());
 	}
+
+	@PutMapping("/password")
+	public ApiResponse<ChangePasswordResponse> changePassword(
+			@Valid @RequestBody ChangePasswordRequest request) {
+		return ApiResponse.success(authService.changePassword(request));
+	}
 }

backend/unispeaking-server/src/main/java/com/unispeaking/controller/ProfileController.java

@@ -0,0 +1,59 @@
+package com.unispeaking.controller;
+
+import com.unispeaking.common.response.ApiResponse;
+import com.unispeaking.domain.dto.profile.AvatarResponse;
+import com.unispeaking.domain.dto.profile.ProfileOverviewResponse;
+import com.unispeaking.domain.dto.profile.UpdateProfileRequest;
+import com.unispeaking.domain.dto.profile.UpdateProfileResponse;
+import com.unispeaking.service.auth.AuthService;
+import com.unispeaking.service.profile.ProfileAccountService;
+import com.unispeaking.service.profile.ProfileOverviewService;
+import jakarta.validation.Valid;
+import java.io.IOException;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+@RestController
+@RequestMapping("/api/profile")
+public class ProfileController {
+	private final AuthService authService;
+	private final ProfileOverviewService overviewService;
+	private final ProfileAccountService accountService;
+
+	public ProfileController(
+			AuthService authService,
+			ProfileOverviewService overviewService,
+			ProfileAccountService accountService) {
+		this.authService = authService;
+		this.overviewService = overviewService;
+		this.accountService = accountService;
+	}
+
+	@GetMapping("/overview")
+	public ApiResponse<ProfileOverviewResponse> overview(
+			@RequestParam(required = false) String month) {
+		return ApiResponse.success(overviewService.getOverview(
+				authService.requireUserId(null), month));
+	}
+
+	@PatchMapping
+	public ApiResponse<UpdateProfileResponse> update(
+			@Valid @RequestBody UpdateProfileRequest request) {
+		return ApiResponse.success(accountService.updateNickname(
+				authService.requireUserId(null), request));
+	}
+
+	@PostMapping("/avatar")
+	public ApiResponse<AvatarResponse> avatar(
+			@RequestPart("avatar") MultipartFile avatar) throws IOException {
+		return ApiResponse.success(accountService.replaceAvatar(
+				authService.requireUserId(null), avatar.getBytes()));
+	}
+}

backend/unispeaking-server/src/main/java/com/unispeaking/domain/dto/auth/ChangePasswordRequest.java

@@ -0,0 +1,13 @@
+package com.unispeaking.domain.dto.auth;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public record ChangePasswordRequest(
+		@NotBlank(message = "不能为空")
+		@Size(min = 6, max = 72, message = "长度必须为 6 到 72 位")
+		String currentPassword,
+		@NotBlank(message = "不能为空")
+		@Size(min = 6, max = 72, message = "长度必须为 6 到 72 位")
+		String newPassword) {
+}

backend/unispeaking-server/src/main/java/com/unispeaking/domain/dto/auth/ChangePasswordResponse.java

@@ -0,0 +1,7 @@
+package com.unispeaking.domain.dto.auth;
+
+public record ChangePasswordResponse(boolean reauthenticationRequired) {
+	public static ChangePasswordResponse required() {
+		return new ChangePasswordResponse(true);
+	}
+}

backend/unispeaking-server/src/main/java/com/unispeaking/domain/dto/profile/AvatarResponse.java

@@ -0,0 +1,6 @@
+package com.unispeaking.domain.dto.profile;
+
+import java.time.Instant;
+
+public record AvatarResponse(String avatarUrl, Instant avatarUrlExpiresAt) {
+}

backend/unispeaking-server/src/main/java/com/unispeaking/domain/dto/profile/ProfileOverviewResponse.java

@@ -0,0 +1,42 @@
+package com.unispeaking.domain.dto.profile;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.UUID;
+
+public record ProfileOverviewResponse(
+		Account account,
+		PracticeStatistics statistics,
+		Calendar calendar) {
+	public record Account(
+			UUID userId,
+			String email,
+			String nickname,
+			String displayName,
+			String avatarUrl,
+			Instant avatarUrlExpiresAt) {
+	}
+
+	public record Calendar(
+			String month,
+			List<LocalDate> checkedDates,
+			boolean checkedInToday) {
+		public Calendar {
+			checkedDates = List.copyOf(checkedDates);
+		}
+	}
+
+	public record PracticeStatistics(
+			long weeklyPracticeSeconds,
+			long trainingRecordCount,
+			int consecutiveLearningDays,
+			List<DailyPractice> lastSevenDays) {
+		public PracticeStatistics {
+			lastSevenDays = List.copyOf(lastSevenDays);
+		}
+	}
+
+	public record DailyPractice(LocalDate date, long practiceSeconds) {
+	}
+}

backend/unispeaking-server/src/main/java/com/unispeaking/domain/dto/profile/UpdateProfileRequest.java

@@ -0,0 +1,10 @@
+package com.unispeaking.domain.dto.profile;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+
+public record UpdateProfileRequest(
+		@NotBlank(message = "不能为空")
+		@Size(max = 32, message = "不能超过 32 个字符")
+		String nickname) {
+}

backend/unispeaking-server/src/main/java/com/unispeaking/domain/dto/profile/UpdateProfileResponse.java

@@ -0,0 +1,4 @@
+package com.unispeaking.domain.dto.profile;
+
+public record UpdateProfileResponse(String nickname, String displayName) {
+}

backend/unispeaking-server/src/main/java/com/unispeaking/domain/po/auth/UserAccount.java

@@ -8,24 +8,56 @@ public record UserAccount(
 		String username,
 		String passwordHash,
 		String nickname,
+		String avatarObjectKey,
 		UserRole role,
 		UserStatus status,
 		long authVersion,
 		Instant lastLoginAt,
 		Instant createdAt,
 		Instant updatedAt) {
 
+	public UserAccount(
+			UUID id,
+			String username,
+			String passwordHash,
+			String nickname,
+			UserRole role,
+			UserStatus status,
+			long authVersion,
+			Instant lastLoginAt,
+			Instant createdAt,
+			Instant updatedAt) {
+		this(id, username, passwordHash, nickname, null, role, status,
+				authVersion, lastLoginAt, createdAt, updatedAt);
+	}
+
 	public UserAccount withLastLoginAt(Instant value) {
 		return new UserAccount(
 				id,
 				username,
 				passwordHash,
 				nickname,
+				avatarObjectKey,
 				role,
 				status,
 				authVersion,
 				value,
 				createdAt,
 				updatedAt);
 	}
+
+	public UserAccount withNickname(String value) {
+		return new UserAccount(id, username, passwordHash, value, avatarObjectKey,
+				role, status, authVersion, lastLoginAt, createdAt, updatedAt);
+	}
+
+	public UserAccount withAvatarObjectKey(String value) {
+		return new UserAccount(id, username, passwordHash, nickname, value,
+				role, status, authVersion, lastLoginAt, createdAt, updatedAt);
+	}
+
+	public UserAccount withPasswordHashAndAuthVersion(String value, long version) {
+		return new UserAccount(id, username, value, nickname, avatarObjectKey,
+				role, status, version, lastLoginAt, createdAt, updatedAt);
+	}
 }

backend/unispeaking-server/src/main/java/com/unispeaking/domain/po/session/PracticeSessionRecord.java

@@ -0,0 +1,16 @@
+package com.unispeaking.domain.po.session;
+
+import com.unispeaking.domain.vo.scene.SceneType;
+import com.unispeaking.domain.vo.session.SessionStatus;
+import java.time.Instant;
+import java.util.UUID;
+
+public record PracticeSessionRecord(
+		String sessionId,
+		UUID userId,
+		String sceneId,
+		SceneType sceneType,
+		SessionStatus status,
+		Instant startedAt,
+		Instant endedAt) {
+}

backend/unispeaking-server/src/main/java/com/unispeaking/infrastructure/config/ObjectStorageConfig.java

@@ -0,0 +1,46 @@
+package com.unispeaking.infrastructure.config;
+
+import com.qiniu.storage.BucketManager;
+import com.qiniu.storage.UploadManager;
+import com.qiniu.util.Auth;
+import com.unispeaking.common.exception.BusinessException;
+import com.unispeaking.infrastructure.storage.ObjectStorageProvider;
+import com.unispeaking.infrastructure.storage.qiniu.QiniuObjectStorageProvider;
+import java.net.URI;
+import java.time.Duration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class ObjectStorageConfig {
+
+	@Bean
+	ObjectStorageProvider objectStorageProvider(ObjectStorageProperties properties) {
+		if (!properties.configured()) {
+			return new UnavailableObjectStorageProvider();
+		}
+		com.qiniu.storage.Configuration configuration =
+				com.qiniu.storage.Configuration.create();
+		Auth auth = Auth.create(
+				properties.getAccessKey(),
+				properties.getSecretKey());
+		return new QiniuObjectStorageProvider(
+				auth,
+				new UploadManager(configuration),
+				new BucketManager(auth, configuration),
+				properties);
+	}
+
+	private static final class UnavailableObjectStorageProvider
+			implements ObjectStorageProvider {
+		@Override public void put(String key, byte[] content, String type) { throw unavailable(); }
+		@Override public URI signGetUrl(String key, Duration ttl) { throw unavailable(); }
+		@Override public void delete(String key) { throw unavailable(); }
+		@Override public boolean available() { return false; }
+		private BusinessException unavailable() {
+			return new BusinessException(
+					"AVATAR_STORAGE_UNAVAILABLE",
+					"头像存储尚未配置");
+		}
+	}
+}

backend/unispeaking-server/src/main/java/com/unispeaking/infrastructure/config/ObjectStorageProperties.java

@@ -0,0 +1,31 @@
+package com.unispeaking.infrastructure.config;
+
+import java.time.Duration;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties("object-storage.qiniu")
+public class ObjectStorageProperties {
+	private String bucket = "";
+	private String accessKey = "";
+	private String secretKey = "";
+	private String domain = "";
+	private String avatarPrefix = "avatars";
+	private Duration signedUrlTtl = Duration.ofHours(1);
+
+	public boolean configured() {
+		return !bucket.isBlank() && !accessKey.isBlank()
+				&& !secretKey.isBlank() && !domain.isBlank();
+	}
+	public String getBucket() { return bucket; }
+	public void setBucket(String value) { bucket = value == null ? "" : value.trim(); }
+	public String getAccessKey() { return accessKey; }
+	public void setAccessKey(String value) { accessKey = value == null ? "" : value.trim(); }
+	public String getSecretKey() { return secretKey; }
+	public void setSecretKey(String value) { secretKey = value == null ? "" : value.trim(); }
+	public String getDomain() { return domain; }
+	public void setDomain(String value) { domain = value == null ? "" : value.trim(); }
+	public String getAvatarPrefix() { return avatarPrefix; }
+	public void setAvatarPrefix(String value) { avatarPrefix = value == null ? "avatars" : value.trim(); }
+	public Duration getSignedUrlTtl() { return signedUrlTtl; }
+	public void setSignedUrlTtl(Duration value) { signedUrlTtl = value; }
+}