Merge branch 'new-miniapp'

server/app/common/model/AssetResource.php

@@ -0,0 +1,36 @@
+<?php
+namespace app\common\model;
+
+use app\common\service\FileService;
+
+class AssetResource extends BaseModel
+{
+    protected $name = 'asset_resource';
+    protected $autoWriteTimestamp = true;
+
+    public function getFileUrlAttr($value)
+    {
+        return trim($value) ? FileService::getFileUrl($value) : '';
+    }
+
+    public function setFileUrlAttr($value)
+    {
+        return trim($value) ? FileService::setFileUrl($value) : '';
+    }
+
+    public function getCoverUrlAttr($value)
+    {
+        return trim($value) ? FileService::getFileUrl($value) : '';
+    }
+
+    public function setCoverUrlAttr($value)
+    {
+        return trim($value) ? FileService::setFileUrl($value) : '';
+    }
+
+    // Relation to users via asset_user_resource
+    public function users()
+    {
+        return $this->belongsToMany(AssetUser::class, AssetUserResource::class, 'user_id', 'resource_id');
+    }
+}

server/app/common/model/AssetUser.php

@@ -0,0 +1,13 @@
+<?php
+namespace app\common\model;
+
+use think\model\concern\SoftDelete;
+
+class AssetUser extends BaseModel
+{
+    protected $name = 'asset_user';
+    protected $autoWriteTimestamp = true;
+
+    // Optional: Hide password when returning array/json
+    protected $hidden = ['password'];
+}

server/app/common/model/AssetUserResource.php

@@ -0,0 +1,10 @@
+<?php
+namespace app\common\model;
+use think\model\Pivot;
+
+class AssetUserResource extends Pivot
+{
+    protected $name = 'asset_user_resource';
+    protected $autoWriteTimestamp = 'create_time';
+    protected $updateTime = false;
+}

server/app/common/service/DirectUploadService.php

@@ -19,6 +19,7 @@ class DirectUploadService
 {
     /** 视频允许的扩展名（沿用 config/project.file_video） */
     public const TYPE_VIDEO = 'video';
+    public const TYPE_VOICE = 'voice';
 
     /** 默认凭证有效期 30 分钟 */
     public const DEFAULT_DURATION = 1800;
@@ -26,6 +27,7 @@ class DirectUploadService
     /** 允许扩展类型 → 大小上限（字节） */
     private const MAX_SIZE = [
         self::TYPE_VIDEO => 2 * 1024 * 1024 * 1024, // 2GB
+        self::TYPE_VOICE => 500 * 1024 * 1024, // 500MB
     ];
 
     /**
@@ -144,6 +146,7 @@ class DirectUploadService
     {
         return match ($type) {
             self::TYPE_VIDEO => FileEnum::VIDEO_TYPE,
+            self::TYPE_VOICE => FileEnum::FILE_TYPE,
             default => FileEnum::FILE_TYPE,
         };
     }