Merge branch 'main' of http://113.45.157.195:3003/insiinc/re-mooc
This commit is contained in:
commit
4d995a24a9
|
@ -155,6 +155,7 @@ export class UserProfileService {
|
|||
where: { id },
|
||||
select: {
|
||||
id: true,
|
||||
avatar:true,
|
||||
deptId: true,
|
||||
department: true,
|
||||
domainId: true,
|
||||
|
|
|
@ -40,7 +40,11 @@ export class VisitService extends BaseService<Prisma.VisitDelegate> {
|
|||
id: postId,
|
||||
visitType: args.data.type, // 直接复用传入的类型
|
||||
});
|
||||
EventBus.emit('updateTotalCourseViewCount', {
|
||||
visitType: args.data.type, // 直接复用传入的类型
|
||||
});
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
async createMany(args: Prisma.VisitCreateManyArgs, staff?: UserProfile) {
|
||||
|
@ -138,6 +142,9 @@ export class VisitService extends BaseService<Prisma.VisitDelegate> {
|
|||
id: args?.where?.postId as string,
|
||||
visitType: args.where.type as any, // 直接复用传入的类型
|
||||
});
|
||||
EventBus.emit('updateTotalCourseViewCount', {
|
||||
visitType: args.where.type as any, // 直接复用传入的类型
|
||||
});
|
||||
}
|
||||
}
|
||||
return superDetele;
|
||||
|
|
|
@ -7,11 +7,18 @@ import {
|
|||
VisitType,
|
||||
} from '@nice/common';
|
||||
export async function updateTotalCourseViewCount(type: VisitType) {
|
||||
const courses = await db.post.findMany({
|
||||
where: { type: PostType.COURSE },
|
||||
select: { id: true },
|
||||
const posts = await db.post.findMany({
|
||||
where: {
|
||||
type: { in: [PostType.COURSE, PostType.LECTURE] },
|
||||
deletedAt: null,
|
||||
},
|
||||
select: { id: true, type: true },
|
||||
});
|
||||
const courseIds = courses.map((course) => course.id);
|
||||
|
||||
const courseIds = posts
|
||||
.filter((post) => post.type === PostType.COURSE)
|
||||
.map((course) => course.id);
|
||||
const lectures = posts.filter((post) => post.type === PostType.LECTURE);
|
||||
const totalViews = await db.visit.aggregate({
|
||||
_sum: {
|
||||
views: true,
|
||||
|
@ -30,6 +37,10 @@ export async function updateTotalCourseViewCount(type: VisitType) {
|
|||
meta: true,
|
||||
},
|
||||
});
|
||||
const staffs = await db.staff.count({
|
||||
where: { deletedAt: null },
|
||||
});
|
||||
|
||||
const baseSeting = appConfig.meta as BaseSetting;
|
||||
await db.appConfig.update({
|
||||
where: {
|
||||
|
@ -38,7 +49,15 @@ export async function updateTotalCourseViewCount(type: VisitType) {
|
|||
data: {
|
||||
meta: {
|
||||
...baseSeting,
|
||||
reads: totalViews,
|
||||
appConfig: {
|
||||
...(baseSeting?.appConfig || {}),
|
||||
statistics: {
|
||||
reads: totalViews._sum.views || 0,
|
||||
courses: courseIds?.length || 0,
|
||||
staffs: staffs || 0,
|
||||
lectures: lectures?.length || 0,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
|
|
@ -24,7 +24,8 @@ export default function BaseSettingPage() {
|
|||
const [isFormChanged, setIsFormChanged] = useState(false);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const { user, hasSomePermissions } = useAuth();
|
||||
const { pageWidth } = useContext?.(MainLayoutContext);
|
||||
const context = useContext(MainLayoutContext);
|
||||
const pageWidth = context?.pageWidth;
|
||||
function handleFieldsChange() {
|
||||
setIsFormChanged(true);
|
||||
}
|
||||
|
@ -43,7 +44,6 @@ export default function BaseSettingPage() {
|
|||
}
|
||||
async function onSubmit(values: BaseSetting) {
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
await update.mutateAsync({
|
||||
where: {
|
||||
|
|
|
@ -84,9 +84,6 @@ const CategorySection = () => {
|
|||
// description: term.description
|
||||
// })) || [];
|
||||
// },[data])
|
||||
|
||||
|
||||
|
||||
const handleMouseEnter = useCallback((index: number) => {
|
||||
setHoveredIndex(index);
|
||||
}, []);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import React, { useState, useMemo, useEffect } from 'react';
|
||||
import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
|
||||
import { Button, Card, Typography, Tag, Progress, Spin } from 'antd';
|
||||
import { Button, Card, Typography, Tag, Progress, Spin, Empty } from 'antd';
|
||||
import {
|
||||
PlayCircleOutlined,
|
||||
UserOutlined,
|
||||
|
@ -17,7 +17,6 @@ interface GetTaxonomyProps {
|
|||
categories: string[];
|
||||
isLoading: boolean;
|
||||
}
|
||||
|
||||
function useGetTaxonomy({ type }): GetTaxonomyProps {
|
||||
const { data, isLoading }: { data: TermDto[], isLoading: boolean } = api.term.findMany.useQuery({
|
||||
where: {
|
||||
|
@ -40,6 +39,7 @@ function useGetTaxonomy({ type }): GetTaxonomyProps {
|
|||
}, [data]);
|
||||
return { categories, isLoading }
|
||||
}
|
||||
// 修改useGetName中的查询条件
|
||||
|
||||
function useFetchCoursesByCategory(category: string) {
|
||||
const isAll = category === '全部';
|
||||
|
@ -60,6 +60,8 @@ function useFetchCoursesByCategory(category: string) {
|
|||
return { data, isLoading};
|
||||
}
|
||||
|
||||
// 不同分类跳转
|
||||
|
||||
const { Title, Text } = Typography;
|
||||
|
||||
interface Course {
|
||||
|
@ -82,6 +84,7 @@ interface CoursesSectionProps {
|
|||
initialVisibleCoursesCount?: number;
|
||||
}
|
||||
|
||||
|
||||
const CoursesSection: React.FC<CoursesSectionProps> = ({
|
||||
title,
|
||||
description,
|
||||
|
@ -126,6 +129,9 @@ const CoursesSection: React.FC<CoursesSectionProps> = ({
|
|||
navigate(`/course?courseId=${course.id}/detail`);
|
||||
}
|
||||
|
||||
useEffect(()=>{
|
||||
console.log('data:', data)
|
||||
})
|
||||
const filteredCourses = useMemo(() => {
|
||||
return selectedCategory === '全部'
|
||||
? data
|
||||
|
@ -162,7 +168,12 @@ const CoursesSection: React.FC<CoursesSectionProps> = ({
|
|||
: 'bg-white text-gray-600 hover:bg-gray-100'
|
||||
}`}
|
||||
>全部</Tag>
|
||||
{
|
||||
{gateGory.categories.length === 0 && (
|
||||
<Empty
|
||||
description="暂无课程分类"
|
||||
image={Empty.PRESENTED_IMAGE_DEFAULT}
|
||||
/>
|
||||
)}:{
|
||||
gateGory.categories.map((category) => (
|
||||
<Tag
|
||||
key={category}
|
||||
|
@ -181,6 +192,7 @@ const CoursesSection: React.FC<CoursesSectionProps> = ({
|
|||
</Tag>
|
||||
))
|
||||
}
|
||||
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
@ -275,7 +287,7 @@ const CoursesSection: React.FC<CoursesSectionProps> = ({
|
|||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
)}
|
||||
</div>
|
||||
</section>
|
||||
);
|
||||
|
|
|
@ -45,16 +45,16 @@ const carouselItems: CarouselItem[] = [
|
|||
},
|
||||
];
|
||||
|
||||
const platformStats: PlatformStat[] = [
|
||||
{ icon: <TeamOutlined />, value: "50,000+", label: "注册学员" },
|
||||
{ icon: <BookOutlined />, value: "1,000+", label: "精品课程" },
|
||||
// { icon: <StarOutlined />, value: '98%', label: '好评度' },
|
||||
{ icon: <EyeOutlined />, value: "100万+", label: "观看次数" },
|
||||
];
|
||||
|
||||
const HeroSection = () => {
|
||||
const carouselRef = useRef<CarouselRef>(null);
|
||||
const { statistics, baseSetting } = useAppConfig();
|
||||
|
||||
const platformStats: PlatformStat[] = [
|
||||
{ icon: <TeamOutlined />, value: "50,000+", label: "注册学员" },
|
||||
{ icon: <BookOutlined />, value: "1,000+", label: "精品课程" },
|
||||
// { icon: <StarOutlined />, value: '98%', label: '好评度' },
|
||||
{ icon: <EyeOutlined />, value: "4552", label: "观看次数" },
|
||||
];
|
||||
const handlePrev = useCallback(() => {
|
||||
carouselRef.current?.prev();
|
||||
}, []);
|
||||
|
@ -97,11 +97,10 @@ const HeroSection = () => {
|
|||
{/* Content Container */}
|
||||
<div className="relative h-full max-w-7xl mx-auto px-6 lg:px-8"></div>
|
||||
</div>
|
||||
)))
|
||||
:(
|
||||
<div></div>
|
||||
)
|
||||
}
|
||||
))
|
||||
) : (
|
||||
<div></div>
|
||||
)}
|
||||
</Carousel>
|
||||
|
||||
{/* Navigation Buttons */}
|
||||
|
|
|
@ -127,12 +127,10 @@ const HomePage = () => {
|
|||
});
|
||||
useEffect(() => {
|
||||
if (data) {
|
||||
console.log('mockCourses data:', data);
|
||||
console.log('Courses data:', data);
|
||||
}
|
||||
}, [data]);
|
||||
|
||||
// 数据处理逻辑
|
||||
// 修正依赖数组
|
||||
|
||||
return (
|
||||
<div className="min-h-screen">
|
||||
<HeroSection />
|
||||
|
|
|
@ -8,7 +8,7 @@ export function MainFooter() {
|
|||
{/* 开发组织信息 */}
|
||||
<div className="text-center md:text-left space-y-2">
|
||||
<h3 className="text-white font-semibold text-sm flex items-center justify-center md:justify-start">
|
||||
创新高地 软件小组
|
||||
软件与数据小组
|
||||
</h3>
|
||||
<p className="text-gray-400 text-xs italic">
|
||||
提供技术支持
|
||||
|
|
|
@ -84,7 +84,7 @@ export default function StaffForm() {
|
|||
form.setFieldValue("officerId", data.officerId);
|
||||
form.setFieldValue("phoneNumber", data.phoneNumber);
|
||||
form.setFieldValue("enabled", data.enabled);
|
||||
form.setFieldValue("enabled", data.avatar);
|
||||
form.setFieldValue("avatar", data.avatar);
|
||||
}
|
||||
}, [data]);
|
||||
// useEffect(() => {
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
import React, { ReactNode } from "react";
|
||||
export interface MenuItemType {
|
||||
icon: JSX.Element;
|
||||
icon: ReactNode;
|
||||
label: string;
|
||||
action: () => void;
|
||||
}
|
||||
|
|
|
@ -11,6 +11,7 @@ export interface TusUploaderProps {
|
|||
value?: string[];
|
||||
onChange?: (value: string[]) => void;
|
||||
multiple?: boolean;
|
||||
allowTypes?: string[];
|
||||
}
|
||||
|
||||
interface UploadingFile {
|
||||
|
@ -25,8 +26,8 @@ export const TusUploader = ({
|
|||
value = [],
|
||||
onChange,
|
||||
multiple = true,
|
||||
allowTypes = undefined,
|
||||
}: TusUploaderProps) => {
|
||||
|
||||
const { handleFileUpload, uploadProgress } = useTusUpload();
|
||||
const [uploadingFiles, setUploadingFiles] = useState<UploadingFile[]>([]);
|
||||
const [completedFiles, setCompletedFiles] = useState<UploadingFile[]>(
|
||||
|
@ -61,7 +62,10 @@ export const TusUploader = ({
|
|||
|
||||
const handleBeforeUpload = useCallback(
|
||||
(file: File) => {
|
||||
|
||||
if (allowTypes && !allowTypes.includes(file.type)) {
|
||||
toast.error(`文件类型 ${file.type} 不在允许范围内`);
|
||||
return Upload.LIST_IGNORE; // 使用 antd 的官方阻止方式
|
||||
}
|
||||
const fileKey = `${file.name}-${Date.now()}`;
|
||||
|
||||
setUploadingFiles((prev) => [
|
||||
|
@ -136,10 +140,10 @@ export const TusUploader = ({
|
|||
return (
|
||||
<div className="space-y-1">
|
||||
<Upload.Dragger
|
||||
accept={allowTypes?.join(",")}
|
||||
name="files"
|
||||
multiple={multiple}
|
||||
showUploadList={false}
|
||||
|
||||
beforeUpload={handleBeforeUpload}>
|
||||
<p className="ant-upload-drag-icon">
|
||||
<UploadOutlined />
|
||||
|
@ -149,6 +153,11 @@ export const TusUploader = ({
|
|||
</p>
|
||||
<p className="ant-upload-hint">
|
||||
{multiple ? "支持单个或批量上传文件" : "仅支持上传单个文件"}
|
||||
{allowTypes && (
|
||||
<span className="block text-xs text-gray-500">
|
||||
允许类型: {allowTypes.join(", ")}
|
||||
</span>
|
||||
)}
|
||||
</p>
|
||||
|
||||
<div className="px-2 py-0 rounded mt-1">
|
||||
|
@ -165,10 +174,10 @@ export const TusUploader = ({
|
|||
file.status === "done"
|
||||
? 100
|
||||
: Math.round(
|
||||
uploadProgress?.[
|
||||
file.fileKey!
|
||||
] || 0
|
||||
)
|
||||
uploadProgress?.[
|
||||
file.fileKey!
|
||||
] || 0
|
||||
)
|
||||
}
|
||||
status={
|
||||
file.status === "error"
|
||||
|
|
|
@ -47,7 +47,7 @@ export const CourseDetailDescription: React.FC = () => {
|
|||
<div>{course?.subTitle}</div>
|
||||
<div className="flex gap-1">
|
||||
<EyeOutlined></EyeOutlined>
|
||||
<div>{course?.meta?.views}</div>
|
||||
<div>{course?.meta?.views || 0}</div>
|
||||
</div>
|
||||
<div className="flex gap-1">
|
||||
<CalendarOutlined></CalendarOutlined>
|
||||
|
|
|
@ -21,7 +21,7 @@ export function CourseDetailHeader() {
|
|||
|
||||
return (
|
||||
<Header className="select-none flex items-center justify-center bg-white shadow-md border-b border-gray-100 fixed w-full z-30">
|
||||
<div className="w-full max-w-screen-2xl px-4 md:px-6 mx-auto flex items-center justify-between h-full">
|
||||
<div className="w-full flex items-center justify-between h-full">
|
||||
<div className="flex items-center space-x-2">
|
||||
<HomeOutlined
|
||||
onClick={() => {
|
||||
|
|
|
@ -2,6 +2,7 @@ import {
|
|||
SkeletonItem,
|
||||
SkeletonSection,
|
||||
} from "@web/src/components/presentation/Skeleton";
|
||||
import { api } from "packages/client/dist";
|
||||
|
||||
export const CourseDetailSkeleton = () => {
|
||||
return (
|
||||
|
|
|
@ -10,7 +10,13 @@ import { useSortable } from "@dnd-kit/sortable";
|
|||
import { CSS } from "@dnd-kit/utilities";
|
||||
import QuillEditor from "@web/src/components/common/editor/quill/QuillEditor";
|
||||
import { TusUploader } from "@web/src/components/common/uploader/TusUploader";
|
||||
import { Lecture, LectureType, LessonTypeLabel, PostType } from "@nice/common";
|
||||
import {
|
||||
Lecture,
|
||||
LectureType,
|
||||
LessonTypeLabel,
|
||||
PostType,
|
||||
videoMimeTypes,
|
||||
} from "@nice/common";
|
||||
import { usePost } from "@nice/client";
|
||||
import toast from "react-hot-toast";
|
||||
|
||||
|
@ -134,7 +140,9 @@ export const SortableLecture: React.FC<SortableLectureProps> = ({
|
|||
name="title"
|
||||
initialValue={field?.title}
|
||||
className="mb-0 flex-1"
|
||||
rules={[{ required: true }]}>
|
||||
rules={[
|
||||
{ required: true, message: "请输入课时标题" },
|
||||
]}>
|
||||
<Input placeholder="课时标题" />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
|
@ -158,14 +166,24 @@ export const SortableLecture: React.FC<SortableLectureProps> = ({
|
|||
<Form.Item
|
||||
name={["meta", "videoIds"]}
|
||||
className="mb-0 flex-1"
|
||||
rules={[{ required: true }]}>
|
||||
<TusUploader multiple={false} />
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
message: "请传入视频",
|
||||
},
|
||||
]}>
|
||||
<TusUploader
|
||||
allowTypes={videoMimeTypes}
|
||||
multiple={false}
|
||||
/>
|
||||
</Form.Item>
|
||||
) : (
|
||||
<Form.Item
|
||||
name="content"
|
||||
className="mb-0 flex-1"
|
||||
rules={[{ required: true }]}>
|
||||
rules={[
|
||||
{ required: true, message: "请输入内容" },
|
||||
]}>
|
||||
<QuillEditor />
|
||||
</Form.Item>
|
||||
)}
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
import { Button, Form, Input, Spin, Switch, message } from "antd";
|
||||
import { useContext, useEffect} from "react";
|
||||
import { useContext, useEffect } from "react";
|
||||
import { useStaff } from "@nice/client";
|
||||
import DepartmentSelect from "../department/department-select";
|
||||
import { api } from "@nice/client"
|
||||
import { api } from "@nice/client";
|
||||
import { StaffEditorContext } from "./staff-editor";
|
||||
import { useAuth } from "@web/src/providers/auth-provider";
|
||||
import AvatarUploader from "../../common/uploader/AvatarUploader";
|
||||
export default function StaffForm() {
|
||||
const { create, update } = useStaff(); // Ensure you have these methods in your hooks
|
||||
const {
|
||||
|
@ -21,6 +22,7 @@ export default function StaffForm() {
|
|||
{ where: { id: editId } },
|
||||
{ enabled: !!editId }
|
||||
);
|
||||
|
||||
const { isRoot } = useAuth();
|
||||
async function handleFinish(values: any) {
|
||||
const {
|
||||
|
@ -31,8 +33,9 @@ export default function StaffForm() {
|
|||
password,
|
||||
phoneNumber,
|
||||
officerId,
|
||||
enabled
|
||||
} = values
|
||||
enabled,
|
||||
avatar,
|
||||
} = values;
|
||||
setFormLoading(true);
|
||||
try {
|
||||
if (data && editId) {
|
||||
|
@ -46,8 +49,9 @@ export default function StaffForm() {
|
|||
password,
|
||||
phoneNumber,
|
||||
officerId,
|
||||
enabled
|
||||
}
|
||||
enabled,
|
||||
avatar,
|
||||
},
|
||||
});
|
||||
} else {
|
||||
await create.mutateAsync({
|
||||
|
@ -58,8 +62,9 @@ export default function StaffForm() {
|
|||
domainId: fieldDomainId ? fieldDomainId : domainId,
|
||||
password,
|
||||
officerId,
|
||||
phoneNumber
|
||||
}
|
||||
phoneNumber,
|
||||
avatar,
|
||||
},
|
||||
});
|
||||
form.resetFields();
|
||||
if (deptId) form.setFieldValue("deptId", deptId);
|
||||
|
@ -77,13 +82,14 @@ export default function StaffForm() {
|
|||
useEffect(() => {
|
||||
form.resetFields();
|
||||
if (data && editId) {
|
||||
form.setFieldValue("username", data.username);
|
||||
form.setFieldValue("showname", data.showname);
|
||||
form.setFieldValue("domainId", data.domainId);
|
||||
form.setFieldValue("deptId", data.deptId);
|
||||
form.setFieldValue("officerId", data.officerId);
|
||||
form.setFieldValue("phoneNumber", data.phoneNumber);
|
||||
form.setFieldValue("enabled", data.enabled)
|
||||
form.setFieldValue("username", data?.username);
|
||||
form.setFieldValue("showname", data?.showname);
|
||||
form.setFieldValue("domainId", data?.domainId);
|
||||
form.setFieldValue("deptId", data?.deptId);
|
||||
form.setFieldValue("officerId", data?.officerId);
|
||||
form.setFieldValue("phoneNumber", data?.phoneNumber);
|
||||
form.setFieldValue("enabled", data?.enabled);
|
||||
form.setFieldValue("avatar", data?.avatar);
|
||||
}
|
||||
}, [data]);
|
||||
useEffect(() => {
|
||||
|
@ -99,6 +105,7 @@ export default function StaffForm() {
|
|||
<Spin />
|
||||
</div>
|
||||
)}
|
||||
|
||||
<Form
|
||||
disabled={isLoading}
|
||||
form={form}
|
||||
|
@ -106,6 +113,9 @@ export default function StaffForm() {
|
|||
requiredMark="optional"
|
||||
autoComplete="off"
|
||||
onFinish={handleFinish}>
|
||||
<Form.Item name={"avatar"} label="头像">
|
||||
<AvatarUploader></AvatarUploader>
|
||||
</Form.Item>
|
||||
{canManageAnyStaff && (
|
||||
<Form.Item
|
||||
name={"domainId"}
|
||||
|
@ -127,7 +137,8 @@ export default function StaffForm() {
|
|||
rules={[{ required: true }]}
|
||||
name={"username"}
|
||||
label="帐号">
|
||||
<Input allowClear
|
||||
<Input
|
||||
allowClear
|
||||
autoComplete="new-username" // 使用非标准的自动完成值
|
||||
spellCheck={false}
|
||||
/>
|
||||
|
@ -136,7 +147,8 @@ export default function StaffForm() {
|
|||
rules={[{ required: true }]}
|
||||
name={"showname"}
|
||||
label="姓名">
|
||||
<Input allowClear
|
||||
<Input
|
||||
allowClear
|
||||
autoComplete="new-name" // 使用非标准的自动完成值
|
||||
spellCheck={false}
|
||||
/>
|
||||
|
@ -146,8 +158,8 @@ export default function StaffForm() {
|
|||
{
|
||||
required: false,
|
||||
pattern: /^\d{5,18}$/,
|
||||
message: "请输入正确的证件号(数字)"
|
||||
}
|
||||
message: "请输入正确的证件号(数字)",
|
||||
},
|
||||
]}
|
||||
name={"officerId"}
|
||||
label="证件号">
|
||||
|
@ -158,20 +170,29 @@ export default function StaffForm() {
|
|||
{
|
||||
required: false,
|
||||
pattern: /^\d{6,11}$/,
|
||||
message: "请输入正确的手机号(数字)"
|
||||
}
|
||||
message: "请输入正确的手机号(数字)",
|
||||
},
|
||||
]}
|
||||
name={"phoneNumber"}
|
||||
label="手机号">
|
||||
<Input autoComplete="new-phone" // 使用非标准的自动完成值
|
||||
spellCheck={false} allowClear />
|
||||
<Input
|
||||
autoComplete="new-phone" // 使用非标准的自动完成值
|
||||
spellCheck={false}
|
||||
allowClear
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item label="密码" name={"password"}>
|
||||
<Input.Password spellCheck={false} visibilityToggle autoComplete="new-password" />
|
||||
<Input.Password
|
||||
spellCheck={false}
|
||||
visibilityToggle
|
||||
autoComplete="new-password"
|
||||
/>
|
||||
</Form.Item>
|
||||
{editId && <Form.Item label="是否启用" name={"enabled"}>
|
||||
<Switch></Switch>
|
||||
</Form.Item>}
|
||||
{editId && (
|
||||
<Form.Item label="是否启用" name={"enabled"}>
|
||||
<Switch></Switch>
|
||||
</Form.Item>
|
||||
)}
|
||||
</Form>
|
||||
</div>
|
||||
);
|
||||
|
|
|
@ -15,7 +15,7 @@ export function useTusUpload() {
|
|||
>({});
|
||||
const [isUploading, setIsUploading] = useState(false);
|
||||
const [uploadError, setUploadError] = useState<string | null>(null);
|
||||
|
||||
|
||||
const getFileId = (url: string) => {
|
||||
const parts = url.split("/");
|
||||
const uploadIndex = parts.findIndex((part) => part === "upload");
|
||||
|
|
|
@ -1,135 +1,136 @@
|
|||
version: "3.8"
|
||||
services:
|
||||
db:
|
||||
image: postgres:latest
|
||||
ports:
|
||||
- "5432:5432"
|
||||
environment:
|
||||
- POSTGRES_DB=app
|
||||
- POSTGRES_USER=root
|
||||
- POSTGRES_PASSWORD=Letusdoit000
|
||||
volumes:
|
||||
- ./volumes/postgres:/var/lib/postgresql/data
|
||||
# minio:
|
||||
# image: minio/minio
|
||||
# ports:
|
||||
# - "9000:9000"
|
||||
# - "9001:9001"
|
||||
# volumes:
|
||||
# - ./volumes/minio:/minio_data
|
||||
# environment:
|
||||
# - MINIO_ACCESS_KEY=minioadmin
|
||||
# - MINIO_SECRET_KEY=minioadmin
|
||||
# command: minio server /minio_data --console-address ":9001" -address ":9000"
|
||||
# healthcheck:
|
||||
# test:
|
||||
# [
|
||||
# "CMD",
|
||||
# "curl",
|
||||
# "-f",
|
||||
# "http://192.168.2.1:9001/minio/health/live"
|
||||
# ]
|
||||
# interval: 30s
|
||||
# timeout: 20s
|
||||
# retries: 3
|
||||
pgadmin:
|
||||
image: dpage/pgadmin4
|
||||
ports:
|
||||
- "8082:80"
|
||||
environment:
|
||||
- PGADMIN_DEFAULT_EMAIL=insiinc@outlook.com
|
||||
- PGADMIN_DEFAULT_PASSWORD=Letusdoit000
|
||||
# tusd:
|
||||
# image: tusproject/tusd
|
||||
# ports:
|
||||
# - "8080:8080"
|
||||
# environment:
|
||||
# - AWS_REGION=cn-north-1
|
||||
# - AWS_ACCESS_KEY_ID=minioadmin
|
||||
# - AWS_SECRET_ACCESS_KEY=minioadmin
|
||||
# command: -verbose -s3-bucket app -s3-endpoint http://minio:9000 -hooks-http http://host.docker.internal:3000/upload/hook
|
||||
# volumes:
|
||||
# - ./volumes/tusd:/data
|
||||
# extra_hosts:
|
||||
# - "host.docker.internal:host-gateway"
|
||||
# depends_on:
|
||||
# - minio
|
||||
# tusd:
|
||||
# image: tusproject/tusd
|
||||
# ports:
|
||||
# - "8080:8080"
|
||||
# command: -verbose -upload-dir /data -hooks-http http://host.docker.internal:3000/upload/hook
|
||||
# volumes:
|
||||
# - ./uploads:/data
|
||||
# extra_hosts:
|
||||
# - "host.docker.internal:host-gateway"
|
||||
nginx:
|
||||
image: nice-nginx:latest
|
||||
ports:
|
||||
- "80:80"
|
||||
volumes:
|
||||
- ./config/nginx/conf.d:/etc/nginx/conf.d
|
||||
- ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
|
||||
- ./uploads:/data/uploads # tusd 上传目录
|
||||
- ./web-dist:/usr/share/nginx/html # 添加前端构建文件的挂载
|
||||
- ./config/nginx/entrypoint.sh:/docker-entrypoint.sh
|
||||
environment:
|
||||
- SERVER_IP=host.docker.internal
|
||||
- SERVER_PORT=3000
|
||||
entrypoint: ["/docker-entrypoint.sh"]
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
redis:
|
||||
image: redis:latest
|
||||
ports:
|
||||
- "6379:6379"
|
||||
volumes:
|
||||
- ./config/redis.conf:/usr/local/etc/redis/redis.conf
|
||||
- ./volumes/redis:/data
|
||||
command: ["redis-server", "/usr/local/etc/redis/redis.conf"]
|
||||
# restic:
|
||||
# image: restic/restic:latest
|
||||
# environment:
|
||||
# - RESTIC_REPOSITORY=/backup
|
||||
# - RESTIC_PASSWORD=Letusdoit000
|
||||
# volumes:
|
||||
# - ./volumes/postgres:/data
|
||||
# - ./volumes/restic-cache:/root/.cache/restic
|
||||
# - ./backup:/backup # 本地目录挂载到容器内的 /backup
|
||||
# - ./config/backup.sh:/usr/local/bin/backup.sh # Mount your script inside the container
|
||||
# entrypoint: /usr/local/bin/backup.sh
|
||||
# depends_on:
|
||||
# - db
|
||||
# web:
|
||||
# image: td-web:latest
|
||||
# ports:
|
||||
# - "80:80"
|
||||
# environment:
|
||||
# - VITE_APP_SERVER_IP=192.168.79.77
|
||||
# - VITE_APP_VERSION=0.3.0
|
||||
# - VITE_APP_APP_NAME=两道防线管理后台
|
||||
# server:
|
||||
# image: td-server:latest
|
||||
# ports:
|
||||
# - "3000:3000"
|
||||
# - "3001:3001"
|
||||
# environment:
|
||||
# - DATABASE_URL=postgresql://root:Letusdoit000@db:5432/app?schema=public
|
||||
# - REDIS_HOST=redis
|
||||
# - REDIS_PORT=6379
|
||||
# - REDIS_PASSWORD=Letusdoit000
|
||||
# - TUS_URL=http://192.168.2.1:8080
|
||||
# - JWT_SECRET=/yT9MnLm/r6NY7ee2Fby6ihCHZl+nFx4OQFKupivrhA=
|
||||
# - PUSH_URL=http://dns:9092
|
||||
# - PUSH_APPID=123
|
||||
# - PUSH_APPSECRET=123
|
||||
# - MINIO_HOST=minio
|
||||
# - ADMIN_PHONE_NUMBER=13258117304
|
||||
# - DEADLINE_CRON=0 0 8 * * *
|
||||
# depends_on:
|
||||
# - db
|
||||
# - redis
|
||||
db:
|
||||
image: postgres:latest
|
||||
ports:
|
||||
- "5432:5432"
|
||||
environment:
|
||||
- POSTGRES_DB=app
|
||||
- POSTGRES_USER=root
|
||||
- POSTGRES_PASSWORD=Letusdoit000
|
||||
volumes:
|
||||
- ./volumes/postgres:/var/lib/postgresql/data
|
||||
# minio:
|
||||
# image: minio/minio
|
||||
# ports:
|
||||
# - "9000:9000"
|
||||
# - "9001:9001"
|
||||
# volumes:
|
||||
# - ./volumes/minio:/minio_data
|
||||
# environment:
|
||||
# - MINIO_ACCESS_KEY=minioadmin
|
||||
# - MINIO_SECRET_KEY=minioadmin
|
||||
# command: minio server /minio_data --console-address ":9001" -address ":9000"
|
||||
# healthcheck:
|
||||
# test:
|
||||
# [
|
||||
# "CMD",
|
||||
# "curl",
|
||||
# "-f",
|
||||
# "http://192.168.2.1:9001/minio/health/live"
|
||||
# ]
|
||||
# interval: 30s
|
||||
# timeout: 20s
|
||||
# retries: 3
|
||||
pgadmin:
|
||||
image: dpage/pgadmin4
|
||||
ports:
|
||||
- "8082:80"
|
||||
environment:
|
||||
- PGADMIN_DEFAULT_EMAIL=insiinc@outlook.com
|
||||
- PGADMIN_DEFAULT_PASSWORD=Letusdoit000
|
||||
# tusd:
|
||||
# image: tusproject/tusd
|
||||
# ports:
|
||||
# - "8080:8080"
|
||||
# environment:
|
||||
# - AWS_REGION=cn-north-1
|
||||
# - AWS_ACCESS_KEY_ID=minioadmin
|
||||
# - AWS_SECRET_ACCESS_KEY=minioadmin
|
||||
# command: -verbose -s3-bucket app -s3-endpoint http://minio:9000 -hooks-http http://host.docker.internal:3000/upload/hook
|
||||
# volumes:
|
||||
# - ./volumes/tusd:/data
|
||||
# extra_hosts:
|
||||
# - "host.docker.internal:host-gateway"
|
||||
# depends_on:
|
||||
# - minio
|
||||
# tusd:
|
||||
# image: tusproject/tusd
|
||||
# ports:
|
||||
# - "8080:8080"
|
||||
# command: -verbose -upload-dir /data -hooks-http http://host.docker.internal:3000/upload/hook
|
||||
# volumes:
|
||||
# - ./uploads:/data
|
||||
# extra_hosts:
|
||||
# - "host.docker.internal:host-gateway"
|
||||
nginx:
|
||||
image: nice-nginx:2.0
|
||||
ports:
|
||||
- "80:80"
|
||||
volumes:
|
||||
- ./config/nginx/conf.d:/etc/nginx/conf.d
|
||||
- ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
|
||||
- ./uploads:/data/uploads # tusd 上传目录
|
||||
- ./web-dist:/usr/share/nginx/html # 添加前端构建文件的挂载
|
||||
- ./config/nginx/entrypoint.sh:/docker-entrypoint.sh
|
||||
environment:
|
||||
- SERVER_IP=host.docker.internal
|
||||
- SERVER_PORT=3000
|
||||
entrypoint: ["/docker-entrypoint.sh"]
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
|
||||
redis:
|
||||
image: redis:latest
|
||||
ports:
|
||||
- "6379:6379"
|
||||
volumes:
|
||||
- ./config/redis.conf:/usr/local/etc/redis/redis.conf
|
||||
- ./volumes/redis:/data
|
||||
command: ["redis-server", "/usr/local/etc/redis/redis.conf"]
|
||||
# restic:
|
||||
# image: restic/restic:latest
|
||||
# environment:
|
||||
# - RESTIC_REPOSITORY=/backup
|
||||
# - RESTIC_PASSWORD=Letusdoit000
|
||||
# volumes:
|
||||
# - ./volumes/postgres:/data
|
||||
# - ./volumes/restic-cache:/root/.cache/restic
|
||||
# - ./backup:/backup # 本地目录挂载到容器内的 /backup
|
||||
# - ./config/backup.sh:/usr/local/bin/backup.sh # Mount your script inside the container
|
||||
# entrypoint: /usr/local/bin/backup.sh
|
||||
# depends_on:
|
||||
# - db
|
||||
# web:
|
||||
# image: td-web:latest
|
||||
# ports:
|
||||
# - "80:80"
|
||||
# environment:
|
||||
# - VITE_APP_SERVER_IP=192.168.79.77
|
||||
# - VITE_APP_VERSION=0.3.0
|
||||
# - VITE_APP_APP_NAME=两道防线管理后台
|
||||
# server:
|
||||
# image: td-server:latest
|
||||
# ports:
|
||||
# - "3000:3000"
|
||||
# - "3001:3001"
|
||||
# environment:
|
||||
# - DATABASE_URL=postgresql://root:Letusdoit000@db:5432/app?schema=public
|
||||
# - REDIS_HOST=redis
|
||||
# - REDIS_PORT=6379
|
||||
# - REDIS_PASSWORD=Letusdoit000
|
||||
# - TUS_URL=http://192.168.2.1:8080
|
||||
# - JWT_SECRET=/yT9MnLm/r6NY7ee2Fby6ihCHZl+nFx4OQFKupivrhA=
|
||||
# - PUSH_URL=http://dns:9092
|
||||
# - PUSH_APPID=123
|
||||
# - PUSH_APPSECRET=123
|
||||
# - MINIO_HOST=minio
|
||||
# - ADMIN_PHONE_NUMBER=13258117304
|
||||
# - DEADLINE_CRON=0 0 8 * * *
|
||||
# depends_on:
|
||||
# - db
|
||||
# - redis
|
||||
|
||||
networks:
|
||||
default:
|
||||
name: remooc
|
||||
default:
|
||||
name: remooc
|
||||
|
|
|
@ -10,6 +10,7 @@ export function useAppConfig() {
|
|||
api.app_config.findFirst.useQuery({
|
||||
where: { slug: AppConfigSlug.BASE_SETTING },
|
||||
});
|
||||
|
||||
const handleMutationSuccess = useCallback(() => {
|
||||
utils.app_config.invalidate();
|
||||
}, [utils]);
|
||||
|
@ -26,7 +27,8 @@ export function useAppConfig() {
|
|||
});
|
||||
useEffect(() => {
|
||||
if (data?.meta) {
|
||||
setBaseSetting(JSON.parse(data?.meta));
|
||||
// console.log(JSON.parse(data?.meta));
|
||||
setBaseSetting(data?.meta);
|
||||
}
|
||||
}, [data, isLoading]);
|
||||
const splashScreen = useMemo(() => {
|
||||
|
@ -38,6 +40,16 @@ export function useAppConfig() {
|
|||
const slides = useMemo(() => {
|
||||
return baseSetting?.appConfig?.slides || [];
|
||||
}, [baseSetting]);
|
||||
const statistics = useMemo(() => {
|
||||
return (
|
||||
baseSetting?.appConfig?.statistics || {
|
||||
reads: 0,
|
||||
staffs: 0,
|
||||
courses: 0,
|
||||
lectures: 0,
|
||||
}
|
||||
);
|
||||
}, [baseSetting]);
|
||||
return {
|
||||
create,
|
||||
deleteMany,
|
||||
|
@ -47,5 +59,6 @@ export function useAppConfig() {
|
|||
devDept,
|
||||
isLoading,
|
||||
slides,
|
||||
statistics,
|
||||
};
|
||||
}
|
||||
|
|
|
@ -81,3 +81,17 @@ export const InitAppConfigs: Prisma.AppConfigCreateInput[] = [
|
|||
description: "",
|
||||
},
|
||||
];
|
||||
export const videoMimeTypes = [
|
||||
"video/*", // 通配符 (部分浏览器可能不支持)
|
||||
"video/mp4", // .mp4
|
||||
"video/quicktime", // .mov
|
||||
"video/x-msvideo", // .avi
|
||||
"video/x-matroska", // .mkv
|
||||
"video/webm", // .webm
|
||||
"video/ogg", // .ogv
|
||||
"video/mpeg", // .mpeg
|
||||
"video/3gpp", // .3gp
|
||||
"video/3gpp2", // .3g2
|
||||
"video/x-flv", // .flv
|
||||
"video/x-ms-wmv", // .wmv
|
||||
];
|
||||
|
|
|
@ -44,7 +44,12 @@ export interface BaseSetting {
|
|||
splashScreen?: string;
|
||||
devDept?: string;
|
||||
slides?: [];
|
||||
reads?: number;
|
||||
statistics?: {
|
||||
reads?: number;
|
||||
courses?: number;
|
||||
lectures?: number;
|
||||
staffs?: number;
|
||||
};
|
||||
};
|
||||
}
|
||||
export type RowModelResult = {
|
||||
|
|
Loading…
Reference in New Issue