timi/gaoYuJournal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: timi:f4232e8752e4e1058baf495586d80400a7abf1e9
Branches Tags
timi:master
...
compare: timi:8adc28ae9c42dee505216e710a83ae3545e3c443
Branches Tags
timi:master

3 Commits
f4232e8752 ... 8adc28ae9c

Author SHA1 Message Date
Timi
8adc28ae9c update 1.6.6 2026-01-04 19:09:52 +08:00
Timi
e31a3432a0 remove PreviewImageMetadata.isImage/isVideo 2026-01-04 19:09:28 +08:00
Timi
2c6478c729 merge Attachment metadata/ext 2026-01-04 17:41:02 +08:00
11 changed files with 53 additions and 60 deletions
Expand all files Collapse all files

10
miniprogram/components/journal-detail-popup/index.ts
View File

@ -2,7 +2,7 @@
import { Journal } from "../../types/Journal"; import { Journal } from "../../types/Journal";
import config from "../../config/index"; import config from "../../config/index";
import Toolkit from "../../utils/Toolkit"; import Toolkit from "../../utils/Toolkit";
import { ImageMetadata, MediaAttachExt, MediaAttachType } from "../../types/Attachment"; import { MediaAttachType, PreviewImageMetadata } from "../../types/Attachment";
import { MediaItem, MediaItemType } from "../../types/UI"; import { MediaItem, MediaItemType } from "../../types/UI";
import Time from "../../utils/Time"; import Time from "../../utils/Time";
import { JournalApi } from "../../api/JournalApi"; import { JournalApi } from "../../api/JournalApi";
@ -47,12 +47,12 @@ Component({
return; return;
} }
const mediaItems: MediaItem[] = thumbItems.map((thumbItem, index) => { const mediaItems: MediaItem[] = thumbItems.map((thumbItem, index) => {
const metadata = thumbItem.metadata as ImageMetadata; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const ext = thumbItem.ext = JSON.parse(thumbItem.ext!.toString()) as MediaAttachExt;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

10
miniprogram/components/travel-location-popup/index.ts
View File

@ -1,7 +1,7 @@
// components/travel-location-popup/index.ts // components/travel-location-popup/index.ts
import { TravelLocation, TravelLocationTypeLabel, TravelLocationTypeIcon } from "../../types/Travel"; import { TravelLocation, TravelLocationTypeLabel, TravelLocationTypeIcon } from "../../types/Travel";
import { TravelLocationApi } from "../../api/TravelLocationApi"; import { TravelLocationApi } from "../../api/TravelLocationApi";
import { ImageMetadata, MediaAttachType } from "../../types/Attachment"; import { MediaAttachType, PreviewImageMetadata } from "../../types/Attachment";
import { MediaItem, MediaItemType } from "../../types/UI"; import { MediaItem, MediaItemType } from "../../types/UI";
import config from "../../config/index"; import config from "../../config/index";
import Toolkit from "../../utils/Toolkit"; import Toolkit from "../../utils/Toolkit";
@ -43,12 +43,12 @@ Component({
if (0 < thumbItems.length) { if (0 < thumbItems.length) {
const mediaItems: MediaItem[] = thumbItems.map((thumbItem, index) => { const mediaItems: MediaItem[] = thumbItems.map((thumbItem, index) => {
const metadata = thumbItem.metadata as ImageMetadata; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const ext = typeof thumbItem.ext === "string" ? JSON.parse(thumbItem.ext) : thumbItem.ext;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

3
miniprogram/config/index.ts
View File

@ -1,11 +1,12 @@
const envArgs = { const envArgs = {
develop: { develop: {
url: "http://localhost:8091"
// url: "https://api.imyeyu.dev" // url: "https://api.imyeyu.dev"
// url: "https://api.imyeyu.com" // url: "https://api.imyeyu.com"
// url: "http://192.168.3.123:8091" // url: "http://192.168.3.123:8091"
// url: "http://192.168.3.137:8091" // url: "http://192.168.3.137:8091"
// url: "http://192.168.3.173:8091" // url: "http://192.168.3.173:8091"
url: "http://192.168.3.174:8091" // url: "http://192.168.3.174:8091"
}, },
trial: { trial: {
url: "https://api.imyeyu.com" url: "https://api.imyeyu.com"

2
miniprogram/pages/main/about/index.wxml
View File

@ -26,7 +26,7 @@
</view> </view>
<view class="item"> <view class="item">
<text class="label">版本：</text> <text class="label">版本：</text>
<text>1.6.5</text> <text>1.6.6</text>
</view> </view>
<view class="item copyright"> <view class="item copyright">
<text>{{copyright}}</text> <text>{{copyright}}</text>

9
miniprogram/pages/main/journal-editor/index.ts
View File

@ -5,7 +5,7 @@ import Toolkit from "../../../utils/Toolkit";
import config from "../../../config/index"; import config from "../../../config/index";
import { Location, MediaItem, MediaItemType, WechatMediaItem } from "../../../types/UI"; import { Location, MediaItem, MediaItemType, WechatMediaItem } from "../../../types/UI";
import { JournalType } from "../../../types/Journal"; import { JournalType } from "../../../types/Journal";
import { MediaAttachExt, MediaAttachType } from "../../../types/Attachment"; import { MediaAttachType, PreviewImageMetadata } from "../../../types/Attachment";
import IOSize, { Unit } from "../../../utils/IOSize"; import IOSize, { Unit } from "../../../utils/IOSize";
import { JournalApi } from "../../../api/JournalApi"; import { JournalApi } from "../../../api/JournalApi";
@ -156,11 +156,12 @@ Page({
const thumbItems = items.filter((item) => item.attachType === MediaAttachType.THUMB); const thumbItems = items.filter((item) => item.attachType === MediaAttachType.THUMB);
const mediaList: MediaItem[] = thumbItems.map((thumbItem) => { const mediaList: MediaItem[] = thumbItems.map((thumbItem) => {
const ext = thumbItem.ext = JSON.parse(thumbItem.ext!.toString()) as MediaAttachExt; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

10
miniprogram/pages/main/journal/index.ts
View File

@ -6,7 +6,7 @@ import Events from "../../../utils/Events";
import Toolkit from "../../../utils/Toolkit"; import Toolkit from "../../../utils/Toolkit";
import { Journal, JournalPage, JournalPageType } from "../../../types/Journal"; import { Journal, JournalPage, JournalPageType } from "../../../types/Journal";
import { OrderType } from "../../../types/Model"; import { OrderType } from "../../../types/Model";
import { ImageMetadata, MediaAttachExt } from "../../../types/Attachment"; import { PreviewImageMetadata } from "../../../types/Attachment";
import { MediaItem, MediaItemType } from "../../../types/UI"; import { MediaItem, MediaItemType } from "../../../types/UI";
import { JournalApi } from "../../../api/JournalApi"; import { JournalApi } from "../../../api/JournalApi";
@ -163,12 +163,12 @@ Page({
} }
list.forEach(journal => { list.forEach(journal => {
const mediaItems = journal.items!.filter((item) => item.attachType === "THUMB").map((thumbItem, index) => { const mediaItems = journal.items!.filter((item) => item.attachType === "THUMB").map((thumbItem, index) => {
const metadata = thumbItem.metadata as ImageMetadata; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const ext = thumbItem.ext = JSON.parse(thumbItem.ext!.toString()) as MediaAttachExt;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

16
miniprogram/pages/main/moment/index.ts
View File

@ -5,7 +5,7 @@ import IOSize, { Unit } from "../../../utils/IOSize";
import Time from "../../../utils/Time"; import Time from "../../../utils/Time";
import Toolkit from "../../../utils/Toolkit"; import Toolkit from "../../../utils/Toolkit";
import { Location, MediaItemType } from "../../../types/UI"; import { Location, MediaItemType } from "../../../types/UI";
import { MediaAttachExt } from "../../../types/Attachment"; import { PreviewImageMetadata } from "../../../types/Attachment";
import { MomentApi } from "../../../api/MomentApi"; import { MomentApi } from "../../../api/MomentApi";
import { JournalApi } from "../../../api/JournalApi"; import { JournalApi } from "../../../api/JournalApi";
import { Network } from "../../../utils/Network"; import { Network } from "../../../utils/Network";
@ -134,12 +134,13 @@ Page({
} }
this.setData({ this.setData({
list: list.map((item: any) => { list: list.map((item: any) => {
const ext = JSON.parse(item.ext) as MediaAttachExt; const metadata = (typeof item.metadata === "string" ? JSON.parse(item.metadata) : item.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${item.mongoId}`; const thumbURL = `${config.url}/attachment/read/${item.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isImage = metadata.sourceMimeType?.startsWith("image/");
return { return {
id: item.id, id: item.id,
type: ext.isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO, type: isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO,
thumbURL, thumbURL,
sourceURL, sourceURL,
checked: false checked: false
@ -259,12 +260,13 @@ Page({
const list = await MomentApi.create(tempFileIds); const list = await MomentApi.create(tempFileIds);
wx.showToast({ title: "上传成功", icon: "success" }); wx.showToast({ title: "上传成功", icon: "success" });
const added = list.map((item: any) => { const added = list.map((item: any) => {
const ext = JSON.parse(item.ext) as MediaAttachExt; const metadata = (typeof item.metadata === "string" ? JSON.parse(item.metadata) : item.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${item.mongoId}`; const thumbURL = `${config.url}/attachment/read/${item.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isImage = item.mimeType?.startsWith("image/");
return { return {
id: item.id, id: item.id,
type: ext.isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO, type: isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO,
thumbURL, thumbURL,
sourceURL, sourceURL,
checked: false checked: false

10
miniprogram/pages/main/portfolio/index.ts
View File

@ -6,7 +6,7 @@ import Events from "../../../utils/Events";
import Toolkit from "../../../utils/Toolkit"; import Toolkit from "../../../utils/Toolkit";
import { Journal, JournalPage, JournalPageType } from "../../../types/Journal"; import { Journal, JournalPage, JournalPageType } from "../../../types/Journal";
import { OrderType, } from "../../../types/Model"; import { OrderType, } from "../../../types/Model";
import { ImageMetadata, MediaAttachExt } from "../../../types/Attachment"; import { PreviewImageMetadata } from "../../../types/Attachment";
import { MediaItem, MediaItemType } from "../../../types/UI"; import { MediaItem, MediaItemType } from "../../../types/UI";
import { JournalApi } from "../../../api/JournalApi"; import { JournalApi } from "../../../api/JournalApi";
@ -92,12 +92,12 @@ Page({
} }
list.forEach(journal => { list.forEach(journal => {
const mediaItems = journal.items!.filter((item) => item.attachType === "THUMB").map((thumbItem, index) => { const mediaItems = journal.items!.filter((item) => item.attachType === "THUMB").map((thumbItem, index) => {
const metadata = thumbItem.metadata as ImageMetadata; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const ext = thumbItem.ext = JSON.parse(thumbItem.ext!.toString()) as MediaAttachExt;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

11
miniprogram/pages/main/travel-location-detail/index.ts
View File

@ -3,7 +3,7 @@
import config from "../../../config/index"; import config from "../../../config/index";
import { TravelLocationApi } from "../../../api/TravelLocationApi"; import { TravelLocationApi } from "../../../api/TravelLocationApi";
import { TravelLocation, TravelLocationTypeIcon, TravelLocationTypeLabel } from "../../../types/Travel"; import { TravelLocation, TravelLocationTypeIcon, TravelLocationTypeLabel } from "../../../types/Travel";
import { MediaAttachExt, MediaAttachType } from "../../../types/Attachment"; import { MediaAttachType, PreviewImageMetadata } from "../../../types/Attachment";
import { MapMarker, MediaItem, MediaItemType } from "../../../types/UI"; import { MapMarker, MediaItem, MediaItemType } from "../../../types/UI";
import Toolkit from "../../../utils/Toolkit"; import Toolkit from "../../../utils/Toolkit";
@ -95,18 +95,19 @@ Page({
thumbItems.forEach((thumbItem) => { thumbItems.forEach((thumbItem) => {
try { try {
const ext = JSON.parse(thumbItem.ext!.toString()) as MediaAttachExt; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
mediaItems.push({ mediaItems.push({
type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,
attachmentId: thumbItem.id! attachmentId: thumbItem.id!
}); });
} catch (parseError) { } catch (parseError) {
console.warn("解析附件扩展信息失败", parseError); console.warn("解析附件元数据失败", parseError);
} }
}); });

9
miniprogram/pages/main/travel-location-editor/index.ts
View File

@ -3,7 +3,7 @@
import { Network, WechatMediaItem } from "../../../utils/Network"; import { Network, WechatMediaItem } from "../../../utils/Network";
import { TravelLocationApi } from "../../../api/TravelLocationApi"; import { TravelLocationApi } from "../../../api/TravelLocationApi";
import { TravelLocationType, TravelLocationTypeLabel } from "../../../types/Travel"; import { TravelLocationType, TravelLocationTypeLabel } from "../../../types/Travel";
import { MediaAttachExt, MediaAttachType } from "../../../types/Attachment"; import { MediaAttachType, PreviewImageMetadata } from "../../../types/Attachment";
import config from "../../../config/index"; import config from "../../../config/index";
import { MediaItem, MediaItemType } from "../../../types/UI"; import { MediaItem, MediaItemType } from "../../../types/UI";
@ -161,11 +161,12 @@ Page({
const thumbItems = items.filter((item) => item.attachType === MediaAttachType.THUMB); const thumbItems = items.filter((item) => item.attachType === MediaAttachType.THUMB);
const mediaList: MediaItem[] = thumbItems.map((thumbItem) => { const mediaList: MediaItem[] = thumbItems.map((thumbItem) => {
const ext = thumbItem.ext = JSON.parse(thumbItem.ext!.toString()) as MediaAttachExt; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

23
miniprogram/types/Attachment.ts
View File

@ -17,7 +17,7 @@ export type Attachment = {
mimeType?: string; mimeType?: string;
metadata?: string | ImageMetadata; metadata?: string | ImageMetadata | PreviewImageMetadata;
/** 文件 MD5 */ /** 文件 MD5 */
md5: string; md5: string;
@ -27,9 +27,6 @@ export type Attachment = {
/** 大小 */ /** 大小 */
size: number; size: number;
/** 扩展数据 */
ext?: string | MediaAttachExt;
} & Model; } & Model;
/** 媒体附件类型 */ /** 媒体附件类型 */
@ -52,8 +49,7 @@ export type ImageMetadata = {
height: number; height: number;
} }
/** 媒体附件扩展数据 */ export type PreviewImageMetadata = {
export type MediaAttachExt = {
/** 原文件附件 ID */ /** 原文件附件 ID */
sourceId: number; sourceId: number;
@ -61,15 +57,6 @@ export type MediaAttachExt = {
/** 原文件访问 mongoId */ /** 原文件访问 mongoId */
sourceMongoId: string; sourceMongoId: string;
/** true 为图片 */ /** 原文件 MimeType */
isImage: boolean; sourceMimeType: string;
} & ImageMetadata;
/** true 为视频 */
isVideo: boolean;
/** 原图宽度（像素） */
width?: number;
/** 原图高度（像素） */
height?: number;
}