From c3907ee4541c203cd9944b5da6154e25980b6b42 Mon Sep 17 00:00:00 2001 From: fzk <458813868@qq.com> Date: Thu, 21 Dec 2023 15:14:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=92=8C=E9=92=89=E5=9B=BE=E6=89=93=E4=B8=8D=E5=BC=80bug?= =?UTF-8?q?=E3=80=81=E5=88=9B=E5=BB=BA=E8=AE=BE=E7=BD=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/server/CHANGELOG.md | 4 ++++ packages/server/package.json | 2 +- packages/server/src/config/index.ts | 3 +-- packages/server/src/records/records.service.ts | 1 + packages/server/src/settings/settings.controller.ts | 9 ++++----- packages/server/src/settings/settings.module.ts | 3 ++- packages/server/src/settings/settings.service.ts | 5 +++++ packages/server/src/users/dto/create-user.dto.ts | 4 ++-- packages/server/src/users/entity/user.entity.ts | 2 -- packages/web/CHANGELOG.md | 4 ++++ packages/web/package.json | 2 +- packages/web/src/components/records/RecordsContent.tsx | 4 ++-- .../src/components/videoToGif/VideoToGifConverter.tsx | 4 ++++ packages/web/src/pages/editImage/index.tsx | 2 +- packages/web/src/pages/pinImage/index.tsx | 2 +- 15 files changed, 33 insertions(+), 18 deletions(-) diff --git a/packages/server/CHANGELOG.md b/packages/server/CHANGELOG.md index d8606d82..b3b3cc77 100644 --- a/packages/server/CHANGELOG.md +++ b/packages/server/CHANGELOG.md @@ -1,5 +1,9 @@ # @pear-rec/server +## 1.3.3 + +fix: 创建设置bug + ## 1.3.2 fix: 配置初始 bug diff --git a/packages/server/package.json b/packages/server/package.json index 859ac55b..729084ac 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@pear-rec/server", - "version": "1.3.0", + "version": "1.3.3", "scripts": { "build": "nest build --webpack --webpackPath=./webpack.config.js", "webpack": "nest build", diff --git a/packages/server/src/config/index.ts b/packages/server/src/config/index.ts index 81b2d869..ed7d8b11 100644 --- a/packages/server/src/config/index.ts +++ b/packages/server/src/config/index.ts @@ -2,7 +2,6 @@ import * as jsonfile from 'jsonfile'; import * as fs from 'node:fs'; import * as path from 'node:path'; import { v5 as uuidv5 } from 'uuid'; -import dayjs from 'dayjs'; import { PEAR_FILES_PATH, DB_PATH, CONFIG_FILE_PATH, DEFAULT_CONFIG_FILE_PATH } from '../contract'; export function initConfig() { @@ -26,7 +25,7 @@ function initDefaultConfig() { uuid: uuidv5('https://www.w3.org/', uuidv5.URL), userName: `pear-rec:user`, userType: 1, - createdAt: dayjs(new Date()).format(), + createdAt: new Date(), }, isProxy: false, proxyPort: '7890', diff --git a/packages/server/src/records/records.service.ts b/packages/server/src/records/records.service.ts index f2857296..37bee201 100644 --- a/packages/server/src/records/records.service.ts +++ b/packages/server/src/records/records.service.ts @@ -17,6 +17,7 @@ export class RecordsService { async findAll(pageNumber: number, pageSize: number): Promise { const [records, totalCount] = await this.recordRepository.findAndCount({ + order: { createdAt: 'DESC' }, skip: (pageNumber - 1) * pageSize, take: pageSize, }); diff --git a/packages/server/src/settings/settings.controller.ts b/packages/server/src/settings/settings.controller.ts index 184fe035..360b894b 100644 --- a/packages/server/src/settings/settings.controller.ts +++ b/packages/server/src/settings/settings.controller.ts @@ -1,7 +1,6 @@ import { Controller, Get, Post, Body, Param, UseInterceptors } from '@nestjs/common'; import { CreateSettingDto } from './dto/create-setting.dto'; import { SettingsService } from './settings.service'; -import { UsersService } from 'src/users/users.service'; import { Setting } from './entity/setting.entity'; @Controller('settings') @@ -9,8 +8,8 @@ export class SettingsController { constructor(private settingsService: SettingsService) {} @Post() - create(@Body() record: CreateSettingDto): Promise { - return this.settingsService.create(record); + create(@Body() setting: CreateSettingDto): Promise { + return this.settingsService.create(setting); } @Get() @@ -29,8 +28,8 @@ export class SettingsController { } @Post('/edit/:id') - update(@Param('id') id: number, @Body() record: CreateSettingDto): Promise { - return this.settingsService.update(id, record); + update(@Param('id') id: number, @Body() setting: CreateSettingDto): Promise { + return this.settingsService.update(id, setting); } @Post('/delete/:id') diff --git a/packages/server/src/settings/settings.module.ts b/packages/server/src/settings/settings.module.ts index 7d955875..cc1769b2 100644 --- a/packages/server/src/settings/settings.module.ts +++ b/packages/server/src/settings/settings.module.ts @@ -3,9 +3,10 @@ import { TypeOrmModule } from '@nestjs/typeorm'; import { SettingsController } from './settings.controller'; import { SettingsService } from './settings.service'; import { Setting } from './entity/setting.entity'; +import { UsersModule } from '../users/users.module'; @Module({ - imports: [TypeOrmModule.forFeature([Setting])], + imports: [TypeOrmModule.forFeature([Setting]), UsersModule], controllers: [SettingsController], providers: [SettingsService], exports: [SettingsService], diff --git a/packages/server/src/settings/settings.service.ts b/packages/server/src/settings/settings.service.ts index 53f6cd9a..937d6642 100644 --- a/packages/server/src/settings/settings.service.ts +++ b/packages/server/src/settings/settings.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { Setting } from './entity/setting.entity'; +import { UsersService } from '../users/users.service'; import { getDefaultConfig } from '../config'; @Injectable() @@ -9,6 +10,7 @@ export class SettingsService { constructor( @InjectRepository(Setting) private readonly settingRepository: Repository, + private readonly usersService: UsersService, ) {} async create(setting: Setting): Promise { @@ -32,6 +34,7 @@ export class SettingsService { if (setting == null) { const defaultConfig = getDefaultConfig(); + const user = await this.usersService.findOne(userId); setting = { isProxy: defaultConfig.isProxy, proxyPort: defaultConfig.proxyPort, @@ -39,6 +42,8 @@ export class SettingsService { filePath: defaultConfig.filePath, openAtLogin: defaultConfig.openAtLogin, serverPath: defaultConfig.serverPath, + user: user, + createdBy: user.id, } as any; return await this.settingRepository.save(setting); diff --git a/packages/server/src/users/dto/create-user.dto.ts b/packages/server/src/users/dto/create-user.dto.ts index 1fa7d5ba..d4b1d3bc 100644 --- a/packages/server/src/users/dto/create-user.dto.ts +++ b/packages/server/src/users/dto/create-user.dto.ts @@ -14,11 +14,11 @@ export class CreateUserDto { // setting: ISetting; - createdAt: Date; + createdAt: number; createdBy: string; - updatedAt: Date; + updatedAt: number; updatedBy: string; } diff --git a/packages/server/src/users/entity/user.entity.ts b/packages/server/src/users/entity/user.entity.ts index 50275dc2..efd22adf 100644 --- a/packages/server/src/users/entity/user.entity.ts +++ b/packages/server/src/users/entity/user.entity.ts @@ -10,8 +10,6 @@ import { import { IUser } from '../interfaces/user.interface'; import { Record } from '../../records/entity/record.entity'; import { Setting } from '../../settings/entity/setting.entity'; -// import { IRecord } from '../model/IRecord'; -// import { ISetting } from '../model/ISetting'; @Entity() export class User implements IUser { diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md index 3a77317b..a16b2079 100644 --- a/packages/web/CHANGELOG.md +++ b/packages/web/CHANGELOG.md @@ -1,5 +1,9 @@ # @pear-rec/web +## 1.3.8 + +fix: 修改图片和钉图打不开bug + ## 1.3.7 feat: 录制GIF diff --git a/packages/web/package.json b/packages/web/package.json index 358d1689..585be957 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,7 +1,7 @@ { "name": "@pear-rec/web", "private": true, - "version": "1.3.7", + "version": "1.3.8", "scripts": { "dev": "vite", "build": "rimraf dist && tsc && vite build", diff --git a/packages/web/src/components/records/RecordsContent.tsx b/packages/web/src/components/records/RecordsContent.tsx index 708142da..27074194 100644 --- a/packages/web/src/components/records/RecordsContent.tsx +++ b/packages/web/src/components/records/RecordsContent.tsx @@ -9,7 +9,6 @@ import { import { useApi } from '../../api'; import { useRecordApi } from '../../api/record'; import { eventEmitter } from '../../util/bus'; -import Item from 'antd/es/list/Item'; const { Content } = Layout; const recordApi = useRecordApi(); @@ -127,7 +126,8 @@ const RecordAudioCard = forwardRef(() => { } function getAvatar(record: any) { - if (record.fileType == 'ss') { + console.log(record.fileType); + if (record.fileType == 'ss' || record.fileType == 'gif') { return ; } if (record.fileType == 'rs') { diff --git a/packages/web/src/components/videoToGif/VideoToGifConverter.tsx b/packages/web/src/components/videoToGif/VideoToGifConverter.tsx index e0bb03fa..fa1d82bd 100644 --- a/packages/web/src/components/videoToGif/VideoToGifConverter.tsx +++ b/packages/web/src/components/videoToGif/VideoToGifConverter.tsx @@ -80,6 +80,10 @@ export default function VideoToGifConverter({ videoSrc, user }) { async function handleSaveClick() { const blob = gifBlobRef.current; + if (blob == null) { + Modal.error({ title: '提示', content: '先保存再下载' }); + return false; + } try { const formData = new FormData(); formData.append('type', 'gif'); diff --git a/packages/web/src/pages/editImage/index.tsx b/packages/web/src/pages/editImage/index.tsx index af06612d..4b8940d3 100644 --- a/packages/web/src/pages/editImage/index.tsx +++ b/packages/web/src/pages/editImage/index.tsx @@ -191,7 +191,7 @@ const EditImage = () => { const searchParams = new URLSearchParams(paramsString); let imgUrl = searchParams.get('imgUrl'); if (imgUrl.substring(0, 4) != 'blob') { - imgUrl = `${window.baseURL}getFile?url=${imgUrl}`; + imgUrl = `${window.baseURL}file?url=${imgUrl}`; } const instance = new ImageEditor(document.querySelector('#tui-image-editor'), { includeUI: { diff --git a/packages/web/src/pages/pinImage/index.tsx b/packages/web/src/pages/pinImage/index.tsx index 0fefd0e3..7c0704b5 100644 --- a/packages/web/src/pages/pinImage/index.tsx +++ b/packages/web/src/pages/pinImage/index.tsx @@ -54,7 +54,7 @@ const PinImage: React.FC = () => { const searchParams = new URLSearchParams(paramsString); let _imgUrl = searchParams.get('imgUrl') || defaultImg; if (_imgUrl.substring(0, 4) != 'blob') { - _imgUrl = `${window.baseURL}getFile?url=${_imgUrl}`; + _imgUrl = `${window.baseURL}file?url=${_imgUrl}`; } fetch(_imgUrl)