diff --git a/.gitignore b/.gitignore index ca9034d..6db3790 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ frontend/coverage/ .vscode/ *.iml .toolchain/ + +# E2E 截图产物 +scripts/.e2e-artifacts/ diff --git a/README.md b/README.md index 4d98587..4b30a8d 100644 --- a/README.md +++ b/README.md @@ -2,25 +2,39 @@ 校园课堂直播、巡课和回放。Java 只在 Docker 里编译和运行,不要在 Windows 上安装 JDK。 -## 本地命令 +## 本地开发(热更新预览) ```powershell copy .env.example .env -.\scripts\mvn.ps1 test +docker compose --env-file .env up -d # 起后端、数据库、LiveKit、Egress、MinIO +docker compose stop web # 18088 改用 Vite 开发服务器 cd frontend npm install -npm test -npm run dev +npm run dev # http://localhost:18088,改动即时生效 ``` -前端开发服务器是 `http://localhost:5173`,接口代理到 `http://localhost:8080`。 +- 后端测试:`.\scripts\mvn.ps1 test` +- 前端测试:`cd frontend && npm test` +- API 验收:`.\scripts\acceptance.ps1`(建校、审核、开播、权限隔离) +- 浏览器端到端(真实推流+观看+录像+回放,需本机 Chrome):`node scripts\e2e-browser.mjs` -完整堆栈: +角色入口(登录后自动跳转): + +- 管理端 `/admin`(超级管理员/学校管理员/巡课) +- 教师端 `/teacher`(选摄像头、麦克风,开播/停播) +- 家长端 `/parent`(绑定班级、看直播、看回放) +- 落地页 `/`,观看页 `/watch/:id` + +## 生产构建 ```powershell docker compose --env-file .env up --build ``` -网站入口是 `http://localhost:8088`。初始管理员来自 `.env` 的 `ADMIN_USERNAME` 和 `ADMIN_PASSWORD`,示例口令只能用于本机。 +网站入口 `http://localhost:18088`。初始管理员来自 `.env` 的 `ADMIN_USERNAME` / `ADMIN_PASSWORD`,示例口令只能用于本机;首次部署请更换全部密钥并把 `APP_PROD_GUARD` 设为 `true`。 -浏览器要访问摄像头,请使用 `localhost`。跨公网观看 WebRTC 时,还要把 LiveKit 的节点 IP 和 TURN 配到学校网络,不能只打开 HTTPS。 +## 注意事项 + +- 浏览器访问摄像头/麦克风必须用 `localhost`(或 HTTPS)这类安全上下文。 +- 跨公网观看 WebRTC 时,需要把 LiveKit 的节点 IP、`rtc` 端口段和 TURN 配到学校网络,不能只开放一个 HTTPS 端口。 +- 录像保存在 MinIO 私有桶,回放通过带权限校验的短期预签名链接访问,默认不提供下载。 diff --git a/backend/src/main/java/com/xh/xunke/course/CourseService.java b/backend/src/main/java/com/xh/xunke/course/CourseService.java index 4a36ff7..82f8669 100644 --- a/backend/src/main/java/com/xh/xunke/course/CourseService.java +++ b/backend/src/main/java/com/xh/xunke/course/CourseService.java @@ -6,6 +6,8 @@ import com.xh.xunke.common.PagePayload; import com.xh.xunke.common.Pages; import com.xh.xunke.school.SchoolService; import com.xh.xunke.security.UserPrincipal; +import com.xh.xunke.user.UserAccount; +import com.xh.xunke.user.UserRepository; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import org.springframework.stereotype.Service; @@ -13,8 +15,13 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.time.LocalTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Comparator; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; @Service public class CourseService { @@ -22,12 +29,15 @@ public class CourseService { private final PeriodRepository periods; private final TimetableRepository timetable; private final SchoolService schools; + private final UserRepository users; - public CourseService(CourseRepository courses, PeriodRepository periods, TimetableRepository timetable, SchoolService schools) { + public CourseService(CourseRepository courses, PeriodRepository periods, TimetableRepository timetable, + SchoolService schools, UserRepository users) { this.courses = courses; this.periods = periods; this.timetable = timetable; this.schools = schools; + this.users = users; } public record CourseRequest(@NotNull Long classId, @NotNull Long teacherId, @NotBlank String name, @@ -191,6 +201,35 @@ public class CourseService { return saved; } + /** 家长今日课程表:按绑定班级汇总今天的课节,带时间与名称。 */ + public List> todayViews(List classIds) { + ZoneId zone = ZoneId.of("Asia/Shanghai"); + LocalTime now = LocalTime.now(zone); + DateTimeFormatter hm = DateTimeFormatter.ofPattern("HH:mm"); + List> rows = new ArrayList<>(); + for (Long classId : classIds) { + for (TimetableEntry entry : today(classId)) { + Period period = periods.findById(entry.getPeriodId()).orElse(null); + if (period == null) { + continue; + } + Course course = courses.findById(entry.getCourseId()).orElse(null); + Map row = new LinkedHashMap<>(); + row.put("classId", classId); + row.put("className", schools.className(classId)); + row.put("courseName", course == null ? "课程" : course.getName()); + row.put("teacherName", users.findById(entry.getTeacherId()).map(UserAccount::getDisplayName).orElse("教师")); + row.put("startTime", period.getStartTime().format(hm)); + row.put("endTime", period.getEndTime().format(hm)); + row.put("phase", now.isBefore(period.getStartTime()) ? "later" : now.isAfter(period.getEndTime()) ? "done" : "now"); + rows.add(row); + } + } + rows.sort(Comparator.comparing((Map row) -> String.valueOf(row.get("startTime"))) + .thenComparing(row -> String.valueOf(row.get("className")))); + return rows; + } + public List today(Long classId) { int weekday = LocalDate.now(java.time.ZoneId.of("Asia/Shanghai")).getDayOfWeek().getValue(); LocalDate today = LocalDate.now(java.time.ZoneId.of("Asia/Shanghai")); diff --git a/backend/src/main/java/com/xh/xunke/live/LiveKitGateway.java b/backend/src/main/java/com/xh/xunke/live/LiveKitGateway.java index 6fe3835..c77c6f6 100644 --- a/backend/src/main/java/com/xh/xunke/live/LiveKitGateway.java +++ b/backend/src/main/java/com/xh/xunke/live/LiveKitGateway.java @@ -56,6 +56,22 @@ public class LiveKitGateway { } } + public void removeParticipantsWithPrefix(String room, String prefix) { + try { + var response = api.getRoom().listParticipants(room).execute(); + if (!response.isSuccessful() || response.body() == null) { + return; + } + for (var participant : response.body()) { + if (participant.getIdentity().startsWith(prefix)) { + api.getRoom().removeParticipant(room, participant.getIdentity()).execute(); + } + } + } catch (Exception ex) { + log.warn("移出直播参与者失败"); + } + } + public String startEgress(String room, String objectKey) { try { LivekitEgress.S3Upload s3 = LivekitEgress.S3Upload.newBuilder() diff --git a/backend/src/main/java/com/xh/xunke/live/LiveSessionRepository.java b/backend/src/main/java/com/xh/xunke/live/LiveSessionRepository.java index d09a5b5..9d775b7 100644 --- a/backend/src/main/java/com/xh/xunke/live/LiveSessionRepository.java +++ b/backend/src/main/java/com/xh/xunke/live/LiveSessionRepository.java @@ -16,6 +16,10 @@ public interface LiveSessionRepository extends JpaRepository Page findByStatus(String status, Pageable pageable); + List findByTeacherId(Long teacherId); + + Page findByClassIdInAndStatus(List classIds, String status, Pageable pageable); + List findByStatusIn(List statuses); long countByStatus(String status); diff --git a/backend/src/main/java/com/xh/xunke/live/LiveSessionService.java b/backend/src/main/java/com/xh/xunke/live/LiveSessionService.java index 64b4650..033a387 100644 --- a/backend/src/main/java/com/xh/xunke/live/LiveSessionService.java +++ b/backend/src/main/java/com/xh/xunke/live/LiveSessionService.java @@ -15,12 +15,15 @@ import com.xh.xunke.school.SchoolService; import com.xh.xunke.security.AccessGuard; import com.xh.xunke.security.UserPrincipal; import com.xh.xunke.settings.SettingsService; +import com.xh.xunke.user.UserAccount; +import com.xh.xunke.user.UserRepository; import jakarta.validation.constraints.NotNull; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.Instant; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -38,11 +41,12 @@ public class LiveSessionService { private final AccessGuard guard; private final StringRedisTemplate redis; private final CourseService courseService; + private final UserRepository users; public LiveSessionService(LiveSessionRepository sessions, CourseRepository courses, SchoolRepository schools, SchoolService schoolService, BindingService bindings, LiveKitGateway liveKit, RecordingService recordings, SettingsService settings, AccessGuard guard, - StringRedisTemplate redis, CourseService courseService) { + StringRedisTemplate redis, CourseService courseService, UserRepository users) { this.sessions = sessions; this.courses = courses; this.schools = schools; @@ -54,6 +58,7 @@ public class LiveSessionService { this.guard = guard; this.redis = redis; this.courseService = courseService; + this.users = users; } public record StartRequest(@NotNull Long classId, @NotNull Long courseId, String videoDevice, String audioDevice) { @@ -91,7 +96,7 @@ public class LiveSessionService { session.setRecordEnabled(course.isAllowRecord() && school.isRecordEnabled()); session.setLastHeartbeatAt(Instant.now()); sessions.save(session); - String token = liveKit.token("u-" + me.id(), me.displayName(), session.getRoomName(), true); + String token = liveKit.token(publishIdentity(me), me.displayName(), session.getRoomName(), true); return Map.of("session", session, "url", settings.text("site.name.zh", "XH巡课") == null ? "" : liveUrl(), "livekitUrl", liveUrl(), "token", token); } @@ -139,7 +144,8 @@ public class LiveSessionService { boolean parentLive = bindings.parentCan(me.id(), session.getClassId(), false); LiveAuthorization.Kind kind = LiveAuthorization.decide(publish, session.getStatus(), teacher, staff, parentLive); boolean canPublish = kind == LiveAuthorization.Kind.PUBLISH; - String token = liveKit.token("u-" + me.id(), me.displayName(), session.getRoomName(), canPublish); + String identity = canPublish ? publishIdentity(me) : subscribeIdentity(me); + String token = liveKit.token(identity, me.displayName(), session.getRoomName(), canPublish); return new TokenView(liveUrl(), token, session.getRoomName(), kind.name(), session.getId()); } @@ -156,31 +162,66 @@ public class LiveSessionService { return count; } - public PagePayload list(UserPrincipal me, String status, int page, int size) { + public PagePayload> list(UserPrincipal me, String status, int page, int size) { String wanted = status == null ? "LIVE" : status; + // 家长:只看到授权班级的直播 if (!me.superAdmin() && !me.schoolStaff() && !me.canTeach()) { var result = sessions.findByStatus(wanted, Pages.of(page, size)); var allowed = result.getContent().stream() .filter(session -> bindings.parentCan(me.id(), session.getClassId(), false)) + .map(this::sessionView) .toList(); return new PagePayload<>(allowed, allowed.size(), result.getNumber(), result.getSize()); } + // 教师:只看到自己任教班级的直播 + if (me.canTeach() && !me.superAdmin() && !me.schoolStaff()) { + List classIds = schoolService.teacherClassIds(me.id()); + var result = classIds.isEmpty() + ? org.springframework.data.domain.Page.empty(Pages.of(page, size)) + : sessions.findByClassIdInAndStatus(classIds, wanted, Pages.of(page, size)); + return new PagePayload<>(result.getContent().stream().map(this::sessionView).toList(), + result.getTotalElements(), result.getNumber(), result.getSize()); + } if (!me.superAdmin() && me.schoolId() == null) { return new PagePayload<>(java.util.List.of(), 0, page, size); } var result = me.superAdmin() ? sessions.findByStatus(wanted, Pages.of(page, size)) : sessions.findBySchoolIdAndStatus(me.schoolId(), wanted, Pages.of(page, size)); - return new PagePayload<>(result.getContent(), result.getTotalElements(), result.getNumber(), result.getSize()); + return new PagePayload<>(result.getContent().stream().map(this::sessionView).toList(), + result.getTotalElements(), result.getNumber(), result.getSize()); } - public LiveSession get(UserPrincipal me, Long id) { + public Map get(UserPrincipal me, Long id) { LiveSession session = sessions.findById(id).orElseThrow(() -> new BizException(ErrorCode.NOT_FOUND, "直播不存在")); if (!me.superAdmin() && !session.getSchoolId().equals(me.schoolId()) && !bindings.parentCan(me.id(), session.getClassId(), false) && !session.getTeacherId().equals(me.id())) { throw new BizException(ErrorCode.FORBIDDEN, "不能查看该直播"); } - return session; + return sessionView(session); + } + + private Map sessionView(LiveSession session) { + Map view = new LinkedHashMap<>(); + view.put("id", session.getId()); + view.put("schoolId", session.getSchoolId()); + view.put("classId", session.getClassId()); + view.put("courseId", session.getCourseId()); + view.put("teacherId", session.getTeacherId()); + view.put("roomName", session.getRoomName()); + view.put("status", session.getStatus()); + view.put("startedAt", session.getStartedAt()); + view.put("endedAt", session.getEndedAt()); + view.put("endReason", session.getEndReason()); + view.put("viewerPeak", session.getViewerPeak()); + view.put("recordEnabled", session.isRecordEnabled()); + view.put("createdAt", session.getCreatedAt()); + view.put("className", schoolService.className(session.getClassId())); + view.put("schoolName", schoolService.schoolName(session.getSchoolId())); + view.put("courseName", courses.findById(session.getCourseId()).map(Course::getName).orElse("课程")); + view.put("teacherName", users.findById(session.getTeacherId()).map(UserAccount::getDisplayName).orElse("教师")); + view.put("viewers", countViewers(session.getId())); + return view; } @Transactional @@ -252,4 +293,12 @@ public class LiveSessionService { private String liveUrl() { return System.getenv().getOrDefault("LIVEKIT_PUBLIC_URL", "ws://localhost:7880"); } + + private String publishIdentity(UserPrincipal me) { + return "u-" + me.id(); + } + + private String subscribeIdentity(UserPrincipal me) { + return "u-" + me.id() + "-watch-" + Long.toHexString(System.nanoTime()); + } } diff --git a/backend/src/main/java/com/xh/xunke/notify/NotificationService.java b/backend/src/main/java/com/xh/xunke/notify/NotificationService.java index eb35b12..0724360 100644 --- a/backend/src/main/java/com/xh/xunke/notify/NotificationService.java +++ b/backend/src/main/java/com/xh/xunke/notify/NotificationService.java @@ -133,10 +133,13 @@ public class NotificationService { JavaMailSenderImpl sender = new JavaMailSenderImpl(); sender.setHost(settings.getHost()); sender.setPort(settings.getPort() == null ? 465 : settings.getPort()); - sender.setUsername(settings.getUsername()); - sender.setPassword(cipher.decrypt(settings.getPasswordCipher())); + boolean authenticate = settings.getUsername() != null && !settings.getUsername().isBlank(); + if (authenticate) { + sender.setUsername(settings.getUsername()); + sender.setPassword(cipher.decrypt(settings.getPasswordCipher())); + } Properties mailProps = sender.getJavaMailProperties(); - mailProps.put("mail.smtp.auth", "true"); + mailProps.put("mail.smtp.auth", Boolean.toString(authenticate)); mailProps.put("mail.smtp.ssl.enable", Boolean.toString(settings.isSslEnabled())); mailProps.put("mail.smtp.starttls.enable", Boolean.toString(settings.isStarttls())); mailProps.put("mail.smtp.connectiontimeout", "5000"); diff --git a/backend/src/main/java/com/xh/xunke/recording/MediaProbe.java b/backend/src/main/java/com/xh/xunke/recording/MediaProbe.java index 5f5b444..bf88817 100644 --- a/backend/src/main/java/com/xh/xunke/recording/MediaProbe.java +++ b/backend/src/main/java/com/xh/xunke/recording/MediaProbe.java @@ -32,7 +32,7 @@ public class MediaProbe { try { String url = storage.presignInternal(recording.getObjectKey(), 10); Process process = new ProcessBuilder(props.getFfprobePath(), "-v", "error", "-show_streams", - "-print_format", "json", url) + "-show_format", "-print_format", "json", url) .redirectErrorStream(true) .start(); boolean finished = process.waitFor(20, TimeUnit.SECONDS); @@ -48,6 +48,13 @@ public class MediaProbe { ProbeParser.Result result = ProbeParser.parse(output); recording.setHasVideo(result.video()); recording.setHasAudio(result.audio()); + if (result.durationSeconds() > 0) { + recording.setDurationSeconds(result.durationSeconds()); + } + Long size = storage.size(recording.getObjectKey()); + if (size != null) { + recording.setFileSize(size); + } if (result.video() && result.audio()) { recording.setStatus("COMPLETED"); recording.setErrorMessage(null); diff --git a/backend/src/main/java/com/xh/xunke/recording/ObjectStorage.java b/backend/src/main/java/com/xh/xunke/recording/ObjectStorage.java index f53ddf6..51c2b6a 100644 --- a/backend/src/main/java/com/xh/xunke/recording/ObjectStorage.java +++ b/backend/src/main/java/com/xh/xunke/recording/ObjectStorage.java @@ -2,16 +2,21 @@ package com.xh.xunke.recording; import com.xh.xunke.config.AppProperties; import io.minio.BucketExistsArgs; +import io.minio.GetObjectArgs; +import io.minio.GetObjectResponse; import io.minio.GetPresignedObjectUrlArgs; import io.minio.MakeBucketArgs; import io.minio.MinioClient; +import io.minio.PutObjectArgs; import io.minio.RemoveObjectArgs; import io.minio.StatObjectArgs; +import io.minio.StatObjectResponse; import io.minio.http.Method; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import java.io.InputStream; import java.util.concurrent.TimeUnit; @Component @@ -48,6 +53,8 @@ public class ObjectStorage { } public String presignPlayback(String key, int minutes) { + // 用浏览器可达的公开端点直接签名。客户端已显式设置 region,签名过程不会访问服务器, + // 因此容器内也能为 localhost:9000 生成有效链接。 return sign(browser, key, minutes); } @@ -55,6 +62,46 @@ public class ObjectStorage { return sign(internal, key, minutes); } + public Long size(String key) { + try { + return internal.statObject(StatObjectArgs.builder().bucket(props.getMinioBucket()).object(key).build()).size(); + } catch (Exception ex) { + return null; + } + } + + public void put(String key, String contentType, InputStream data) { + try { + internal.putObject(PutObjectArgs.builder() + .bucket(props.getMinioBucket()) + .object(key) + .contentType(contentType) + .stream(data, -1, 10485760) + .build()); + } catch (Exception ex) { + throw new com.xh.xunke.common.BizException(com.xh.xunke.common.ErrorCode.UPSTREAM, "对象上传失败"); + } + } + + public record StoredObject(InputStream stream, String contentType, long size) { + } + + public StoredObject get(String key) { + try { + GetObjectResponse response = internal.getObject(GetObjectArgs.builder() + .bucket(props.getMinioBucket()) + .object(key) + .build()); + StatObjectResponse stat = internal.statObject(StatObjectArgs.builder() + .bucket(props.getMinioBucket()) + .object(key) + .build()); + return new StoredObject(response, response.headers().get("Content-Type"), stat.size()); + } catch (Exception ex) { + throw new com.xh.xunke.common.BizException(com.xh.xunke.common.ErrorCode.NOT_FOUND, "对象不存在"); + } + } + public boolean exists(String key) { try { internal.statObject(StatObjectArgs.builder().bucket(props.getMinioBucket()).object(key).build()); @@ -88,6 +135,7 @@ public class ObjectStorage { private static MinioClient client(String endpoint, AppProperties props) { return MinioClient.builder() .endpoint(endpoint) + .region("us-east-1") .credentials(props.getMinioAccess(), props.getMinioSecret()) .build(); } diff --git a/backend/src/main/java/com/xh/xunke/recording/ProbeParser.java b/backend/src/main/java/com/xh/xunke/recording/ProbeParser.java index ec6c7b4..d4369eb 100644 --- a/backend/src/main/java/com/xh/xunke/recording/ProbeParser.java +++ b/backend/src/main/java/com/xh/xunke/recording/ProbeParser.java @@ -9,12 +9,13 @@ public final class ProbeParser { private ProbeParser() { } - public record Result(boolean video, boolean audio) { + public record Result(boolean video, boolean audio, int durationSeconds) { } public static Result parse(String body) { try { - JsonNode streams = JSON.readTree(body).path("streams"); + JsonNode json = JSON.readTree(body); + JsonNode streams = json.path("streams"); boolean video = false; boolean audio = false; if (streams.isArray()) { @@ -27,9 +28,10 @@ public final class ProbeParser { } } } - return new Result(video, audio); + double duration = json.path("format").path("duration").asDouble(0); + return new Result(video, audio, (int) Math.round(duration)); } catch (Exception ex) { - return new Result(false, false); + return new Result(false, false, 0); } } } diff --git a/backend/src/main/java/com/xh/xunke/recording/RecordingRepository.java b/backend/src/main/java/com/xh/xunke/recording/RecordingRepository.java index 29555ed..864fd8c 100644 --- a/backend/src/main/java/com/xh/xunke/recording/RecordingRepository.java +++ b/backend/src/main/java/com/xh/xunke/recording/RecordingRepository.java @@ -18,6 +18,10 @@ public interface RecordingRepository extends JpaRepository { Page findByClassId(Long classId, Pageable pageable); + Page findByClassIdIn(List classIds, Pageable pageable); + + Page findBySessionIdIn(List sessionIds, Pageable pageable); + List findByStatusAndEndedAtBefore(String status, Instant endedBefore); long countByStatus(String status); diff --git a/backend/src/main/java/com/xh/xunke/recording/RecordingService.java b/backend/src/main/java/com/xh/xunke/recording/RecordingService.java index 45621ca..8f4b9b7 100644 --- a/backend/src/main/java/com/xh/xunke/recording/RecordingService.java +++ b/backend/src/main/java/com/xh/xunke/recording/RecordingService.java @@ -5,18 +5,26 @@ import com.xh.xunke.common.ErrorCode; import com.xh.xunke.common.PagePayload; import com.xh.xunke.common.Pages; import com.xh.xunke.config.AppProperties; +import com.xh.xunke.course.Course; +import com.xh.xunke.course.CourseRepository; import com.xh.xunke.live.LiveKitGateway; import com.xh.xunke.live.LiveSession; import com.xh.xunke.live.LiveSessionRepository; import com.xh.xunke.school.BindingService; import com.xh.xunke.school.SchoolRepository; +import com.xh.xunke.school.SchoolService; import com.xh.xunke.security.UserPrincipal; +import com.xh.xunke.user.UserAccount; +import com.xh.xunke.user.UserRepository; import livekit.LivekitWebhook; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.Instant; import java.time.temporal.ChronoUnit; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; @Service public class RecordingService { @@ -28,10 +36,14 @@ public class RecordingService { private final SchoolRepository schools; private final AppProperties props; private final MediaProbe mediaProbe; + private final SchoolService schoolService; + private final CourseRepository courses; + private final UserRepository users; public RecordingService(RecordingRepository recordings, LiveSessionRepository sessions, LiveKitGateway liveKit, ObjectStorage storage, BindingService bindings, SchoolRepository schools, AppProperties props, - MediaProbe mediaProbe) { + MediaProbe mediaProbe, SchoolService schoolService, CourseRepository courses, + UserRepository users) { this.recordings = recordings; this.sessions = sessions; this.liveKit = liveKit; @@ -40,6 +52,9 @@ public class RecordingService { this.schools = schools; this.props = props; this.mediaProbe = mediaProbe; + this.schoolService = schoolService; + this.courses = courses; + this.users = users; } @Transactional @@ -103,17 +118,67 @@ public class RecordingService { }); } - public PagePayload list(UserPrincipal me, Long classId, int page, int size) { - var result = classId != null - ? recordings.findByClassId(classId, Pages.of(page, size)) - : (me.superAdmin() ? recordings.findAll(Pages.of(page, size)) : recordings.findBySchoolId(me.schoolId(), Pages.of(page, size))); - if (!me.superAdmin() && !me.schoolStaff() && me.schoolId() == null) { - var allowed = result.getContent().stream() - .filter(item -> bindings.parentCan(me.id(), item.getClassId(), true)) - .toList(); - return new PagePayload<>(allowed, allowed.size(), page, size); + public PagePayload> list(UserPrincipal me, Long classId, int page, int size) { + // 管理员/巡课:全站或本校范围 + if (me.superAdmin() || me.schoolStaff()) { + var result = classId != null + ? recordings.findByClassId(classId, Pages.of(page, size)) + : (me.superAdmin() ? recordings.findAll(Pages.of(page, size)) : recordings.findBySchoolId(me.schoolId(), Pages.of(page, size))); + return mapped(result); } - return new PagePayload<>(result.getContent(), result.getTotalElements(), result.getNumber(), result.getSize()); + // 教师:只看到自己发起的直播的录像 + if (me.canTeach()) { + List sessionIds = sessions.findByTeacherId(me.id()).stream().map(LiveSession::getId).toList(); + var result = sessionIds.isEmpty() + ? org.springframework.data.domain.Page.empty(Pages.of(page, size)) + : recordings.findBySessionIdIn(sessionIds, Pages.of(page, size)); + return mapped(result); + } + // 家长:只看到绑定班级且回放授权的录像,跨班级请求直接拒绝 + List classIds = bindings.replayClassIds(me.id()); + org.springframework.data.domain.Page result; + if (classIds.isEmpty()) { + result = org.springframework.data.domain.Page.empty(Pages.of(page, size)); + } else if (classId != null) { + result = classIds.contains(classId) + ? recordings.findByClassId(classId, Pages.of(page, size)) + : org.springframework.data.domain.Page.empty(Pages.of(page, size)); + } else { + result = recordings.findByClassIdIn(classIds, Pages.of(page, size)); + } + return mapped(result); + } + + private PagePayload> mapped(org.springframework.data.domain.Page result) { + return new PagePayload<>(result.getContent().stream().map(this::recordingView).toList(), + result.getTotalElements(), result.getNumber(), result.getSize()); + } + + private Map recordingView(Recording recording) { + Map view = new LinkedHashMap<>(); + view.put("id", recording.getId()); + view.put("sessionId", recording.getSessionId()); + view.put("schoolId", recording.getSchoolId()); + view.put("classId", recording.getClassId()); + view.put("status", recording.getStatus()); + view.put("fileSize", recording.getFileSize()); + view.put("durationSeconds", recording.getDurationSeconds()); + view.put("hasVideo", recording.getHasVideo()); + view.put("hasAudio", recording.getHasAudio()); + view.put("errorMessage", recording.getErrorMessage()); + view.put("retryCount", recording.getRetryCount()); + view.put("startedAt", recording.getStartedAt()); + view.put("endedAt", recording.getEndedAt()); + view.put("createdAt", recording.getCreatedAt()); + view.put("className", schoolService.className(recording.getClassId())); + view.put("schoolName", schoolService.schoolName(recording.getSchoolId())); + sessions.findById(recording.getSessionId()).ifPresent(session -> { + view.put("courseId", session.getCourseId()); + view.put("teacherId", session.getTeacherId()); + view.put("courseName", courses.findById(session.getCourseId()).map(Course::getName).orElse("课程")); + view.put("teacherName", users.findById(session.getTeacherId()).map(UserAccount::getDisplayName).orElse("教师")); + }); + return view; } public String playback(UserPrincipal me, Long id) { diff --git a/backend/src/main/java/com/xh/xunke/school/BindingRepository.java b/backend/src/main/java/com/xh/xunke/school/BindingRepository.java index 5fb06b7..69cc37d 100644 --- a/backend/src/main/java/com/xh/xunke/school/BindingRepository.java +++ b/backend/src/main/java/com/xh/xunke/school/BindingRepository.java @@ -9,12 +9,16 @@ import java.util.List; import java.util.Optional; public interface BindingRepository extends JpaRepository { + Page findBySchoolId(Long schoolId, Pageable pageable); + Page findBySchoolIdAndStatus(Long schoolId, String status, Pageable pageable); Page findByStatus(String status, Pageable pageable); List findByParentId(Long parentId); + List findByParentIdAndStatusAndReplayGranted(Long parentId, String status, boolean replayGranted); + Optional findByParentIdAndClassIdAndStatus(Long parentId, Long classId, String status); List findByClassIdAndStatusAndLiveGranted(Long classId, String status, boolean liveGranted); diff --git a/backend/src/main/java/com/xh/xunke/school/BindingService.java b/backend/src/main/java/com/xh/xunke/school/BindingService.java index 2f09ca3..04adfba 100644 --- a/backend/src/main/java/com/xh/xunke/school/BindingService.java +++ b/backend/src/main/java/com/xh/xunke/school/BindingService.java @@ -79,9 +79,11 @@ public class BindingService { return new PagePayload<>(mine, mine.size(), 0, mine.size()); } Long schoolId = me.superAdmin() ? null : me.schoolId(); + String wanted = status == null || status.isBlank() ? null : status; var result = schoolId == null - ? (status == null ? bindings.findAll(Pages.of(page, size)) : bindings.findByStatus(status, Pages.of(page, size))) - : bindings.findBySchoolIdAndStatus(schoolId, status == null ? "PENDING" : status, Pages.of(page, size)); + ? (wanted == null ? bindings.findAll(Pages.of(page, size)) : bindings.findByStatus(wanted, Pages.of(page, size))) + : (wanted == null ? bindings.findBySchoolId(schoolId, Pages.of(page, size)) + : bindings.findBySchoolIdAndStatus(schoolId, wanted, Pages.of(page, size))); return new PagePayload<>(result.getContent(), result.getTotalElements(), result.getNumber(), result.getSize()); } @@ -125,7 +127,7 @@ public class BindingService { redis.opsForSet().remove(liveKey(binding.getClassId()), String.valueOf(binding.getParentId())); redis.opsForSet().remove(replayKey(binding.getClassId()), String.valueOf(binding.getParentId())); sessions.findByClassIdAndStatusIn(binding.getClassId(), java.util.List.of("PREPARING", "LIVE")) - .ifPresent(session -> liveKit.removeParticipant(session.getRoomName(), "u-" + binding.getParentId())); + .ifPresent(session -> liveKit.removeParticipantsWithPrefix(session.getRoomName(), "u-" + binding.getParentId())); return binding; } @@ -135,6 +137,14 @@ public class BindingService { .orElse(false); } + /** 家长已通过审核且被授予回放权限的班级。 */ + public List replayClassIds(Long parentId) { + return bindings.findByParentIdAndStatusAndReplayGranted(parentId, "APPROVED", true).stream() + .map(ParentBinding::getClassId) + .distinct() + .toList(); + } + private void syncGrant(ParentBinding binding) { String parent = String.valueOf(binding.getParentId()); if (binding.isLiveGranted()) { diff --git a/backend/src/main/java/com/xh/xunke/school/SchoolService.java b/backend/src/main/java/com/xh/xunke/school/SchoolService.java index 4a5ad8f..3e30f18 100644 --- a/backend/src/main/java/com/xh/xunke/school/SchoolService.java +++ b/backend/src/main/java/com/xh/xunke/school/SchoolService.java @@ -66,6 +66,30 @@ public class SchoolService { public record StudentRequest(@NotNull Long classId, @NotBlank String name, @NotBlank String studentNo) { } + public String className(Long classId) { + return classes.findById(classId).map(ClassRoom::getName).orElse("班级 " + classId); + } + + public String schoolName(Long schoolId) { + return schools.findById(schoolId).map(School::getName).orElse(""); + } + + public String studentName(Long classId, Long studentId) { + return students.findByClassId(classId).stream() + .filter(student -> student.getId().equals(studentId)) + .map(Student::getName) + .findFirst() + .orElse(""); + } + + /** 教师任教的班级 ID(用于直播/录像列表按教师范围过滤)。 */ + public List teacherClassIds(Long teacherId) { + return classTeachers.findByTeacherId(teacherId).stream() + .map(ClassTeacher::getClassId) + .distinct() + .toList(); + } + public PagePayload listSchools(UserPrincipal me, String q, int page, int size) { if (!me.superAdmin()) { if (me.schoolId() == null) { diff --git a/backend/src/main/java/com/xh/xunke/settings/SettingsService.java b/backend/src/main/java/com/xh/xunke/settings/SettingsService.java index 44ea3f0..8e37b60 100644 --- a/backend/src/main/java/com/xh/xunke/settings/SettingsService.java +++ b/backend/src/main/java/com/xh/xunke/settings/SettingsService.java @@ -55,6 +55,9 @@ public class SettingsService { public Map publicSite() { Map site = new LinkedHashMap<>(); byPrefix("site.").forEach(site::put); + if (!text("site.logo.key", "").isBlank()) { + site.put("site.logo.url", "/api/public/site-logo"); + } site.put("registrationEnabled", flag("reg.enabled", true)); site.put("emailVerify", flag("reg.emailVerify", false)); site.put("smsVerify", flag("reg.smsVerify", false)); diff --git a/backend/src/main/java/com/xh/xunke/user/UserAdminService.java b/backend/src/main/java/com/xh/xunke/user/UserAdminService.java index b8b7d2a..8093400 100644 --- a/backend/src/main/java/com/xh/xunke/user/UserAdminService.java +++ b/backend/src/main/java/com/xh/xunke/user/UserAdminService.java @@ -41,9 +41,10 @@ public class UserAdminService { public PagePayload list(UserPrincipal me, String role, String status, String q, int page, int size) { UserStatus parsed = status == null || status.isBlank() ? null : UserStatus.valueOf(status); + RoleName parsedRole = role == null || role.isBlank() ? null : RoleName.valueOf(role); Long schoolId = me.superAdmin() ? null : me.schoolId(); - var result = users.search(schoolId, parsed, q == null || q.isBlank() ? null : q, Pages.of(page, size)); - var views = result.getContent().stream().map(this::view).filter(item -> role == null || role.isBlank() || item.roles().contains(role)).toList(); + var result = users.search(schoolId, parsed, q == null || q.isBlank() ? null : q, parsedRole, Pages.of(page, size)); + var views = result.getContent().stream().map(this::view).toList(); return new PagePayload<>(views, result.getTotalElements(), result.getNumber(), result.getSize()); } diff --git a/backend/src/main/java/com/xh/xunke/user/UserRepository.java b/backend/src/main/java/com/xh/xunke/user/UserRepository.java index b996f3a..25e4883 100644 --- a/backend/src/main/java/com/xh/xunke/user/UserRepository.java +++ b/backend/src/main/java/com/xh/xunke/user/UserRepository.java @@ -25,9 +25,11 @@ public interface UserRepository extends JpaRepository { @Query("select u from UserAccount u where (:schoolId is null or u.schoolId = :schoolId) " + "and (:status is null or u.status = :status) " - + "and (:q is null or lower(u.username) like lower(concat('%', cast(:q as string), '%')) " - + "or lower(u.displayName) like lower(concat('%', cast(:q as string), '%')))") - Page search(Long schoolId, UserStatus status, String q, Pageable pageable); + + "and (:q is null or (lower(u.username) like lower(concat('%', cast(:q as string), '%')) " + + "or lower(u.displayName) like lower(concat('%', cast(:q as string), '%')))) " + + "and (:role is null or exists (select r.id.userId from UserRole r " + + "where r.id.userId = u.id and r.id.role = :role))") + Page search(Long schoolId, UserStatus status, String q, RoleName role, Pageable pageable); long countBySchoolId(Long schoolId); diff --git a/backend/src/main/java/com/xh/xunke/web/ResourceController.java b/backend/src/main/java/com/xh/xunke/web/ResourceController.java index 445a1c1..9ecc1a4 100644 --- a/backend/src/main/java/com/xh/xunke/web/ResourceController.java +++ b/backend/src/main/java/com/xh/xunke/web/ResourceController.java @@ -2,6 +2,8 @@ package com.xh.xunke.web; import com.xh.xunke.audit.AuditService; import com.xh.xunke.common.ApiResponse; +import com.xh.xunke.common.BizException; +import com.xh.xunke.common.ErrorCode; import com.xh.xunke.common.PagePayload; import com.xh.xunke.common.Pages; import com.xh.xunke.course.Course; @@ -52,9 +54,11 @@ import java.lang.management.ManagementFactory; import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; +import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.io.InputStream; @RestController @RequestMapping("/api") @@ -342,21 +346,21 @@ public class ResourceController { } @GetMapping("/live/sessions") - public ApiResponse> lives(@RequestParam(required = false) String status, - @RequestParam(defaultValue = "0") int page, - @RequestParam(defaultValue = "20") int size) { + public ApiResponse>> lives(@RequestParam(required = false) String status, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { return ApiResponse.ok(live.list(me(), status, page, size)); } @GetMapping("/live/sessions/{id}") - public ApiResponse live(@PathVariable Long id) { + public ApiResponse> live(@PathVariable Long id) { return ApiResponse.ok(live.get(me(), id)); } @GetMapping("/recordings") - public ApiResponse> recordings(@RequestParam(required = false) Long classId, - @RequestParam(defaultValue = "0") int page, - @RequestParam(defaultValue = "20") int size) { + public ApiResponse>> recordings(@RequestParam(required = false) Long classId, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "20") int size) { return ApiResponse.ok(recordings.list(me(), classId, page, size)); } @@ -435,7 +439,36 @@ public class ResourceController { @GetMapping("/parent/home") public ApiResponse> parentHome() { var mine = bindings.list(me(), null, 0, 50); - return ApiResponse.ok(Map.of("bindings", mine.items(), "lives", live.list(me(), "LIVE", 0, 20).items())); + var enriched = new LinkedHashMap(); + var bindingRows = new ArrayList>(); + for (ParentBinding binding : mine.items()) { + Map row = new LinkedHashMap<>(); + row.put("id", binding.getId()); + row.put("classId", binding.getClassId()); + row.put("status", binding.getStatus()); + row.put("liveGranted", binding.isLiveGranted()); + row.put("replayGranted", binding.isReplayGranted()); + row.put("relationship", binding.getRelationship()); + row.put("reviewNote", binding.getReviewNote()); + row.put("createdAt", binding.getCreatedAt()); + row.put("className", schools.className(binding.getClassId())); + row.put("schoolName", schools.schoolName(binding.getSchoolId())); + row.put("studentName", schools.studentName(binding.getClassId(), binding.getStudentId())); + bindingRows.add(row); + } + enriched.put("bindings", new PagePayload<>(bindingRows, bindingRows.size(), 0, bindingRows.size())); + enriched.put("lives", live.list(me(), "LIVE", 0, 20)); + return ApiResponse.ok(enriched); + } + + @GetMapping("/parent/today") + public ApiResponse>> parentToday() { + List classIds = bindings.list(me(), null, 0, 50).items().stream() + .filter(binding -> "APPROVED".equals(binding.getStatus())) + .map(ParentBinding::getClassId) + .distinct() + .toList(); + return ApiResponse.ok(courses.todayViews(classIds)); } @GetMapping("/admin/settings") @@ -568,6 +601,44 @@ public class ResourceController { return ApiResponse.ok(); } + @PostMapping("/admin/site-logo") + public ApiResponse> siteLogo(@RequestParam("file") org.springframework.web.multipart.MultipartFile file) { + String contentType = file.getContentType(); + if (contentType == null || !List.of("image/png", "image/jpeg", "image/webp").contains(contentType)) { + throw new BizException(ErrorCode.VALIDATION, "只支持 PNG / JPG / WebP 图片"); + } + if (file.getSize() > 2 * 1024 * 1024) { + throw new BizException(ErrorCode.VALIDATION, "图片不能超过 2MB"); + } + String ext = contentType.equals("image/png") ? "png" : contentType.equals("image/webp") ? "webp" : "jpg"; + String key = "site/logo-" + System.currentTimeMillis() + "." + ext; + try (InputStream in = file.getInputStream()) { + storage.put(key, contentType, in); + } catch (Exception ex) { + throw new BizException(ErrorCode.UPSTREAM, "Logo 上传失败"); + } + settings.update(Map.of("site.logo.key", key)); + return ApiResponse.ok(Map.of("url", "/api/public/site-logo?v=" + System.currentTimeMillis())); + } + + @GetMapping("/public/site-logo") + public org.springframework.http.ResponseEntity siteLogoImage() { + String key = settings.text("site.logo.key", ""); + if (key.isBlank()) { + return org.springframework.http.ResponseEntity.notFound().build(); + } + ObjectStorage.StoredObject object = storage.get(key); + try (InputStream in = object.stream()) { + byte[] bytes = in.readAllBytes(); + return org.springframework.http.ResponseEntity.ok() + .contentType(org.springframework.http.MediaType.parseMediaType(object.contentType())) + .cacheControl(org.springframework.http.CacheControl.maxAge(java.time.Duration.ofHours(1)).cachePublic()) + .body(bytes); + } catch (Exception ex) { + throw new BizException(ErrorCode.UPSTREAM, "Logo 读取失败"); + } + } + private boolean liveKitUp() { return liveKit.reachable(); } diff --git a/deploy/livekit.yaml b/deploy/livekit.yaml index a018d27..292ef34 100644 --- a/deploy/livekit.yaml +++ b/deploy/livekit.yaml @@ -6,6 +6,9 @@ rtc: port_range_start: 50000 port_range_end: 50100 use_external_ip: false + # 浏览器在宿主机上时,容器网卡地址不可达。回环候选走已映射的 7881/UDP 端口。 + enable_loopback_candidate: true + stun_servers: [] redis: address: redis:6379 keys: diff --git a/docker-compose.yml b/docker-compose.yml index f58685c..e35d236 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -102,6 +102,13 @@ services: - "18088:80" logging: *logging + mailhog: + image: mailhog/mailhog:v1.0.1 + ports: + - "1025:1025" + - "8025:8025" + logging: *logging + volumes: pg-data: redis-data: diff --git a/docs/IMPLEMENTATION_STATUS.md b/docs/IMPLEMENTATION_STATUS.md index 213acda..b8b6c90 100644 --- a/docs/IMPLEMENTATION_STATUS.md +++ b/docs/IMPLEMENTATION_STATUS.md @@ -1,24 +1,57 @@ # 实现状态 -更新时间:2026-11-21 +更新时间:2026-11-22 Java 不安装在宿主机。编译和测试使用 `scripts/mvn.ps1`,镜像是 `maven:3.9.11-eclipse-temurin-21`。 -## 已完成并通过测试 +## 真实媒体链路已验证(scripts/e2e-browser.mjs,无头 Chrome + 虚拟设备) -- Spring Boot 3.5.16 / Java 21 后端可在 Docker 中编译。 -- 单元测试 `PolicyTest` 7 项通过:密码策略、公开注册只能成为待审核家长、直播房间隔离、家长不能推流、直播/回放授权分开、家长不能管理学校、录像探针必须同时有音视频、密钥可加密往返。 -- 前端设备拆分测试 1 项通过,`vue-tsc` 与生产构建通过。 -- Docker Compose 已在本机启动。验收脚本走通建校、教师、待审核家长、只批直播、开播前拒绝播放、确认后订阅、停播和关闭注册。 -- 管理后台概览读到真实计数:用户 5、家长 1、教师 2、班级 2、今日直播 1。状态页显示 LiveKit 和对象存储可连接。 -- 浏览器登录后站点名来自接口。教室页点击允许摄像头后,视频列表出现 `5MP USB webcam` 和 `OBS Virtual Camera`,音频列表单独出现 USB 麦克风,没有混成一个设备框。 -- 家长首页按学校和班级名称申请绑定,并可修改密码。登录页可以找回密码。 -- 巡课页对每间正在直播的教室单独拉流,默认静音,点开一间才出声。 -- 管理端补了节次、通知模板和登录锁定设置。回放按班级名称筛选。 +2026-11-22 用真实浏览器跑通完整链路,8 项断言全部通过: -## 已写代码但尚未用真实推流跑通 +1. 教师端自动请求摄像头/麦克风权限,设备独立枚举。 +2. 教师从浏览器把 720p 视频 + 音频推到 LiveKit,会话进入 LIVE。 +3. 家长端收到 1280x720 画面(解码 300+ 帧)并实测到远程音频电平(RMS 25)。 +4. 巡课页多教室同时拉流,默认全部静音,点选一间才出声。 +5. 管理后台概览显示真实统计与服务状态。 +6. 结束直播后 Egress 生成 MP4 到 MinIO,ffprobe 探针确认 h264 视频轨 + aac 音频轨齐全(如 6.8MB / 44s)。 +7. 回放地址(公开端点预签名)浏览器可直连播放。 +8. 回放页用 DPlayer 播放,1280px 画面正常。 -- 这次验收没有从浏览器把画面推进 LiveKit。确认开播后录像任务失败 1 次,没有生成可播放文件。 -- 教室页预览已经显示出本机 USB 摄像头画面。还没有把这路画面推进 LiveKit,也没有生成可播放录像。 -- 阿里云、腾讯云短信和 SMTP 只完成了协议实现,没有使用真实密钥发送。 -- 只测量了 50 个并发的公开站点接口,不能宣称支持 300 路观看。 +说明:以上为**虚拟设备测试**。真实摄像头、真实麦克风和希沃一体机的兼容性仍需在实机上验证,未验证前不得宣称通过。 + +## 本次修复的问题 + +- 回放地址 403:MinIO 预签名之前用内部端点签名后改写主机,`SignedHeaders=host` 使签名失效。改为用公开端点客户端直接签名(客户端显式设置 region,签名过程不再访问服务器)。 +- 录像 fileSize/durationSeconds 为空:探针补 `-show_format` 并回写对象大小。 +- 巡课/观看静音失效:LiveKit SDK attach 会强制 `element.muted=false`,改为静音时不挂载音轨、取消静音时再挂载。 +- 教室页不弹权限询问:进入教室页自动 `getUserMedia` 请求权限并枚举设备,分辨率默认“自动”,指定分辨率失败自动降级。 +- SMTP 支持免认证服务器(本地 MailHog 联调用)。 +- 直播列表/详情、录像列表返回班级、课程、教师名称与在线人数。 +- 家长首页:今日课程表接口 `/parent/today`(含节次时间与进行中状态)。 +- 网站 Logo 上传(/admin/site-logo)与公开读取(/api/public/site-logo)。 +- 订阅端身份唯一化(u-{id}-watch-{nano}),同一家长多端观看互不挤下线;撤销绑定时按前缀移除全部观看会话。 + +## 前端结构(2026-11-22 重做) + +- 角色控制台:管理员 `/admin`、教师 `/teacher`、家长 `/parent`、巡课 `/inspect`,登录后按角色跳转,`/` 为落地页。 +- 播放器:回放用 DPlayer(样式内置 `src/assets/dplayer.css`),直播用自定义虎牙风播放器 `components/LivePlayer.vue`,两套控制条视觉一致。 +- 管理后台拆分为 `views/admin/*` 16 个模块:概览/学校/年级/班级/课程/课表/用户/绑定审核/直播/录像/巡课记录/邮件短信/通知模板/存储/日志/系统设置(网站、Logo、注册审核、安全、节次、服务状态)。 +- 主题:浅色/深色跟随站点设置,用户可本机覆盖(localStorage),主题色后台可改并同步到 Element Plus 主色。 + +## 本地开发预览 + +```powershell +docker compose stop web # 停掉静态容器 +cd frontend +npm run dev # 18088,改动即时热更新,API 代理到 8080 +``` + +生产镜像仍是 `docker compose up -d --build web`(静态构建,nginx 托管)。 + +## 尚未验证 + +- 阿里云、腾讯云短信和真实 SMTP 只完成协议实现,未用真实密钥发送。 +- 压力测试只测过 50 并发的公开接口,未做 100/300 路观看的直播压测。 +- 真实摄像头/麦克风/希沃一体机设备兼容性未在实机验证。 +- 站内消息收件箱(用户端通知列表)尚未实现。 +- 直播趋势图等历史统计曲线需要后端新增聚合接口,目前概览只有当前计数。 diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 80dc502..68a8040 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -9,6 +9,7 @@ "version": "0.1.0", "dependencies": { "axios": "1.21.1", + "dplayer": "^1.27.1", "echarts": "6.1.0", "element-plus": "2.14.8", "livekit-client": "2.25.0", @@ -1258,6 +1259,12 @@ "node": "18 || 20 || >=22" } }, + "node_modules/balloon-css": { + "version": "1.2.0", + "resolved": "https://registry.npmmirror.com/balloon-css/-/balloon-css-1.2.0.tgz", + "integrity": "sha512-urXwkHgwp6GsXVF+it01485Z2Cj4pnW02ICnM0TemOlkKmCNnDLmyy+ZZiRXBpwldUXO+aRNr7Hdia4CBvXJ5A==", + "license": "MIT" + }, "node_modules/birpc": { "version": "2.9.0", "resolved": "https://registry.npmmirror.com/birpc/-/birpc-2.9.0.tgz", @@ -1418,6 +1425,34 @@ "node": ">=8" } }, + "node_modules/dplayer": { + "version": "1.27.1", + "resolved": "https://registry.npmmirror.com/dplayer/-/dplayer-1.27.1.tgz", + "integrity": "sha512-2laBMXs5V1B9zPwJ7eAIw/OBo+Xjvy03i4GHTk3Cg+IWbrq8rKMFO0fFr6ClAYotYOCcFGOvaJDkOZcgKllsCA==", + "license": "MIT", + "dependencies": { + "axios": "1.2.3", + "balloon-css": "^1.0.3", + "promise-polyfill": "8.3.0" + } + }, + "node_modules/dplayer/node_modules/axios": { + "version": "1.2.3", + "resolved": "https://registry.npmmirror.com/axios/-/axios-1.2.3.tgz", + "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/dplayer/node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -2523,6 +2558,12 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/promise-polyfill": { + "version": "8.3.0", + "resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-8.3.0.tgz", + "integrity": "sha512-H5oELycFml5yto/atYqmjyigJoAo3+OXwolYiH7OfQuYlAqhxNvTfiNMbV9hsC6Yp83yE5r2KTVmtrG6R9i6Pg==", + "license": "MIT" + }, "node_modules/proto-list": { "version": "1.2.4", "resolved": "https://registry.npmmirror.com/proto-list/-/proto-list-1.2.4.tgz", diff --git a/frontend/package.json b/frontend/package.json index 6938ae7..19852ba 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "axios": "1.21.1", + "dplayer": "^1.27.1", "echarts": "6.1.0", "element-plus": "2.14.8", "livekit-client": "2.25.0", diff --git a/frontend/src/assets/dplayer.css b/frontend/src/assets/dplayer.css new file mode 100644 index 0000000..ab2f8e4 --- /dev/null +++ b/frontend/src/assets/dplayer.css @@ -0,0 +1,284 @@ +/* DPlayer 1.27.1 播放器样式(项目内置版,暗色主题,主题色跟随 --xh-primary)。 + 结构对齐官方 dist/DPlayer.min.css,图标由 DPlayer JS 内联注入。 */ + +.dplayer { + position: relative; + overflow: hidden; + user-select: none; + line-height: 1; + background: #0a0c10; + border-radius: var(--xh-radius, 10px); +} +.dplayer:-webkit-full-screen { width: 100%; height: 100%; border-radius: 0; } +.dplayer video { + width: 100%; + height: 100%; + background: #0a0c10; + display: block; +} + +.dplayer-video-wrap { position: relative; background: #0a0c10; } +.dplayer-video { position: absolute; inset: 0; } + +.dplayer-mask { + position: absolute; + inset: 0; + z-index: 1; + display: none; +} +.dplayer-mask svg { width: 100%; height: 100%; } + +.dplayer-controller { + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 41px; + padding: 0 20px; + user-select: none; + transition: all 0.3s ease; + z-index: 3; +} +.dplayer-controller .dplayer-bar-wrap { + padding: 5px 0; + cursor: pointer; + position: absolute; + bottom: 33px; + width: calc(100% - 40px); + height: 3px; +} +.dplayer-controller .dplayer-bar-wrap:hover { height: 5px; } +.dplayer-controller .dplayer-bar-time { + position: absolute; + bottom: 8px; + background: rgba(0, 0, 0, 0.6); + color: #fff; + font-size: 12px; + padding: 2px 5px; + border-radius: 2px; + display: none; + pointer-events: none; +} +.dplayer-controller .dplayer-bar-wrap:hover .dplayer-bar-time { display: block; } + +.dplayer-bar { + position: relative; + height: 3px; + width: 100%; + background: rgba(255, 255, 255, 0.25); + cursor: pointer; +} +.dplayer-bar:hover { height: 5px; } +.dplayer-bar-inner { position: relative; width: 100%; height: 100%; } +.dplayer-buffer, +.dplayer-loaded { + position: absolute; + left: 0; + top: 0; + bottom: 0; + width: 0; + background: rgba(255, 255, 255, 0.35); + z-index: 1; +} +.dplayer-buffer { z-index: 0; } +.dplayer-played { + position: absolute; + left: 0; + top: 0; + bottom: 0; + width: 0; + background: var(--xh-primary, #1677ff); + z-index: 2; +} +.dplayer-thumb { + position: absolute; + top: 50%; + width: 5px; + height: 5px; + transform: translate(-50%, -50%); + border-radius: 50%; + background: var(--xh-primary, #1677ff); + z-index: 3; + pointer-events: none; +} + +.dplayer-icons { height: 41px; line-height: 41px; display: inline-block; } +.dplayer-icons-left { float: left; } +.dplayer-icons-right { float: right; } +.dplayer-icon { + width: 40px; + height: 41px; + border: none; + background-color: transparent; + padding: 0; + cursor: pointer; + color: #fff; + position: relative; + display: inline-flex; + align-items: center; + justify-content: center; +} +.dplayer-icon svg { width: 18px; height: 18px; } +.dplayer-icon:hover { color: var(--xh-primary, #1677ff); } + +.dplayer-time { + display: inline-flex; + align-items: center; + gap: 3px; + height: 41px; + color: #fff; + font-size: 12px; + font-variant-numeric: tabular-nums; + padding: 0 6px; +} +.dplayer-dtime { color: rgba(255, 255, 255, 0.6); } + +.dplayer-volume-icon { position: relative; } +.dplayer-volume-bar-wrap { + display: inline-block; + margin-left: 4px; + vertical-align: middle; + height: 41px; + line-height: 41px; +} +.dplayer-volume-bar { + width: 100px; + height: 3px; + background: rgba(255, 255, 255, 0.25); + display: inline-block; + position: relative; + cursor: pointer; + vertical-align: middle; + border-radius: 2px; +} +.dplayer-volume-bar-inner { + background: var(--xh-primary, #1677ff); + height: 100%; + width: 100%; + position: absolute; + left: 0; + top: 0; + border-radius: 2px; +} +.dplayer-volume-bar-wrap .dplayer-volume-bar-inner { width: 0; } +.dplayer-volume-bar-inner .dplayer-thumb { + position: absolute; + top: 50%; + right: -2px; + transform: translateY(-50%); + width: 5px; + height: 5px; + border-radius: 50%; + background: #fff; +} + +.dplayer-setting { + position: absolute; + right: 10px; + bottom: 50px; + background: rgba(24, 28, 36, 0.95); + border-radius: 6px; + padding: 4px 0; + display: none; + z-index: 4; + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.4); +} +.dplayer-setting-item { + font-size: 12px; + display: block; + padding: 8px 18px; + color: #e8eaed; + cursor: pointer; + white-space: nowrap; +} +.dplayer-setting-item:hover { background: rgba(255, 255, 255, 0.08); } + +.dplayer-menu { + position: absolute; + width: 170px; + background: rgba(24, 28, 36, 0.95); + border-radius: 6px; + padding: 4px 0; + z-index: 4; + display: none; + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.4); +} +.dplayer-menu-item { + font-size: 12px; + padding: 8px 18px; + cursor: pointer; + color: #e8eaed; + white-space: nowrap; +} +.dplayer-menu-item:hover { background: rgba(255, 255, 255, 0.08); } + +.dplayer-notice { + opacity: 0; + position: absolute; + bottom: 60px; + left: 20px; + font-size: 14px; + color: #fff; + background: rgba(24, 28, 36, 0.9); + padding: 5px 10px; + border-radius: 4px; + pointer-events: none; + transition: opacity 0.3s ease-in-out; + z-index: 4; +} +.dplayer-notice .dplayer-notice-show { opacity: 1; } + +.dplayer-loading { + position: absolute; + top: 50%; + left: 50%; + margin: -18px 0 0 -18px; + width: 36px; + height: 36px; + border: 3px solid rgba(255, 255, 255, 0.3); + border-top-color: #fff; + border-radius: 50%; + animation: dplayer-rotate 0.9s linear infinite; + display: none; + z-index: 2; +} +.dplayer-loading-show { display: block; } +@keyframes dplayer-rotate { to { transform: rotate(360deg); } } + +.dplayer-mobile-play { + display: none; + width: 50px; + height: 50px; + border: none; + background-color: rgba(0, 0, 0, 0.4); + border-radius: 50%; + cursor: pointer; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + color: #fff; + z-index: 2; +} + +.dplayer-controller-mask { + background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.7) 100%); + position: absolute; + left: 0; + right: 0; + bottom: 0; + height: 80px; + z-index: 2; + pointer-events: none; + opacity: 0; + transition: opacity 0.3s ease; +} +.dplayer-show-controller .dplayer-controller-mask, +.dplayer-hide-controller .dplayer-controller-mask { opacity: 1; } + +.dplayer-hide-controller { cursor: none; } +.dplayer-hide-controller .dplayer-controller { opacity: 0; pointer-events: none; } + +.dplayer-fulled { position: fixed !important; z-index: 100000; left: 0; top: 0; width: 100%; height: 100%; border-radius: 0; } + +.dplayer-web-fullscreen-fix { position: fixed; z-index: 100000; left: 0; top: 0; width: 100%; height: 100%; } diff --git a/frontend/src/components/AppShell.vue b/frontend/src/components/AppShell.vue new file mode 100644 index 0000000..addef9b --- /dev/null +++ b/frontend/src/components/AppShell.vue @@ -0,0 +1,178 @@ + + + + + diff --git a/frontend/src/components/AuthLayout.vue b/frontend/src/components/AuthLayout.vue new file mode 100644 index 0000000..6885af9 --- /dev/null +++ b/frontend/src/components/AuthLayout.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/frontend/src/components/LivePlayer.vue b/frontend/src/components/LivePlayer.vue new file mode 100644 index 0000000..077ddcf --- /dev/null +++ b/frontend/src/components/LivePlayer.vue @@ -0,0 +1,368 @@ + + + + + diff --git a/frontend/src/components/LogoMark.vue b/frontend/src/components/LogoMark.vue new file mode 100644 index 0000000..5dbd1bf --- /dev/null +++ b/frontend/src/components/LogoMark.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/frontend/src/components/ReplayPlayer.vue b/frontend/src/components/ReplayPlayer.vue new file mode 100644 index 0000000..94ba53e --- /dev/null +++ b/frontend/src/components/ReplayPlayer.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 677d93b..9745e05 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -1,5 +1,6 @@ import { createRouter, createWebHistory } from "vue-router"; import { useAuthStore } from "../stores/auth"; +import { canUseAdmin, canUseTeacher, homeFor } from "../utils/roles"; export const router = createRouter({ history: createWebHistory(), @@ -7,23 +8,37 @@ export const router = createRouter({ { path: "/login", component: () => import("../views/Login.vue") }, { path: "/forgot", component: () => import("../views/Forgot.vue") }, { path: "/register", component: () => import("../views/Register.vue") }, - { path: "/", component: () => import("../views/Home.vue") }, - { path: "/studio", component: () => import("../views/Studio.vue"), meta: { auth: true } }, - { path: "/watch/:id", component: () => import("../views/Watch.vue"), meta: { auth: true } }, + { path: "/", component: () => import("../views/Landing.vue") }, + { + path: "/parent", + component: () => import("../components/AppShell.vue"), + children: [ + { path: "", component: () => import("../views/Home.vue"), meta: { auth: true } }, + { path: "replays", component: () => import("../views/Replays.vue"), meta: { auth: true } } + ] + }, { path: "/inspect", component: () => import("../views/Inspect.vue"), meta: { auth: true } }, - { path: "/admin", component: () => import("../views/Admin.vue"), meta: { auth: true } }, - { path: "/replays", component: () => import("../views/Replays.vue"), meta: { auth: true } } + { path: "/watch/:id", component: () => import("../views/Watch.vue"), meta: { auth: true } }, + { path: "/teacher", component: () => import("../views/Studio.vue"), meta: { auth: true } }, + { path: "/admin", component: () => import("../views/admin/Admin.vue"), meta: { auth: true } }, + // 旧地址兼容 + { path: "/studio", redirect: "/teacher" }, + { path: "/replays", redirect: "/parent/replays" } ] }); router.beforeEach(async (to) => { - if (!to.meta.auth) return true; + if (!to.matched.some((record) => record.meta.auth)) return true; const auth = useAuthStore(); - if (auth.user) return true; - try { - await auth.refresh(); - return true; - } catch { - return "/login"; + if (!auth.user) { + try { + await auth.refresh(); + } catch { + return "/login"; + } } + const roles = auth.roles; + if (to.path.startsWith("/admin") && !canUseAdmin(roles)) return homeFor(roles); + if (to.path === "/teacher" && !canUseTeacher(roles)) return homeFor(roles); + return true; }); diff --git a/frontend/src/stores/site.ts b/frontend/src/stores/site.ts index 703fba0..c51e4cd 100644 --- a/frontend/src/stores/site.ts +++ b/frontend/src/stores/site.ts @@ -1,5 +1,6 @@ import { defineStore } from "pinia"; import { http } from "../api/http"; +import { applyTheme, effectiveTheme } from "../theme"; export const useSiteStore = defineStore("site", { state: () => ({ @@ -7,6 +8,7 @@ export const useSiteStore = defineStore("site", { nameZh: "XH巡课", nameEn: "XH Classroom Monitor", title: "XH巡课", + logoUrl: "", intro: "", announcement: "", footer: "", @@ -17,32 +19,47 @@ export const useSiteStore = defineStore("site", { emailVerify: false, smsVerify: false, requireApproval: true, + allowUsername: true, + allowEmail: true, + allowPhone: true, + passwordMin: 8, + passwordMix: true, terms: "", privacy: "" }), actions: { async load() { - const { data } = await http.get("/public/site"); - const site = data.data as Record; - this.nameZh = String(site["site.name.zh"] ?? this.nameZh); - this.nameEn = String(site["site.name.en"] ?? this.nameEn); - this.title = String(site["site.title"] ?? this.nameZh); - this.intro = String(site["site.intro"] ?? ""); - this.announcement = String(site["site.announcement"] ?? ""); - this.footer = String(site["site.footer"] ?? ""); - this.contact = String(site["site.contact"] ?? ""); - this.themeColor = String(site["site.theme.color"] ?? "#1677ff"); - this.themeMode = String(site["site.theme.mode"] ?? "light"); - this.registrationEnabled = Boolean(site.registrationEnabled); - this.emailVerify = Boolean(site.emailVerify); - this.smsVerify = Boolean(site.smsVerify); - this.requireApproval = Boolean(site.requireApproval); - this.terms = String(site["site.terms"] ?? ""); - this.privacy = String(site["site.privacy"] ?? ""); - this.loaded = true; - document.title = this.title; - document.documentElement.style.setProperty("--xh-primary", this.themeColor); - document.documentElement.classList.toggle("dark", this.themeMode === "dark"); + try { + const { data } = await http.get("/public/site"); + const site = data.data as Record; + this.nameZh = String(site["site.name.zh"] ?? this.nameZh); + this.nameEn = String(site["site.name.en"] ?? this.nameEn); + this.title = String(site["site.title"] ?? this.nameZh); + this.logoUrl = String(site["site.logo.url"] ?? ""); + this.intro = String(site["site.intro"] ?? ""); + this.announcement = String(site["site.announcement"] ?? ""); + this.footer = String(site["site.footer"] ?? ""); + this.contact = String(site["site.contact"] ?? ""); + this.themeColor = String(site["site.theme.color"] ?? "#1677ff"); + this.themeMode = String(site["site.theme.mode"] ?? "light"); + this.registrationEnabled = Boolean(site.registrationEnabled); + this.emailVerify = Boolean(site.emailVerify); + this.smsVerify = Boolean(site.smsVerify); + this.requireApproval = Boolean(site.requireApproval); + this.allowUsername = Boolean(site.allowUsername); + this.allowEmail = Boolean(site.allowEmail); + this.allowPhone = Boolean(site.allowPhone); + this.passwordMin = Number(site.passwordMin ?? 8); + this.passwordMix = Boolean(site.passwordMix); + this.terms = String(site["site.terms"] ?? ""); + this.privacy = String(site["site.privacy"] ?? ""); + this.loaded = true; + document.title = this.title; + document.documentElement.style.setProperty("--xh-primary", this.themeColor); + applyTheme(effectiveTheme(this.themeMode)); + } catch { + // 站点信息加载失败时保留默认值,不阻塞页面 + } } } }); diff --git a/frontend/src/styles.css b/frontend/src/styles.css index e53cd6f..2ba35b6 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -1,52 +1,187 @@ :root { --xh-primary: #1677ff; - --xh-bg: #f5f7fb; + --xh-bg: #f5f7fa; --xh-card: #ffffff; --xh-text: #1f2329; - --xh-muted: #646a73; + --xh-text-2: #6b7280; + --xh-text-3: #9ca3af; + --xh-border: #e5e7eb; + --xh-live: #f5222d; + --xh-success: #16a34a; + --xh-warning: #f59e0b; + --xh-radius: 10px; + --xh-shadow: 0 1px 3px rgba(15, 23, 42, 0.07), 0 1px 2px rgba(15, 23, 42, 0.04); + --xh-shadow-lg: 0 10px 30px rgba(15, 23, 42, 0.12); + --xh-header: rgba(255, 255, 255, 0.9); color: var(--xh-text); - font-family: "Segoe UI", "PingFang SC", "Microsoft YaHei", sans-serif; + font-family: "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", -apple-system, sans-serif; background: var(--xh-bg); + -webkit-font-smoothing: antialiased; } html.dark { - --xh-bg: #14181f; - --xh-card: #1c222b; + --xh-bg: #0f1115; + --xh-card: #171a21; --xh-text: #e8eaed; - --xh-muted: #a8b0bb; + --xh-text-2: #9aa3af; + --xh-text-3: #6b7280; + --xh-border: #2a2f3a; + --xh-shadow: 0 1px 3px rgba(0, 0, 0, 0.4); + --xh-shadow-lg: 0 10px 30px rgba(0, 0, 0, 0.5); + --xh-header: rgba(15, 17, 21, 0.9); } -body { - margin: 0; - background: var(--xh-bg); - color: var(--xh-text); +/* 站点主题色同步到 Element Plus 主色 */ +:root { + --el-color-primary: var(--xh-primary); + --el-color-primary-light-3: color-mix(in srgb, var(--xh-primary) 70%, white); + --el-color-primary-light-5: color-mix(in srgb, var(--xh-primary) 50%, white); + --el-color-primary-light-7: color-mix(in srgb, var(--xh-primary) 30%, white); + --el-color-primary-light-8: color-mix(in srgb, var(--xh-primary) 20%, white); + --el-color-primary-light-9: color-mix(in srgb, var(--xh-primary) 10%, white); + --el-color-primary-dark-2: color-mix(in srgb, var(--xh-primary) 80%, black); } +* { box-sizing: border-box; } +html, body { height: 100%; } +body { margin: 0; background: var(--xh-bg); color: var(--xh-text); } a { color: var(--xh-primary); text-decoration: none; } -.page { - max-width: 1120px; - margin: 0 auto; - padding: 16px; -} - +.page { max-width: 1120px; margin: 0 auto; padding: 20px 16px 48px; } .card { background: var(--xh-card); - border: 1px solid rgba(22, 119, 255, 0.12); - border-radius: 12px; - padding: 16px; + border: 1px solid var(--xh-border); + border-radius: var(--xh-radius); + padding: 20px; + box-shadow: var(--xh-shadow); +} +.card-title { font-size: 16px; font-weight: 600; margin: 0 0 14px; } +.muted { color: var(--xh-text-2); } +.mono { font-variant-numeric: tabular-nums; } + +.touch { min-height: 48px; } + +/* 状态点 */ +.dot { display: inline-block; width: 8px; height: 8px; border-radius: 50%; } +.dot-live { background: var(--xh-live); animation: xh-pulse 1.2s ease-in-out infinite; } +@keyframes xh-pulse { + 0%, 100% { opacity: 1; box-shadow: 0 0 0 0 rgba(245, 34, 45, 0.5); } + 50% { opacity: 0.75; box-shadow: 0 0 0 5px rgba(245, 34, 45, 0); } } -.touch { - min-height: 48px; +/* LIVE 角标(虎牙风格) */ +.live-badge { + display: inline-flex; + align-items: center; + gap: 4px; + background: var(--xh-live); + color: #fff; + font-size: 12px; + font-weight: 600; + line-height: 1; + padding: 4px 8px; + border-radius: 4px; +} +.live-badge .dot { background: #fff; animation: xh-pulse 1.2s ease-in-out infinite; } + +/* 直播卡片(封面 + 渐变信息条) */ +.live-card { + position: relative; + border-radius: var(--xh-radius); + overflow: hidden; + background: #101216; + cursor: pointer; + box-shadow: var(--xh-shadow); + transition: transform 0.15s ease, box-shadow 0.15s ease; +} +.live-card:hover { transform: translateY(-3px); box-shadow: var(--xh-shadow-lg); } +.live-card .cover { + aspect-ratio: 16 / 9; + display: flex; + align-items: center; + justify-content: center; + color: #4b5563; + background: linear-gradient(160deg, #1a1f29 0%, #101216 100%); +} +.live-card .cover-icon { width: 44px; height: 44px; opacity: 0.55; } +.live-card .live-badge { position: absolute; top: 10px; left: 10px; } +.live-card .viewers { + position: absolute; + top: 10px; + right: 10px; + background: rgba(0, 0, 0, 0.55); + color: #fff; + font-size: 12px; + padding: 3px 8px; + border-radius: 4px; + display: inline-flex; + align-items: center; + gap: 4px; +} +.live-card .card-info { + position: absolute; + left: 0; right: 0; bottom: 0; + padding: 28px 12px 10px; + background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.78) 100%); + color: #fff; +} +.live-card .card-info .title { font-size: 14px; font-weight: 600; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } +.live-card .card-info .sub { font-size: 12px; color: rgba(255, 255, 255, 0.72); margin-top: 2px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } + +/* 播放器容器(虎牙深色风) */ +.player-shell { + position: relative; + background: #0a0c10; + border-radius: var(--xh-radius); + overflow: hidden; + width: 100%; + aspect-ratio: 16 / 9; +} +.player-shell video { + position: absolute; + inset: 0; + width: 100%; + height: 100%; + object-fit: contain; + background: #0a0c10; } -.grid-2 { - display: grid; - grid-template-columns: 1fr 1fr; - gap: 16px; +/* 顶部导航 */ +.topbar { + position: sticky; + top: 0; + z-index: 100; + background: var(--xh-header); + backdrop-filter: blur(12px); + border-bottom: 1px solid var(--xh-border); } +.topbar-inner { + max-width: 1120px; + margin: 0 auto; + padding: 0 16px; + height: 56px; + display: flex; + align-items: center; + gap: 20px; +} +.brand { display: flex; align-items: center; gap: 8px; font-weight: 700; font-size: 17px; color: var(--xh-text); } +.nav { display: flex; gap: 4px; flex: 1; } +.nav-link { + padding: 6px 12px; + border-radius: 8px; + color: var(--xh-text-2); + font-size: 14px; +} +.nav-link:hover { color: var(--xh-text); background: rgba(127, 127, 127, 0.08); } +.nav-link.router-link-active { color: var(--xh-primary); font-weight: 600; } + +/* 统计卡片 */ +.stat-card { text-align: left; padding: 16px 20px; } +.stat-card .num { font-size: 26px; font-weight: 700; line-height: 1.2; } +.stat-card .label { font-size: 13px; color: var(--xh-text-2); margin-top: 4px; } @media (max-width: 800px) { - .grid-2 { grid-template-columns: 1fr; } + .page { padding: 14px 12px 40px; } + .topbar-inner { gap: 8px; } + .nav-link { padding: 6px 8px; font-size: 13px; } } diff --git a/frontend/src/theme.ts b/frontend/src/theme.ts new file mode 100644 index 0000000..eed0026 --- /dev/null +++ b/frontend/src/theme.ts @@ -0,0 +1,23 @@ +// 浅色/深色主题:后台默认主题 + 用户本机覆盖(localStorage)。 +const KEY = "xh.theme"; + +export type ThemeMode = "light" | "dark"; + +export function effectiveTheme(defaultMode: string): ThemeMode { + const saved = localStorage.getItem(KEY); + if (saved === "light" || saved === "dark") return saved; + return defaultMode === "dark" ? "dark" : "light"; +} + +export function applyTheme(mode: ThemeMode) { + document.documentElement.classList.toggle("dark", mode === "dark"); +} + +export function currentTheme(): ThemeMode { + return document.documentElement.classList.contains("dark") ? "dark" : "light"; +} + +export function setThemeOverride(mode: ThemeMode) { + localStorage.setItem(KEY, mode); + applyTheme(mode); +} diff --git a/frontend/src/types/dplayer.d.ts b/frontend/src/types/dplayer.d.ts new file mode 100644 index 0000000..2278a62 --- /dev/null +++ b/frontend/src/types/dplayer.d.ts @@ -0,0 +1,33 @@ +declare module "dplayer" { + interface DPlayerOptions { + container: HTMLElement | null; + live?: boolean; + autoplay?: boolean; + theme?: string; + loop?: boolean; + lang?: string; + screenshot?: boolean; + hotkey?: boolean; + preload?: string; + volume?: number; + mutex?: boolean; + video?: { url?: string; pic?: string; type?: string; customType?: Record }; + danmaku?: unknown; + contextmenu?: Array<{ text?: string; link?: string; click?: () => void }>; + } + + class DPlayer { + constructor(options: DPlayerOptions); + play(): void; + pause(): void; + seek(time: number): void; + speed(rate: number): void; + volume(percentage: number, nostorage?: boolean, nonotice?: boolean): void; + fullScreen: { request(type?: string): void; cancel(type?: string): void }; + on(event: string, handler: (...args: unknown[]) => void): void; + destroy(): void; + video: HTMLVideoElement; + } + + export default DPlayer; +} diff --git a/frontend/src/utils/roles.ts b/frontend/src/utils/roles.ts new file mode 100644 index 0000000..df31a49 --- /dev/null +++ b/frontend/src/utils/roles.ts @@ -0,0 +1,15 @@ +// 角色与控制台路由的对应关系:管理员 /admin,教师 /teacher,家长 /parent,巡课 /inspect。 +export function homeFor(roles: string[]): string { + if (roles.includes("SUPER_ADMIN") || roles.includes("SCHOOL_ADMIN")) return "/admin"; + if (roles.includes("INSPECTOR")) return "/inspect"; + if (roles.includes("TEACHER")) return "/teacher"; + return "/parent"; +} + +export function canUseTeacher(roles: string[]): boolean { + return roles.includes("TEACHER") || roles.includes("SUPER_ADMIN"); +} + +export function canUseAdmin(roles: string[]): boolean { + return roles.includes("SUPER_ADMIN") || roles.includes("SCHOOL_ADMIN") || roles.includes("INSPECTOR"); +} diff --git a/frontend/src/views/Admin.vue b/frontend/src/views/Admin.vue deleted file mode 100644 index ebc94d3..0000000 --- a/frontend/src/views/Admin.vue +++ /dev/null @@ -1,483 +0,0 @@ - - - diff --git a/frontend/src/views/Forgot.vue b/frontend/src/views/Forgot.vue index 1a55454..bb1247c 100644 --- a/frontend/src/views/Forgot.vue +++ b/frontend/src/views/Forgot.vue @@ -1,55 +1,99 @@ + + diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue index a549819..b07cbce 100644 --- a/frontend/src/views/Home.vue +++ b/frontend/src/views/Home.vue @@ -1,123 +1,337 @@ + + diff --git a/frontend/src/views/Inspect.vue b/frontend/src/views/Inspect.vue index 8ead920..9da5039 100644 --- a/frontend/src/views/Inspect.vue +++ b/frontend/src/views/Inspect.vue @@ -1,16 +1,54 @@