From d38acf5ccc84497dcb105698a0253e2f9af89cca Mon Sep 17 00:00:00 2001 From: chenhao Date: Wed, 24 Jun 2026 09:52:17 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=20`authenticateH?= =?UTF-8?q?ttpIgnoreToken`=20=E6=96=B9=E6=B3=95=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E6=9E=84=E5=BB=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 `AndroidMeetingChunkUploadController` 和 `AndroidMeetingController` 中使用 `authenticateHttpIgnoreToken` 方法进行认证 - 优化 `AndroidMeetingController` 中的响应构建逻辑,添加日志记录 --- .../AndroidMeetingChunkUploadController.java | 2 +- .../android/AndroidMeetingController.java | 22 ++++++++++--------- .../AndroidUnifiedMeetingStatusResponse.java | 2 ++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/backend/src/main/java/com/imeeting/controller/android/AndroidMeetingChunkUploadController.java b/backend/src/main/java/com/imeeting/controller/android/AndroidMeetingChunkUploadController.java index e48ac49..6d3ceec 100644 --- a/backend/src/main/java/com/imeeting/controller/android/AndroidMeetingChunkUploadController.java +++ b/backend/src/main/java/com/imeeting/controller/android/AndroidMeetingChunkUploadController.java @@ -49,7 +49,7 @@ public class AndroidMeetingChunkUploadController { "meetingId", meetingId, "chunkIndex", chunkIndex, "chunkFile", chunkFile); - AndroidAuthContext authContext = androidAuthService.authenticateHttp(request); + AndroidAuthContext authContext = androidAuthService.authenticateHttpIgnoreToken(request,true); androidChunkUploadService.saveChunk(meetingId, chunkIndex, chunkFile, authContext); return ApiResponse.ok(true); } diff --git a/backend/src/main/java/com/imeeting/controller/android/AndroidMeetingController.java b/backend/src/main/java/com/imeeting/controller/android/AndroidMeetingController.java index 5729293..510a24d 100644 --- a/backend/src/main/java/com/imeeting/controller/android/AndroidMeetingController.java +++ b/backend/src/main/java/com/imeeting/controller/android/AndroidMeetingController.java @@ -238,7 +238,7 @@ public class AndroidMeetingController { AndroidRequestLogHelper.logRequest(log, "Android会议", "结束离线会议录音阶段", "meetingId", meetingId, "request", command); - AndroidAuthContext authContext = androidAuthService.authenticateHttp(request); + AndroidAuthContext authContext = androidAuthService.authenticateHttpIgnoreToken(request,true); LoginUser loginUser = authContext.isAnonymous() ? null : AndroidLoginUserSupport.requireLoginUser(authContext); MeetingVO meeting = requireOperableOfflineMeeting(meetingId, authContext, loginUser); LegacyUploadAudioResponse uploadResult = null; @@ -316,15 +316,17 @@ public class AndroidMeetingController { boolean includeSummary = Boolean.TRUE.equals(command == null ? null : command.getIncludeSummary()); List transcripts = includeTranscript ? meetingQueryService.getTranscripts(meetingId) : null; String summaryContent = includeSummary ? meetingQueryService.getDetailIgnoreTenant(meetingId).getSummaryContent() : null; - return ApiResponse.ok(AndroidUnifiedMeetingStatusResponse.builder() - .meetingId(meetingId) - .status(status) - .meeting(meeting) - .includesTranscript(includeTranscript) - .transcripts(transcripts) - .includesSummary(includeSummary) - .summaryContent(summaryContent) - .build()); + AndroidUnifiedMeetingStatusResponse build = AndroidUnifiedMeetingStatusResponse.builder() + .meetingId(meetingId) + .status(status) + .meeting(meeting) + .includesTranscript(includeTranscript) + .transcripts(transcripts) + .includesSummary(includeSummary) + .summaryContent(summaryContent) + .build(); + log.info("[{}]{}.返回数据:[{}]","Android会议","查询会议统一状态",build); + return ApiResponse.ok(build); } @Operation(summary = "重试 Android 会议 ASR 识别") diff --git a/backend/src/main/java/com/imeeting/dto/android/AndroidUnifiedMeetingStatusResponse.java b/backend/src/main/java/com/imeeting/dto/android/AndroidUnifiedMeetingStatusResponse.java index 839befc..04f7ae4 100644 --- a/backend/src/main/java/com/imeeting/dto/android/AndroidUnifiedMeetingStatusResponse.java +++ b/backend/src/main/java/com/imeeting/dto/android/AndroidUnifiedMeetingStatusResponse.java @@ -6,12 +6,14 @@ import com.imeeting.dto.biz.UnifiedMeetingStatusVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Data; +import lombok.ToString; import java.util.List; @Data @Builder @Schema(description = "Android 统一会议状态响应") +@ToString public class AndroidUnifiedMeetingStatusResponse { @Schema(description = "会议ID") private Long meetingId;