refactor: 使用 `authenticateHttpIgnoreToken` 方法并优化响应构建逻辑
- 在 `AndroidMeetingChunkUploadController` 和 `AndroidMeetingController` 中使用 `authenticateHttpIgnoreToken` 方法进行认证 - 优化 `AndroidMeetingController` 中的响应构建逻辑,添加日志记录dev_na
parent
95f7f766c5
commit
d38acf5ccc
|
|
@ -49,7 +49,7 @@ public class AndroidMeetingChunkUploadController {
|
||||||
"meetingId", meetingId,
|
"meetingId", meetingId,
|
||||||
"chunkIndex", chunkIndex,
|
"chunkIndex", chunkIndex,
|
||||||
"chunkFile", chunkFile);
|
"chunkFile", chunkFile);
|
||||||
AndroidAuthContext authContext = androidAuthService.authenticateHttp(request);
|
AndroidAuthContext authContext = androidAuthService.authenticateHttpIgnoreToken(request,true);
|
||||||
androidChunkUploadService.saveChunk(meetingId, chunkIndex, chunkFile, authContext);
|
androidChunkUploadService.saveChunk(meetingId, chunkIndex, chunkFile, authContext);
|
||||||
return ApiResponse.ok(true);
|
return ApiResponse.ok(true);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -238,7 +238,7 @@ public class AndroidMeetingController {
|
||||||
AndroidRequestLogHelper.logRequest(log, "Android会议", "结束离线会议录音阶段",
|
AndroidRequestLogHelper.logRequest(log, "Android会议", "结束离线会议录音阶段",
|
||||||
"meetingId", meetingId,
|
"meetingId", meetingId,
|
||||||
"request", command);
|
"request", command);
|
||||||
AndroidAuthContext authContext = androidAuthService.authenticateHttp(request);
|
AndroidAuthContext authContext = androidAuthService.authenticateHttpIgnoreToken(request,true);
|
||||||
LoginUser loginUser = authContext.isAnonymous() ? null : AndroidLoginUserSupport.requireLoginUser(authContext);
|
LoginUser loginUser = authContext.isAnonymous() ? null : AndroidLoginUserSupport.requireLoginUser(authContext);
|
||||||
MeetingVO meeting = requireOperableOfflineMeeting(meetingId, authContext, loginUser);
|
MeetingVO meeting = requireOperableOfflineMeeting(meetingId, authContext, loginUser);
|
||||||
LegacyUploadAudioResponse uploadResult = null;
|
LegacyUploadAudioResponse uploadResult = null;
|
||||||
|
|
@ -316,7 +316,7 @@ public class AndroidMeetingController {
|
||||||
boolean includeSummary = Boolean.TRUE.equals(command == null ? null : command.getIncludeSummary());
|
boolean includeSummary = Boolean.TRUE.equals(command == null ? null : command.getIncludeSummary());
|
||||||
List<MeetingTranscriptVO> transcripts = includeTranscript ? meetingQueryService.getTranscripts(meetingId) : null;
|
List<MeetingTranscriptVO> transcripts = includeTranscript ? meetingQueryService.getTranscripts(meetingId) : null;
|
||||||
String summaryContent = includeSummary ? meetingQueryService.getDetailIgnoreTenant(meetingId).getSummaryContent() : null;
|
String summaryContent = includeSummary ? meetingQueryService.getDetailIgnoreTenant(meetingId).getSummaryContent() : null;
|
||||||
return ApiResponse.ok(AndroidUnifiedMeetingStatusResponse.builder()
|
AndroidUnifiedMeetingStatusResponse build = AndroidUnifiedMeetingStatusResponse.builder()
|
||||||
.meetingId(meetingId)
|
.meetingId(meetingId)
|
||||||
.status(status)
|
.status(status)
|
||||||
.meeting(meeting)
|
.meeting(meeting)
|
||||||
|
|
@ -324,7 +324,9 @@ public class AndroidMeetingController {
|
||||||
.transcripts(transcripts)
|
.transcripts(transcripts)
|
||||||
.includesSummary(includeSummary)
|
.includesSummary(includeSummary)
|
||||||
.summaryContent(summaryContent)
|
.summaryContent(summaryContent)
|
||||||
.build());
|
.build();
|
||||||
|
log.info("[{}]{}.返回数据:[{}]","Android会议","查询会议统一状态",build);
|
||||||
|
return ApiResponse.ok(build);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Operation(summary = "重试 Android 会议 ASR 识别")
|
@Operation(summary = "重试 Android 会议 ASR 识别")
|
||||||
|
|
|
||||||
|
|
@ -6,12 +6,14 @@ import com.imeeting.dto.biz.UnifiedMeetingStatusVO;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import lombok.ToString;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Builder
|
@Builder
|
||||||
@Schema(description = "Android 统一会议状态响应")
|
@Schema(description = "Android 统一会议状态响应")
|
||||||
|
@ToString
|
||||||
public class AndroidUnifiedMeetingStatusResponse {
|
public class AndroidUnifiedMeetingStatusResponse {
|
||||||
@Schema(description = "会议ID")
|
@Schema(description = "会议ID")
|
||||||
private Long meetingId;
|
private Long meetingId;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue