Bump js-yaml from 3.14.1 to 3.14.2 (#875)

Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.14.1 to 3.14.2.
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.14.1...3.14.2)

---
updated-dependencies:
- dependency-name: js-yaml
  dependency-version: 3.14.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

README.md

@@ -15,10 +15,14 @@
 [官网](https://www.lsky.pro) ·
 [文档](https://docs.lsky.pro) ·
 [社区](https://github.com/lsky-org/lsky-pro/discussions) ·
-[演示](https://pic.iqy.ink) ·
+[演示](https://pic.vv1234.cn) ·
 [Telegram 群组](https://t.me/lsky_pro)
 
-> 正式版本请点击 [这里](https://github.com/lsky-org/lsky-pro/releases) 下载，发现 bug 请提交 [issues](https://github.com/lsky-org/lsky-pro/issues) (提问前建议阅读[提问的智慧](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md))  
+> [!WARNING]
+> 开源版本已停止维护，不再进行新特性更新和 bug 修复。
+
+> master 分支为未安装三方拓展的版本，通常包含了最新未发布版本的一些实验性新特性和修复补丁，正式版本请点击 [这里](https://github.com/lsky-org/lsky-pro/releases) 下载。  
+> 发现 bug 请提交 [issues](https://github.com/lsky-org/lsky-pro/issues) (提问前建议阅读[提问的智慧](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md))  
 > 有任何想法、建议、或分享，请移步 [社区](https://github.com/lsky-org/lsky-pro/discussions)
 
 ![看不见图片请使用科学上网](https://user-images.githubusercontent.com/22728201/157242302-bfbd04a0-fb30-4241-800e-cc2b1dad9b19.png)

app/Enums/GroupConfigKey.php

@@ -54,4 +54,10 @@ final class GroupConfigKey
 
     /** @var string 图片缓存时间 */
     const ImageCacheTtl = 'image_cache_ttl';
+
+    /** @var string 图片保存格式 */
+    const ImageSaveFormat = 'image_save_format';
+
+    /** @var string 图片保存质量 */
+    const ImageSaveQuality = 'image_save_quality';
 }

app/Enums/Strategy/MinioOption.php

@@ -21,4 +21,7 @@ final class MinioOption
 
     /** @var string Bucket */
     const Bucket = 'bucket';
+
+    /** @var string BucketEndpoint */
+    const BucketEndpoint = 'bucket_endpoint';
 }

app/Enums/Strategy/WebDavOption.php

@@ -15,4 +15,10 @@ final class WebDavOption
 
     /** @var string 密码 */
     const Password = 'password';
+
+    /** @var string 认证方式 */
+    const AuthType = 'auth_type';
+
+    /** @var string 地址前缀 */
+    const Prefix = 'prefix';
 }

app/Enums/Watermark/Mode.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Enums\Watermark;
+
+final class Mode
+{
+    const Overlay = 1; // 覆盖原图
+    const Dynamic = 2; // 动态生成
+}

app/Http/Controllers/Admin/ConsoleController.php

@@ -18,10 +18,10 @@ class ConsoleController extends Controller
         $format = 'Y-m-d H:i:s';
 
         $numbers = [
-            'today' => Image::query()->whereBetween('created_at', [$carbon->startOfDay()->format($format), $carbon->endOfDay()->format($format)])->count('id'),
+            'today' => Image::query()->whereBetween('created_at', [$carbon->startOfDay()->format($format), $carbon->endOfDay()->format($format)])->count(),
-            'yesterday' => Image::query()->whereBetween('created_at', [$carbon->yesterday()->startOfDay()->format($format), $carbon->yesterday()->endOfDay()->format($format)])->count('id'),
+            'yesterday' => Image::query()->whereBetween('created_at', [$carbon->yesterday()->startOfDay()->format($format), $carbon->yesterday()->endOfDay()->format($format)])->count(),
-            'week' => Image::query()->whereBetween('created_at', [$carbon->startOfWeek()->format($format), $carbon->endOfWeek()->format($format)])->count('id'),
+            'week' => Image::query()->whereBetween('created_at', [$carbon->startOfWeek()->format($format), $carbon->endOfWeek()->format($format)])->count(),
-            'month' => Image::query()->whereBetween('created_at', [$carbon->startOfMonth()->format($format), $carbon->endOfMonth()->format($format)])->count('id'),
+            'month' => Image::query()->whereBetween('created_at', [$carbon->startOfMonth()->format($format), $carbon->endOfMonth()->format($format)])->count(),
         ];
 
         $start = Carbon::now()->parse('-30 day')->startOfDay();

app/Http/Controllers/Admin/ImageController.php

@@ -39,8 +39,8 @@ class ImageController extends Controller
                     'is:guest' => $builder->whereNull('user_id'),
                     'is:adminer' => $builder->whereHas('user', fn (Builder $builder) => $builder->where('is_adminer', 1)),
                     'order:earliest' => $builder->orderBy('created_at'),
-                    'order:utmost' => $builder->orderBy('size'),
+                    'order:utmost' => $builder->orderByDesc('size'),
-                    'order:least' => $builder->orderByDesc('size'),
+                    'order:least' => $builder->orderBy('size'),
                     default => 0,
                 };
 
@@ -64,7 +64,9 @@ class ImageController extends Controller
             });
 
             foreach ($words as $word) {
-                $builder->where('origin_name', 'like', "%{$word}%")->orWhere('alias_name', 'like', "%{$word}%");
+                $builder->where('name', 'like', "%{$word}%")
+                    ->orWhere('origin_name', 'like', "%{$word}%")
+                    ->orWhere('alias_name', 'like', "%{$word}%");
             }
         })->latest()->paginate(40);
         $images->getCollection()->each(function (Image $image) {

app/Http/Controllers/Auth/RegisteredUserController.php

@@ -45,6 +45,7 @@ class RegisteredUserController extends Controller
             'name' => $request->name,
             'email' => $request->email,
             'password' => Hash::make($request->password),
+            'registered_ip' => $request->ip(),
         ]);
 
         if (Utils::config(ConfigKey::IsUserNeedVerify)) {

app/Http/Controllers/Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Enums\GroupConfigKey;
 use App\Enums\UserStatus;
+use App\Enums\Watermark\Mode;
 use App\Exceptions\UploadException;
 use App\Http\Result;
 use App\Models\Group;
@@ -158,10 +159,16 @@ class Controller extends BaseController
                 $contents = Cache::get($cacheKey);
             } else {
                 $contents = $image->filesystem()->read($image->pathname);
+                $configs = collect($image->group?->configs->get(GroupConfigKey::WatermarkConfigs));
+
                 // 是否启用了水印功能，跳过gif和ico图片
-                if ($image->group?->configs->get(GroupConfigKey::IsEnableWatermark) && ! in_array($image->extension, ['ico', 'gif'])) {
+                if (
-                    $configs = $image->group?->configs->get(GroupConfigKey::WatermarkConfigs);
+                    $image->group?->configs->get(GroupConfigKey::IsEnableWatermark) &&
-                    $contents = $service->stickWatermark($contents, collect($configs))->encode()->getEncoded();
+                    $configs->get('mode', Mode::Overlay) == Mode::Dynamic &&
+                    ! in_array($image->extension, ['ico', 'gif', 'svg'])
+                ) {
+                    $quality = $image->group?->configs->get(GroupConfigKey::ImageSaveQuality, 75);
+                    $contents = $service->stickWatermark($contents, $configs)->encode($image->extension, $quality)->getEncoded();
                 }
                 $cacheTtl = (int)$image->group?->configs->get(GroupConfigKey::ImageCacheTtl, 0);
                 // 是否启用了缓存
@@ -178,8 +185,8 @@ class Controller extends BaseController
 
         $mimetype = $image->mimetype;
 
-        // ico 图片直接输出，不经过 InterventionImage 处理
+        // ico svg 图片直接输出，不经过 InterventionImage 处理
-        if ($image->extension === 'ico') {
+        if (in_array($image->extension, ['ico', 'svg'])) {
             goto out;
         }
 

app/Http/Requests/Admin/GroupRequest.php

@@ -34,9 +34,11 @@ class GroupRequest extends FormRequest
             'configs.limit_per_day' => 'required|integer',
             'configs.limit_per_week' => 'required|integer',
             'configs.limit_per_month' => 'required|integer',
+            'configs.image_save_quality' => 'required|min:1|max:100',
+            'configs.image_save_format' => '',
             'configs.path_naming_rule' => 'max:400',
             'configs.file_naming_rule' => 'max:400',
-            'configs.accepted_file_suffixes' => 'required|array|in:jpeg,jpg,png,gif,tif,bmp,ico,psd,webp',
+            'configs.accepted_file_suffixes' => 'required|array|in:jpeg,jpg,png,gif,tif,bmp,ico,psd,webp,svg',
 
             'configs.is_enable_scan' => 'boolean',
             'configs.scanned_action' => [
@@ -64,6 +66,7 @@ class GroupRequest extends FormRequest
             'configs.image_cache_ttl' => 'nullable|numeric',
 
             'configs.is_enable_watermark' => 'boolean',
+            'configs.watermark_configs.mode' => ['in:1,2'],
             'configs.watermark_configs.driver' => ['exclude_if:configs.is_enable_watermark,false', 'in:font,image'],
             'configs.watermark_configs.drivers.font.font' => [
                 $requiredIfWatermark('font'),
@@ -115,6 +118,8 @@ class GroupRequest extends FormRequest
             'configs.limit_per_month' => '每月上传限制',
             'configs.path_naming_rule' => '路径命名规则',
             'configs.file_naming_rule' => '文件命名规则',
+            'configs.image_save_quality' => '图片保存质量',
+            'configs.image_save_format' => '图片保存格式',
             'configs.accepted_file_suffixes' => '允许上传的文件后缀',
 
             'configs.is_enable_scan' => '是否启用图片审核',

app/Http/Requests/Admin/StrategyRequest.php

@@ -54,6 +54,7 @@ class StrategyRequest extends FormRequest
             'intro' => 'max:2000',
             'key' => 'required|integer',
             'configs.url' => ['required', 'url'],
+            'configs.queries' => '',
         ];
 
         return array_merge($array, match((int)$this->input('key')) {
@@ -123,6 +124,8 @@ class StrategyRequest extends FormRequest
                 'configs.base_uri' => 'required',
                 'configs.username' => '',
                 'configs.password' => '',
+                'configs.auth_type' => '',
+                'configs.prefix' => '',
             ],
             StrategyKey::Minio => [
                 'configs.access_key' => 'required',
@@ -130,6 +133,7 @@ class StrategyRequest extends FormRequest
                 'configs.endpoint' => '',
                 'configs.region' => '',
                 'configs.bucket' => 'required',
+                'configs.bucket_endpoint' => '',
             ],
         });
     }
@@ -141,6 +145,7 @@ class StrategyRequest extends FormRequest
             'intro' => '简介',
             'key' => '策略',
             'configs.url' => '访问网址',
+            'configs.queries' => 'Url 额外参数',
         ];
 
         return array_merge($array, match((int)$this->input('key')) {
@@ -197,9 +202,11 @@ class StrategyRequest extends FormRequest
                 'configs.passive' => '被动模式',
             ],
             StrategyKey::Webdav => [
-                'configs.base_uri' => 'required',
+                'configs.base_uri' => '连接地址',
-                'configs.username' => 'required',
+                'configs.username' => '用户名',
-                'configs.password' => 'required',
+                'configs.password' => '密码',
+                'configs.auth_type' => '认证方式',
+                'configs.prefix' => '前缀',
             ],
             StrategyKey::Minio => [
                 'configs.access_key' => 'AccessKey',
@@ -207,6 +214,7 @@ class StrategyRequest extends FormRequest
                 'configs.endpoint' => '连接地址',
                 'configs.region' => '区域',
                 'configs.bucket' => 'Bucket 名称',
+                'configs.bucket_endpoint' => 'BucketEndpoint',
             ],
         });
     }

app/Http/Requests/AlbumRequest.php

@@ -12,7 +12,7 @@ class AlbumRequest extends FormRequest
     public function rules()
     {
         return [
-            'name' => 'required|max:60',
+            'name' => 'required|max:60|alpha_dash',
             'intro' => 'max:600'
         ];
     }
@@ -22,6 +22,7 @@ class AlbumRequest extends FormRequest
         return [
             'name.required' => '名称不能为空',
             'name.max' => '名称字符过长，最大不能超过 60',
+            'name.alpha_dash' => '名称只能是字母、数字，短破折号（-）和下划线（_）',
             'intro.max' => '简介字符过长，最大不能超过 600'
         ];
     }

app/Http/Requests/ImageRenameRequest.php

@@ -34,7 +34,7 @@ class ImageRenameRequest extends FormRequest
             'id.numeric' => '图片选择异常',
             'name.required' => '请输入名称',
             'name.max' => '名称长度不能超过 50 个字符',
-            'name.string' => '名称格式不正确'
+            'name.string' => '名称格式不正确',
         ];
     }
 }

app/Http/Requests/UserSettingRequest.php

@@ -30,7 +30,7 @@ class UserSettingRequest extends FormRequest
             'name.required' => '昵称不能为空',
             'name.between' => '昵称必须在 2-20 个字符之间',
             'url.url' => '个人主页地址格式不正确',
-            'password.between' => '昵称必须在 6-32 个字符之间',
+            'password.between' => '密码必须在 6-32 个字符之间',
             'configs.array' => '配置值不正确',
             'configs.default_album.required' => '默认相册选择错误',
             'configs.default_album.numeric' => '默认相册选择错误',

app/Models/Image.php

@@ -174,10 +174,13 @@ class Image extends Model
         return new Attribute(function () {
             // 是否启用原图保护功能
             if ($this->group?->configs->get(GroupConfigKey::IsEnableOriginalProtection)) {
-                return asset("{$this->key}.{$this->extension}");
+                $url = asset("{$this->key}.{$this->extension}");
             } else {
-                return rtrim($this->strategy?->configs->get('url'), '/').'/'.ltrim($this->pathname, '/');
+                $url = rtrim($this->strategy?->configs->get('url'), '/').'/'.ltrim($this->pathname, '/');
             }
+
+            // 拼接图片 url
+            return $url.($this->strategy?->configs->get('queries') ?: '');
         });
     }
 
@@ -237,7 +240,7 @@ class Image extends Model
 
     public function getThumbnailPathname(): string
     {
-        return trim(config('app.thumbnail_path'), '/')."/{$this->md5}.png";
+        return trim(config('app.thumbnail_path'), '/')."/{$this->md5}.". ($this->extension === 'svg' ? 'svg' : "png");
     }
 
     private function generateKey($length = 6): string

app/Models/Strategy.php

@@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Carbon;
+use Sabre\DAV\Client;
 
 /**
  * @property int $id
@@ -56,6 +57,13 @@ class Strategy extends Model
         StrategyKey::Minio => 'Minio',
     ];
 
+    const WEBDAV_AUTH_TYPES = [
+        '' => 'Auto',
+        Client::AUTH_BASIC => 'Basic',
+        Client::AUTH_DIGEST => 'Digest',
+        Client::AUTH_NTLM => 'Ntlm',
+    ];
+
     protected static function booted()
     {
         static::saving(function (self $strategy) {

app/Providers/AppServiceProvider.php

@@ -46,7 +46,10 @@ class AppServiceProvider extends ServiceProvider
             View::composer('*', function (\Illuminate\View\View $view) {
                 /** @var Group $group */
                 $group = Auth::check() ? Auth::user()->group : Group::query()->where('is_guest', true)->first();
-                $view->with('_group', $group);
+                $view->with([
+                    '_group' => $group,
+                    '_is_notice' => strip_tags(Utils::config(ConfigKey::SiteNotice)),
+                ]);
             });
         }
     }

app/Services/ImageService.php

@@ -25,6 +25,7 @@ use App\Enums\UserConfigKey;
 use App\Enums\UserStatus;
 use App\Enums\Watermark\FontOption;
 use App\Enums\Watermark\ImageOption;
+use App\Enums\Watermark\Mode;
 use App\Exceptions\UploadException;
 use App\Models\Group;
 use App\Models\Image;
@@ -51,8 +52,8 @@ use League\Flysystem\FilesystemException;
 use League\Flysystem\Ftp\FtpAdapter;
 use League\Flysystem\Ftp\FtpConnectionOptions;
 use League\Flysystem\Local\LocalFilesystemAdapter;
-use League\Flysystem\PhpseclibV2\SftpAdapter;
+use League\Flysystem\PhpseclibV3\SftpAdapter;
-use League\Flysystem\PhpseclibV2\SftpConnectionProvider;
+use League\Flysystem\PhpseclibV3\SftpConnectionProvider;
 use League\Flysystem\WebDAV\WebDAVAdapter;
 use Overtrue\Flysystem\Cos\CosAdapter;
 use Overtrue\Flysystem\Qiniu\QiniuAdapter;
@@ -150,6 +151,34 @@ class ImageService
         // 上传频率限制
         $this->rateLimiter($configs, $request);
 
+        // 图片处理，跳过 ico gif svg
+        if (! in_array($extension, ['ico', 'gif', 'svg'])) {
+            // 图片保存质量与格式
+            $quality = $configs->get(GroupConfigKey::ImageSaveQuality, 75);
+            $format = $configs->get(GroupConfigKey::ImageSaveFormat);
+            if ($quality < 100 || $format) {
+                // 获取拓展名，判断是否需要转换
+                $format = $format ?: $extension;
+                $filename = Str::replaceLast($extension, $format, $file->getClientOriginalName());
+                $handleImage = InterventionImage::make($file)->save('tmp_' . md5_file($file->getRealPath()), $quality);
+                $file = new UploadedFile($handleImage->basePath(), $filename, $handleImage->mime());
+                // 重新设置拓展名
+                $extension = $format;
+                $handleImage->destroy();
+            }
+
+            // 是否启用水印，覆盖原图片
+            if (
+                $configs->get(GroupConfigKey::IsEnableWatermark) &&
+                collect($configs->get(GroupConfigKey::WatermarkConfigs))->get('mode', Mode::Overlay) == Mode::Overlay
+            ) {
+                $watermarkImage = $this->stickWatermark($file, collect($configs->get(GroupConfigKey::WatermarkConfigs)));
+                $watermarkImage->save();
+                $file = new UploadedFile($watermarkImage->basePath(), $file->getClientOriginalName(), $file->getMimeType());
+                $watermarkImage->destroy();
+            }
+        }
+
         $filename = $this->replacePathname(
             $configs->get(GroupConfigKey::PathNamingRule).'/'.$configs->get(GroupConfigKey::FileNamingRule), $file,
         );
@@ -216,8 +245,8 @@ class ImageService
             throw new UploadException('图片记录保存失败');
         }
 
-        // 图片检测，跳过 tif、ico 以及 psd 格式
+        // 图片检测，跳过 tif、ico、psd、svg 格式
-        if ($configs->get(GroupConfigKey::IsEnableScan) && ! in_array($extension, ['psd', 'ico', 'tif'])) {
+        if ($configs->get(GroupConfigKey::IsEnableScan) && ! in_array($extension, ['psd', 'ico', 'tif', 'svg'])) {
             $scanConfigs = $configs->get(GroupConfigKey::ScanConfigs);
             if ($this->scan(
                 driver: $scanConfigs['driver'],
@@ -237,9 +266,11 @@ class ImageService
             }
         }
 
-        // 生成缩略图
         $this->makeThumbnail($image, $file);
 
+        // 上传完成后删除临时文件
+        unlink($file->getPathname());
+
         return $image;
     }
 
@@ -263,10 +294,10 @@ class ImageService
                 bucket: $configs->get(S3Option::Bucket),
             ),
             StrategyKey::Oss => new OssAdapter(
-                client: new OssClient(
+                client: new OssClient($configs->get(
-                    accessKeyId: $configs->get(OssOption::AccessKeyId),
+                    OssOption::AccessKeyId),
-                    accessKeySecret: $configs->get(OssOption::AccessKeySecret),
+                    $configs->get(OssOption::AccessKeySecret),
-                    endpoint: $configs->get(OssOption::Endpoint),
+                    $configs->get(OssOption::Endpoint),
                 ),
                 bucket: $configs->get(OssOption::Bucket),
             ),
@@ -309,11 +340,12 @@ class ImageService
                     'timeout' => 30,
                 ]),
             ),
-            StrategyKey::Webdav => new WebDAVAdapter(new Client([
+            StrategyKey::Webdav => new WebDAVAdapter(new Client(([
                 'baseUri' => $configs->get(WebDavOption::BaseUri),
                 'userName' => $configs->get(WebDavOption::Username),
-                'password' => $configs->get(WebDavOption::Password)
+                'password' => $configs->get(WebDavOption::Password),
-            ])),
+                'authType' => (int)$configs->get(WebDavOption::AuthType),
+            ])), $configs->get(WebDavOption::Prefix) ?: ''),
             StrategyKey::Minio => new AwsS3V3Adapter(
                 client: new S3Client([
                     'credentials' => [
@@ -323,6 +355,7 @@ class ImageService
                     'endpoint' => $configs->get(MinioOption::Endpoint),
                     'region' => $configs->get(MinioOption::Region),
                     'version' => '2006-03-01',
+                    'bucket_endpoint' => (bool)$configs->get(MinioOption::BucketEndpoint),
                 ]),
                 bucket: $configs->get(MinioOption::Bucket),
             ),
@@ -342,7 +375,7 @@ class ImageService
             'hours' => ['key' => GroupConfigKey::LimitPerHour, 'str' => '小时'],
             'days' => ['key' => GroupConfigKey::LimitPerDay, 'str' => '天'],
             'weeks' => ['key' => GroupConfigKey::LimitPerWeek, 'str' => '周'],
-            'months' => ['key' => GroupConfigKey::LimitPerWeek, 'str' => '月'],
+            'months' => ['key' => GroupConfigKey::LimitPerMonth, 'str' => '月'],
         ];
 
         foreach ($array as $key => $item) {
@@ -524,21 +557,26 @@ class ImageService
                     @mkdir(dirname($pathname));
                 }
 
-                @ini_set('memory_limit', '512M');
+                // 生成缩略图，svg等格式本身体积足够小且网页原生支持(比生成的png缩略图还小)，不用生成缩略图，直接复制文件
+                if($image->extension ==='svg') {
+                    copy($data->getPathname(), $pathname);
+                }else{
+                    @ini_set('memory_limit', '512M');
 
-                $img = InterventionImage::make($data);
+                    $img = InterventionImage::make($data);
 
-                $width = $w = $image->width;
+                    $width = $w = $image->width;
-                $height = $h = $image->height;
+                    $height = $h = $image->height;
 
-                if ($w > $max && $h > $max) {
+                    if ($w > $max && $h > $max) {
-                    $scale = min($max / $w, $max / $h);
+                        $scale = min($max / $w, $max / $h);
-                    $width  = (int)($w * $scale);
+                        $width  = (int)($w * $scale);
-                    $height = (int)($h * $scale);
+                        $height = (int)($h * $scale);
+                    }
+
+                    $img->fit($width, $height, fn($constraint) => $constraint->upsize())->encode('png', 60)->save($pathname);
+                    $img->destroy();
                 }
-
-                $img->fit($width, $height, fn($constraint) => $constraint->upsize())->encode('png')->save($pathname);
-
             } catch (\Throwable $e) {
                 Utils::e($e, '生成缩略图时出现异常');
             }
@@ -606,7 +644,7 @@ class ImageService
             '{md5-16}' => substr(md5(microtime().Str::random()), 0, 16),
             '{str-random-16}' => Str::random(),
             '{str-random-10}' => Str::random(10),
-            '{filename}' => rtrim($file->getClientOriginalName(), '.'.$file->getClientOriginalExtension()),
+            '{filename}' => Str::replaceLast('.'.$file->getClientOriginalExtension(), '', $file->getClientOriginalName()),
             '{uid}' => Auth::check() ? Auth::id() : 0,
         ];
         return str_replace(array_keys($array), array_values($array), $pathname);

app/Services/UpgradeService.php

@@ -115,13 +115,9 @@ class UpgradeService
             $version = $this->getVersions()->first()['name'];
             Config::query()->where('name', ConfigKey::AppVersion)->update(['value' => $version]);
             // 执行数据库迁移
-            Artisan::call('migrate');
+            Artisan::call('migrate', ['--seed' => true]);
-            // 清除配置缓存
-            Cache::forget('configs');
             // 清除缓存
-            Artisan::call('route:clear');
+            Artisan::call('optimize:clear');
-            Artisan::call('cache:clear');
-            Artisan::call('view:clear');
             Artisan::call('package:discover');
         } catch (\Throwable $e) {
             Utils::e($e, '升级失败');

app/Utils.php

@@ -147,7 +147,7 @@ class Utils
     {
         foreach ($array as &$value) {
             if (is_array($value)) {
-                $value = self::filter($value);
+                $value = self::filter($value, $callback, $mode);
             }
         }
         return array_filter($array, $callback, $mode);

composer.json

@@ -20,7 +20,7 @@
         "laravel/tinker": "^2.7",
         "league/flysystem-aws-s3-v3": "^3.0",
         "league/flysystem-ftp": "^3.0",
-        "league/flysystem-sftp": "^3.0",
+        "league/flysystem-sftp-v3": "^3.0",
         "league/flysystem-webdav": "^3.0",
         "overtrue/flysystem-cos": "^5.0",
         "overtrue/flysystem-qiniu": "^3.0",

config/convention.php

@@ -13,11 +13,12 @@ use App\Enums\Scan\TencentOption;
 use App\Enums\UserConfigKey;
 use App\Enums\Watermark\FontOption;
 use App\Enums\Watermark\ImageOption;
+use App\Enums\Watermark\Mode;
 
 return [
     'app' => [
         ConfigKey::AppName => 'Lsky Pro',
-        ConfigKey::AppVersion => 'V 2.0.4',
+        ConfigKey::AppVersion => 'V 2.1',
         ConfigKey::SiteKeywords => 'Lsky Pro,lsky,兰空图床',
         ConfigKey::SiteDescription => 'Lsky Pro, Your photo album on the cloud.',
         ConfigKey::SiteNotice => '',
@@ -75,6 +76,7 @@ return [
             ],
         ],
         GroupConfigKey::WatermarkConfigs => [
+            'mode' => Mode::Overlay,
             'driver' => 'font',
             'drivers' => [
                 'font' => [
@@ -104,7 +106,9 @@ return [
         GroupConfigKey::LimitPerDay => 300,
         GroupConfigKey::LimitPerWeek => 600,
         GroupConfigKey::LimitPerMonth => 999,
-        GroupConfigKey::AcceptedFileSuffixes => ['jpeg', 'jpg', 'png', 'gif', 'tif', 'bmp', 'ico', 'psd', 'webp'],
+        GroupConfigKey::AcceptedFileSuffixes => ['jpeg', 'jpg', 'png', 'gif', 'tif', 'bmp', 'ico', 'psd', 'webp', 'svg'],
+        GroupConfigKey::ImageSaveFormat => '',
+        GroupConfigKey::ImageSaveQuality => 75,
         GroupConfigKey::PathNamingRule => '{Y}/{m}/{d}',
         GroupConfigKey::FileNamingRule => '{uniqid}',
         GroupConfigKey::ImageCacheTtl => 2626560,

database/migrations/2022_04_27_153631_update_images_table.php

@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('images', function (Blueprint $table) {
-            $table->index('key');
-            $table->index('md5');
-            $table->index('sha1');
-            $table->index('created_at');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('images', function (Blueprint $table) {
-            $table->dropIndex('images_key_index');
-            $table->dropIndex('images_md5_index');
-            $table->dropIndex('images_sha1_index');
-            $table->dropIndex('images_created_at_index');
-        });
-    }
-};

database/seeders/DatabaseSeeder.php

@@ -2,6 +2,7 @@
 
 namespace Database\Seeders;
 
+use App\Models\Config;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
@@ -13,6 +14,10 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        // $this->call([]);
+        // 初始化系统默认配置
+        foreach (config('convention.app') as $key => $value) {
+            $content = is_array($value) ? json_encode($value, JSON_UNESCAPED_UNICODE) : $value;
+            Config::query()->firstOrCreate(['name' => $key], ['value' => $content]);
+        }
     }
 }

database/seeders/InstallSeeder.php

@@ -2,7 +2,6 @@
 
 namespace Database\Seeders;
 
-use App\Enums\ConfigKey;
 use App\Enums\StrategyKey;
 use App\Models\Group;
 use Illuminate\Database\Seeder;

package.json

@@ -14,7 +14,7 @@
         "@tailwindcss/forms": "^0.4.0",
         "alpinejs": "^3.4.2",
         "autoprefixer": "^10.1.0",
-        "axios": "^0.25",
+        "axios": "^1.8",
         "blueimp-canvas-to-blob": "^3.29.0",
         "blueimp-file-upload": "^10.32.0",
         "blueimp-load-image": "^5.16.0",
@@ -33,7 +33,7 @@
         "less-loader": "^10.2.0",
         "lodash": "^4.17.19",
         "masonry-layout": "^4.2.2",
-        "postcss": "^8.2.1",
+        "postcss": "^8.4.31",
         "postcss-import": "^14.0.1",
         "resolve-url-loader": "^4.0.0",
         "sweetalert2": "^11.3.3",

resources/js/app.js

@@ -56,7 +56,7 @@ window.utils = {
             || navigator.userAgent.match(/BlackBerry/i)
             || navigator.userAgent.match(/Windows Phone/i)
         ) {
-            return true;
+            return window.screen.width < 768;
         }
         return false;
     },

resources/views/admin/group/add.blade.php

@@ -79,6 +79,21 @@
                                 <x-input type="text" name="configs[file_naming_rule]" id="file_naming_rule" autocomplete="file_naming_rule" placeholder="请输入文件命名规则" value="{{ $default->get('file_naming_rule') }}" />
                             </div>
 
+                            <div class="col-span-6 sm:col-span-3">
+                                <label for="image_save_quality" class="block text-sm font-medium text-gray-700">图片保存质量</label>
+                                <x-input type="number" name="configs[image_save_quality]" id="image_save_quality" autocomplete="path_naming_rule" placeholder="请输入图片保存质量" value="{{ $default->get('image_save_quality', 100) }}" />
+                            </div>
+
+                            <div class="col-span-6 sm:col-span-3">
+                                <label for="image_save_format" class="block text-sm font-medium text-gray-700">图片转换格式</label>
+                                <x-select id="configs[image_save_format]" name="configs[image_save_format]" autocomplete="image_save_format">
+                                    <option value="">不转换格式</option>
+                                    @foreach($default->get('accepted_file_suffixes') as $extension)
+                                        <option value="{{ strtolower($extension) }}">{{ strtoupper($extension) }}</option>
+                                    @endforeach
+                                </x-select>
+                            </div>
+
                             <div class="col-span-6">
                                 <x-fieldset title="是否默认" faq="设置默认后，新用户注册以后将会属于该默认角色组，且默认组只能有一个。">
                                     <x-switch id="is_default" name="is_default" value="1"></x-switch>
@@ -204,9 +219,15 @@
                         <div data-tab="watermark" class="hidden grid grid-cols-6 gap-6">
                             <p class="mb-3 text-red-600 text-sm"><i class="fas fa-exclamation"></i> 开启水印功能前请注意考虑图片版权问题。</p>
                             <div class="col-span-6 mb-4">
-                                <x-fieldset title="开启水印" faq="请注意，水印功能仅在开启了「原图保护」功能的情况下生效。">
+                                <x-fieldset title="开启水印" faq="请注意，水印模式为动态生成时，仅在开启了「原图保护」功能的情况下生效。">
                                     <x-switch id="configs[is_enable_watermark]" name="configs[is_enable_watermark]" value="1"></x-switch>
                                 </x-fieldset>
+                                <div class="col-span-6 mt-4 mb-4">
+                                    <x-fieldset title="水印模式">
+                                        <x-fieldset-radio id="configs[watermark_configs][mode]_overlay" name="configs[watermark_configs][mode]" value="{{ \App\Enums\Watermark\Mode::Overlay }}" checked>覆盖原图</x-fieldset-radio>
+                                        <x-fieldset-radio id="configs[watermark_configs][mode]_dynamic" name="configs[watermark_configs][mode]" value="{{ \App\Enums\Watermark\Mode::Dynamic }}">动态生成</x-fieldset-radio>
+                                    </x-fieldset>
+                                </div>
                                 <div class="col-span-6 mt-4 mb-4">
                                     <x-fieldset title="水印类型">
                                         <x-fieldset-radio id="configs[watermark_configs][driver]_font" name="configs[watermark_configs][driver]" data-select="watermark" value="font" checked>文字水印</x-fieldset-radio>
@@ -256,7 +277,7 @@
                                     <div class="col-span-6 sm:col-span-3 mb-4">
                                         <label for="configs[watermark_configs][drivers][image][image]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>水印图片</label>
                                         <x-input type="text" name="configs[watermark_configs][drivers][image][image]" id="configs[watermark_configs][drivers][image][image]" autocomplete="image" placeholder="请输入水印路径，例如：images/lsky.png" />
-                                        <small class="text-yellow-500">请将水印图片放置 {{ public_path() }} 目录下</small>
+                                        <small class="text-yellow-500">请将水印图片放置 {{ storage_path('app/public') }} 目录下</small>
                                     </div>
                                     <div class="col-span-6 sm:col-span-3 mb-4">
                                         <label for="configs[watermark_configs][drivers][image][position]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>水印位置</label>

resources/views/admin/group/edit.blade.php

@@ -75,6 +75,21 @@
                                 <x-input type="text" name="configs[file_naming_rule]" id="file_naming_rule" autocomplete="file_naming_rule" placeholder="请输入文件命名规则" value="{{ $group->configs->get('file_naming_rule') }}" />
                             </div>
 
+                            <div class="col-span-6 sm:col-span-3">
+                                <label for="image_save_quality" class="block text-sm font-medium text-gray-700">图片保存质量</label>
+                                <x-input type="number" name="configs[image_save_quality]" id="image_save_quality" autocomplete="path_naming_rule" placeholder="请输入图片保存质量" value="{{ $group->configs->get('image_save_quality', 100) }}" />
+                            </div>
+
+                            <div class="col-span-6 sm:col-span-3">
+                                <label for="image_save_format" class="block text-sm font-medium text-gray-700">图片转换格式</label>
+                                <x-select id="configs[image_save_format]" name="configs[image_save_format]" autocomplete="image_save_format">
+                                    <option value="">不转换格式</option>
+                                    @foreach($default->get('accepted_file_suffixes') as $extension)
+                                        <option value="{{ strtolower($extension) }}" @selected($group->configs->get('image_save_format') === $extension)>{{ strtoupper($extension) }}</option>
+                                    @endforeach
+                                </x-select>
+                            </div>
+
                             <div class="col-span-6">
                                 <x-fieldset title="是否默认" faq="设置默认后，新用户注册以后将会属于该默认角色组，且默认组只能有一个。">
                                     <x-switch id="is_default" name="is_default" value="1" :checked="(bool)$group->is_default"></x-switch>
@@ -204,9 +219,15 @@
                         <div data-tab="watermark" class="hidden grid grid-cols-6 gap-6">
                             <p class="mb-3 text-red-600 text-sm"><i class="fas fa-exclamation"></i> 开启水印功能前请注意考虑图片版权问题。</p>
                             <div class="col-span-6 mb-4">
-                                <x-fieldset title="开启水印" faq="请注意，水印功能仅在开启了「原图保护」功能的情况下生效。">
+                                <x-fieldset title="开启水印" faq="请注意，水印模式为动态生成时，仅在开启了「原图保护」功能的情况下生效。">
                                     <x-switch id="configs[is_enable_watermark]" name="configs[is_enable_watermark]" value="1" :checked="(bool)$group->configs->get('is_enable_watermark')"></x-switch>
                                 </x-fieldset>
+                                <div class="col-span-6 mt-4 mb-4">
+                                    <x-fieldset title="水印模式">
+                                        <x-fieldset-radio id="configs[watermark_configs][mode]_overlay" name="configs[watermark_configs][mode]" value="{{ \App\Enums\Watermark\Mode::Overlay }}" :checked="($group->configs['watermark_configs']['mode'] ?? '') == \App\Enums\Watermark\Mode::Overlay">覆盖原图</x-fieldset-radio>
+                                        <x-fieldset-radio id="configs[watermark_configs][mode]_dynamic" name="configs[watermark_configs][mode]" value="{{ \App\Enums\Watermark\Mode::Dynamic }}" :checked="($group->configs['watermark_configs']['mode'] ?? '') == \App\Enums\Watermark\Mode::Dynamic">动态生成</x-fieldset-radio>
+                                    </x-fieldset>
+                                </div>
                                 <div class="col-span-6 mt-4 mb-4">
                                     <x-fieldset title="水印类型">
                                         <x-fieldset-radio id="configs[watermark_configs][driver]_font" name="configs[watermark_configs][driver]" data-select="watermark" value="font" :checked="($group->configs['watermark_configs']['driver'] ?? '') === 'font'">文字水印</x-fieldset-radio>
@@ -256,7 +277,7 @@
                                     <div class="col-span-6 sm:col-span-3 mb-4">
                                         <label for="configs[watermark_configs][drivers][image][image]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>水印图片</label>
                                         <x-input type="text" name="configs[watermark_configs][drivers][image][image]" id="configs[watermark_configs][drivers][image][image]" autocomplete="image" placeholder="请输入水印路径，例如：images/lsky.png" value="{{ $group->configs['watermark_configs']['drivers']['image']['image'] ?? '' }}" />
-                                        <small class="text-yellow-500">请将水印图片放置 {{ public_path() }} 目录下</small>
+                                        <small class="text-yellow-500">请将水印图片放置 {{ storage_path('app/public') }} 目录下</small>
                                     </div>
                                     <div class="col-span-6 sm:col-span-3 mb-4">
                                         <label for="configs[watermark_configs][drivers][image][position]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>水印位置</label>

resources/views/admin/image/index.blade.php

@@ -194,8 +194,8 @@
             </dl>
             <dl>
                 <div class="bg-gray-50 px-2 py-3 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                    <dt class="text-sm font-medium text-gray-500">剩余容量</dt>
+                    <dt class="text-sm font-medium text-gray-500">已用容量</dt>
-                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2 truncate">__surplus_capacity__</dd>
+                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2 truncate">__used_capacity__</dd>
                 </div>
             </dl>
             <dl>
@@ -389,7 +389,7 @@
                     .replace(/__name__/g, user.name)
                     .replace(/__email__/g, user.email)
                     .replace(/__capacity__/g, utils.formatSize(user.capacity * 1024))
-                    .replace(/__surplus_capacity__/g, utils.formatSize(user.images_sum_size * 1024))
+                    .replace(/__used_capacity__/g, utils.formatSize(user.images_sum_size * 1024))
                     .replace(/__image_num__/g, user.image_num)
                     .replace(/__album_num__/g, user.album_num)
                     .replace(/__registered_ip__/g, user.registered_ip || '-')

resources/views/admin/strategy/add.blade.php

@@ -46,6 +46,10 @@
                                     本地储存的访问网址必须有根路径，例如：https://www.lsky.pro/uploads 中的 uploads 就是根路径，且根路径不能和其他策略重复。修改根路径直接影响已经上传并已使用的链接的访问。
                                 </small>
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" />
+                            </div>
                             <div class="col-span-6">
                                 <div class="col-span-6 sm:col-span-3 mb-4">
                                     <label for="configs[root]" class="block text-sm font-medium text-gray-700">储存路径</label>
@@ -60,6 +64,10 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[access_key_id]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AccessKeyId</label>
                                 <x-input type="text" name="configs[access_key_id]" id="configs[access_key_id]" placeholder="请输入 AccessKeyId" />
@@ -87,6 +95,10 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[access_key_id]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AccessKeyId</label>
                                 <x-input type="text" name="configs[access_key_id]" id="configs[access_key_id]" placeholder="请输入 AccessKeyId" />
@@ -110,6 +122,10 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[app_id]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AppId</label>
                                 <x-input type="text" name="configs[app_id]" id="configs[app_id]" placeholder="请输入 AppId" />
@@ -138,6 +154,10 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[access_key]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AccessKey</label>
                                 <x-input type="text" name="configs[access_key]" id="configs[access_key]" placeholder="请输入 AccessKey" />
@@ -157,6 +177,10 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[service]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>服务名称</label>
                                 <x-input type="text" name="configs[service]" id="configs[service]" placeholder="请输入服务名称" />
@@ -176,11 +200,13 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" />
                             </div>
-                            <div class="col-span-6">
+                            <div class="col-span-3 sm:col-span-2 mb-4">
-                                <div class="col-span-6 sm:col-span-3 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
-                                    <label for="configs[root]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>根目录</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" />
-                                    <x-input type="text" name="configs[root]" id="configs[root]" autocomplete="text" placeholder="请输入根目录路径" value="/" />
+                            </div>
-                                </div>
+                            <div class="col-span-6 sm:col-span-3 mb-4">
+                                <label for="configs[root]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>根目录</label>
+                                <x-input type="text" name="configs[root]" id="configs[root]" autocomplete="text" placeholder="请输入根目录路径" value="/" />
                             </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[host]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>主机地址</label>
@@ -222,11 +248,13 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" />
                             </div>
-                            <div class="col-span-6">
+                            <div class="col-span-3 sm:col-span-2 mb-4">
-                                <div class="col-span-6 sm:col-span-3 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
-                                    <label for="configs[root]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>根目录</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" />
-                                    <x-input type="text" name="configs[root]" id="configs[root]" autocomplete="text" placeholder="请输入根目录路径" value="/" />
+                            </div>
-                                </div>
+                            <div class="col-span-6 sm:col-span-3 mb-4">
+                                <label for="configs[root]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>根目录</label>
+                                <x-input type="text" name="configs[root]" id="configs[root]" autocomplete="text" placeholder="请输入根目录路径" value="/" />
                             </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[host]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>主机地址</label>
@@ -260,10 +288,26 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[base_uri]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>连接地址</label>
                                 <x-input type="url" name="configs[base_uri]" id="configs[base_uri]" placeholder="请输入连接地址" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="webdav-configs[auth_type]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>认证方式</label>
+                                <x-select id="webdav-auth-type" name="configs[auth_type]" select2>
+                                    @foreach(\App\Models\Strategy::WEBDAV_AUTH_TYPES as $key => $type)
+                                        <option value="{{ $key }}" {{ $loop->first ? 'selected' : '' }}>{{ $type }}</option>
+                                    @endforeach
+                                </x-select>
+                            </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="webdav-configs[prefix]" class="block text-sm font-medium text-gray-700">路径前缀</label>
+                                <x-input type="text" name="configs[prefix]" id="webdav-configs[prefix]" placeholder="请输入路径前缀"></x-input>
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[username]" class="block text-sm font-medium text-gray-700">用户名</label>
                                 <x-input type="text" name="configs[username]" id="configs[username]" placeholder="请输入用户名" />
@@ -279,6 +323,10 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[access_key]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AccessKey</label>
                                 <x-input type="text" name="configs[access_key]" id="configs[access_key]" placeholder="请输入 AccessKey" />
@@ -299,6 +347,11 @@
                                 <label for="configs[bucket]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>Bucket 名称</label>
                                 <x-input type="text" name="configs[bucket]" id="configs[bucket]" placeholder="请输入 Bucket 名称" />
                             </div>
+                            <div class="col-span-6">
+                                <label for="configs[bucket_endpoint]" class="block text-sm font-medium mb-2 text-gray-700">BucketEndpoint</label>
+                                <x-switch id="configs[bucket_endpoint]" name="configs[bucket_endpoint]" value="1"></x-switch>
+                                <p><small class="text-gray-500"><i class="fas fa-exclamation-circle"></i> 开启此选项后将会直接以「连接地址」作为数据交互传输域名，否则可能会以桶名称拼接域名(例如：http://桶名称.连接地址.com)</small></p>
+                            </div>
                         </div>
                     </div>
                     <div class="px-4 py-3 bg-gray-50 text-right sm:px-6">

resources/views/admin/strategy/edit.blade.php

@@ -50,6 +50,10 @@
                                     本地储存的访问网址必须有根路径，例如：https://www.lsky.pro/uploads 中的 uploads 就是根路径，且根路径不能和其他策略重复。修改根路径直接影响已经上传并已使用的链接的访问。
                                 </small>
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" value="{{ $strategy->configs->get('queries') }}" />
+                            </div>
                             <div class="col-span-6">
                                 <div class="col-span-6 sm:col-span-3 mb-4">
                                     <label for="configs[root]" class="block text-sm font-medium text-gray-700">储存路径</label>
@@ -66,6 +70,10 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" value="{{ $strategy->configs->get('url') }}" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" value="{{ $strategy->configs->get('queries') }}" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[access_key_id]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AccessKeyId</label>
                                 <x-input type="text" name="configs[access_key_id]" id="configs[access_key_id]" placeholder="请输入 AccessKeyId" value="{{ $strategy->configs->get('access_key_id') }}" />
@@ -95,6 +103,10 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" value="{{ $strategy->configs->get('url') }}" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" value="{{ $strategy->configs->get('queries') }}" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[access_key_id]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AccessKeyId</label>
                                 <x-input type="text" name="configs[access_key_id]" id="configs[access_key_id]" placeholder="请输入 AccessKeyId" value="{{ $strategy->configs->get('access_key_id') }}" />
@@ -120,6 +132,10 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" value="{{ $strategy->configs->get('url') }}" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" value="{{ $strategy->configs->get('queries') }}" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[app_id]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AppId</label>
                                 <x-input type="text" name="configs[app_id]" id="configs[app_id]" placeholder="请输入 AppId" value="{{ $strategy->configs->get('app_id') }}" />
@@ -150,6 +166,10 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" value="{{ $strategy->configs->get('url') }}" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" value="{{ $strategy->configs->get('queries') }}" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[access_key]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AccessKey</label>
                                 <x-input type="text" name="configs[access_key]" id="configs[access_key]" placeholder="请输入 AccessKey" value="{{ $strategy->configs->get('access_key') }}" />
@@ -171,6 +191,10 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" value="{{ $strategy->configs->get('url') }}" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" value="{{ $strategy->configs->get('queries') }}" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[service]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>服务名称</label>
                                 <x-input type="text" name="configs[service]" id="configs[service]" placeholder="请输入服务名称" value="{{ $strategy->configs->get('service') }}" />
@@ -192,11 +216,13 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" value="{{ $strategy->configs->get('url') }}" />
                             </div>
-                            <div class="col-span-6">
+                            <div class="col-span-3 sm:col-span-2 mb-4">
-                                <div class="col-span-6 sm:col-span-3 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
-                                    <label for="configs[root]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>根目录</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" value="{{ $strategy->configs->get('queries') }}" />
-                                    <x-input type="text" name="configs[root]" id="configs[root]" autocomplete="text" placeholder="请输入根目录路径" value="{{ $strategy->configs->get('root') }}" />
+                            </div>
-                                </div>
+                            <div class="col-span-6 sm:col-span-3 mb-4">
+                                <label for="configs[root]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>根目录</label>
+                                <x-input type="text" name="configs[root]" id="configs[root]" autocomplete="text" placeholder="请输入根目录路径" value="{{ $strategy->configs->get('root') }}" />
                             </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[host]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>主机地址</label>
@@ -240,11 +266,13 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" value="{{ $strategy->configs->get('url') }}" />
                             </div>
-                            <div class="col-span-6">
+                            <div class="col-span-3 sm:col-span-2 mb-4">
-                                <div class="col-span-6 sm:col-span-3 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
-                                    <label for="configs[root]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>根目录</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" value="{{ $strategy->configs->get('queries') }}" />
-                                    <x-input type="text" name="configs[root]" id="configs[root]" autocomplete="text" placeholder="请输入根目录路径" value="{{ $strategy->configs->get('root') }}" />
+                            </div>
-                                </div>
+                            <div class="col-span-6 sm:col-span-3 mb-4">
+                                <label for="configs[root]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>根目录</label>
+                                <x-input type="text" name="configs[root]" id="configs[root]" autocomplete="text" placeholder="请输入根目录路径" value="{{ $strategy->configs->get('root') }}" />
                             </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[host]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>主机地址</label>
@@ -280,10 +308,26 @@
                                 <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                 <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" value="{{ $strategy->configs->get('url') }}" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" value="{{ $strategy->configs->get('queries') }}" />
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[base_uri]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>连接地址</label>
                                 <x-input type="url" name="configs[base_uri]" id="configs[base_uri]" placeholder="请输入连接地址" value="{{ $strategy->configs->get('base_uri') }}" />
                             </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="webdav-configs[auth_type]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>认证方式</label>
+                                <x-select id="webdav-auth-type" name="configs[auth_type]" select2>
+                                    @foreach(\App\Models\Strategy::WEBDAV_AUTH_TYPES as $key => $type)
+                                        <option value="{{ $key }}" {{ $key == $strategy->configs->get('auth_type') ? 'selected' : '' }}>{{ $type }}</option>
+                                    @endforeach
+                                </x-select>
+                            </div>
+                            <div class="col-span-3 sm:col-span-2 mb-4">
+                                <label for="webdav-configs[prefix]" class="block text-sm font-medium text-gray-700">路径前缀</label>
+                                <x-input type="text" name="configs[prefix]" id="webdav-configs[prefix]" placeholder="请输入路径前缀" value="{{ $strategy->configs->get('prefix') }}"></x-input>
+                            </div>
                             <div class="col-span-3 sm:col-span-2 mb-4">
                                 <label for="configs[username]" class="block text-sm font-medium text-gray-700">用户名</label>
                                 <x-input type="text" name="configs[username]" id="configs[username]" placeholder="请输入用户名" value="{{ $strategy->configs->get('username') }}" />
@@ -301,6 +345,10 @@
                                     <label for="configs[url]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>访问域名</label>
                                     <x-input type="url" name="configs[url]" id="configs[url]" placeholder="请输入图片访问域名 http(s)://" value="{{ $strategy->configs->get('url') }}" />
                                 </div>
+                                <div class="col-span-3 sm:col-span-2 mb-4">
+                                    <label for="configs[queries]" class="block text-sm font-medium text-gray-700">URL Queries</label>
+                                    <x-input type="text" name="configs[queries]" id="configs[queries]" placeholder="请输入 url 额外参数" value="{{ $strategy->configs->get('queries') }}" />
+                                </div>
                                 <div class="col-span-3 sm:col-span-2 mb-4">
                                     <label for="configs[access_key]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>AccessKey</label>
                                     <x-input type="text" name="configs[access_key]" id="configs[access_key]" placeholder="请输入 AccessKey" value="{{ $strategy->configs->get('access_key') }}" />
@@ -321,6 +369,11 @@
                                     <label for="configs[bucket]" class="block text-sm font-medium text-gray-700"><span class="text-red-600">*</span>储存桶名称</label>
                                     <x-input type="text" name="configs[bucket]" id="configs[bucket]" placeholder="请输入 Bucket 名称" value="{{ $strategy->configs->get('bucket') }}" />
                                 </div>
+                                <div class="col-span-6">
+                                    <label for="configs[bucket_endpoint]" class="block text-sm font-medium mb-2 text-gray-700">BucketEndpoint</label>
+                                    <x-switch id="configs[bucket_endpoint]" name="configs[bucket_endpoint]" value="1" :checked="(bool)$strategy->configs->get('bucket_endpoint')"></x-switch>
+                                    <p><small class="text-gray-500"><i class="fas fa-exclamation-circle"></i> 开启此选项后将会直接以「连接地址」作为数据交互传输域名，否则可能会以桶名称拼接域名(例如：http://桶名称.连接地址.com)</small></p>
+                                </div>
                             </div>
                         @endif
                     </div>

resources/views/common/api.blade.php

@@ -12,7 +12,7 @@
             <div>
                 <p class="text-lg text-gray-700 font-semibold">验证方式</p>
                 <div class="my-2 text-sm bg-white rounded-md p-4 overflow-x-auto">
-                    当前版本接口采用 「HTTP 基本验证」的方式验证授权，获取到 token 后，通过设置请求 header 标头来验证请求，例如：
+                    当前版本接口采用 「HTTP 基本验证」的方式验证授权，获取到 token 后，通过设置请求 header 标头来验证请求(Bearer Token)，例如：
                     <b class="block my-2 text-gray-600 text-sm">"Authorization": "Bearer 1|1bJbwlqBfnggmOMEZqXT5XusaIwqiZjCDs7r1Ob5"</b>
                     <p class="text-sm">如果未设置 Authorization 的情况下请求上传接口，将会被视为游客上传。</p>
                 </div>

resources/views/common/notice.blade.php

@@ -1,15 +1,27 @@
-@if(\App\Utils::config(\App\Enums\ConfigKey::SiteNotice))
+@if($_is_notice)
+
     <x-modal id="notice-modal">
         <div class="markdown-body">
             {!! (new Parsedown())->parse(\App\Utils::config(\App\Enums\ConfigKey::SiteNotice)) !!}
         </div>
+        <div class="mt-4 w-full text-right">
+            <x-button type="button" @click="$store.modal.close('notice-modal');">OK</x-button>
+        </div>
     </x-modal>
 
     @push('scripts')
         <script>
-            if (! sessionStorage.getItem('noticed')) {
+            let noticeHash = "{{ md5(\App\Utils::config(\App\Enums\ConfigKey::SiteNotice)) }}";
-                Alpine.store('modal').open('notice-modal')
+
-                sessionStorage.setItem('noticed', '1');
+            let openNotice = function () {
+                Alpine.store('modal').open('notice-modal');
+                localStorage.setItem('notice-hash', noticeHash);
+            }
+
+            if (localStorage.getItem('notice-hash') !== noticeHash) {
+                setTimeout(function () {
+                    openNotice();
+                }, 1000)
             }
         </script>
     @endpush

resources/views/components/box.blade.php

@@ -1,6 +1,6 @@
-<div class="rounded w-full overflow-hidden">
+<div class="rounded w-full overflow-hidden shadow-custom">
     <div class="px-4 py-3 bg-slate-50 text-gray-800 text-md truncate">{{ $title }}</div>
-    <div class="bg-white w-full shadow-custom">
+    <div class="bg-white w-full">
         {{ $content }}
     </div>
 </div>

resources/views/components/dropdown-link.blade.php

@@ -1 +1 @@
-<a {{$attributes->merge(['class' => 'block px-4 py-2 active:bg-gray-100 text-sm text-gray-700', 'role' => 'menuitem', 'tabindex' => '-1']) }}>{{ $slot }}</a>
+<a {{$attributes->merge(['class' => 'block px-4 py-2 active:bg-gray-100 text-sm text-gray-700 truncate hover:bg-sky-500 hover:text-white', 'role' => 'menuitem', 'tabindex' => '-1']) }}>{{ $slot }}</a>

resources/views/components/dropdown.blade.php

@@ -7,12 +7,12 @@
 
     <div x-show="open"
          x-transition:enter="transition ease-out duration-200"
-         x-transition:enter-start="transform opacity-0 scale-95"
+         x-transition:enter-start="transform opacity-0 translate-y-9"
-         x-transition:enter-end="transform opacity-100 scale-100"
+         x-transition:enter-end="transform opacity-100 translate-y-0"
          x-transition:leave="transition ease-in duration-75"
-         x-transition:leave-start="transform opacity-100 scale-100"
+         x-transition:leave-start="transform opacity-100 translate-y-0"
-         x-transition:leave-end="transform opacity-0 scale-95"
+         x-transition:leave-end="transform opacity-0 translate-y-9"
-         class="absolute z-[9] {{ $classes[$direction] }} mt-2 w-48 rounded-md shadow-lg py-1 bg-white ring-1 ring-black ring-opacity-5 focus:outline-none"
+         class="absolute z-[9] {{ $classes[$direction] }} mt-2 w-48 rounded-md shadow-[10px_0px_50px_-15px_rgba(0,0,0,0.25)] py-1 bg-white "
          role="menu"
          aria-orientation="vertical"
          aria-labelledby="user-menu-button"

resources/views/components/upload.blade.php

@@ -188,7 +188,7 @@
                         .html()
                         .replace(/__id__/g, guid)
                         .replace(/__src__/g, blob)
-                        .replace(/__name__/g, file.name)
+                        .replace(/__name__/g, file.name.replace(/\$/g, '$$$$'))
                         .replace(/__info__/g, utils.formatSize(file.size));
                     data.$preview = $previews.append(html).show().find(`[data-id="${guid}"]`);
                     queue[guid] = data;

resources/views/layouts/app.blade.php

@@ -15,8 +15,8 @@
     @stack('styles')
 
     <!-- Styles -->
-    <link rel="stylesheet" href="{{ asset('css/common.css') }}?t=20220427">
+    <link rel="stylesheet" href="{{ asset('css/common.css') }}?t=20220817">
-    <link rel="stylesheet" href="{{ asset('css/app.css') }}?t=20220427">
+    <link rel="stylesheet" href="{{ asset('css/app.css') }}?t=20220817">
 </head>
 <body class="font-sans antialiased overflow-hidden">
 <div class="min-h-screen bg-gray-100" x-data x-cloak>
@@ -44,7 +44,7 @@
 </div>
 </body>
 <!-- Scripts -->
-<script src="{{ asset('js/app.js') }}?t=20220427"></script>
+<script src="{{ asset('js/app.js') }}?t=20220817"></script>
 @include('common.notice')
 <script>
     // 开关组件默认值

resources/views/layouts/guest.blade.php

@@ -15,8 +15,8 @@
         @stack('styles')
 
         <!-- Styles -->
-        <link rel="stylesheet" href="{{ asset('css/common.css') }}?t=20220427">
+        <link rel="stylesheet" href="{{ asset('css/common.css') }}?t=20220817">
-        <link rel="stylesheet" href="{{ asset('css/app.css') }}?t=20220427">
+        <link rel="stylesheet" href="{{ asset('css/app.css') }}?t=20220817">
     </head>
     <body class="font-sans antialiased">
         <div class="min-h-screen text-gray-900 bg-gray-100">
@@ -24,7 +24,7 @@
         </div>
     </body>
     <!-- Scripts -->
-    <script src="{{ asset('js/app.js') }}?t=20220427"></script>
+    <script src="{{ asset('js/app.js') }}?t=20220817"></script>
     @if(file_exists(public_path('js/custom.js')))
         <script src="{{ asset('js/custom.js') }}"></script>
     @endif

resources/views/layouts/header.blade.php

@@ -1,4 +1,4 @@
-<header class="transition-all duration-300 w-full h-14 bg-gray-700 text-white flex justify-center fixed top-0 z-[9] shadow-[0_15px_30px_-15px_rgba(0,0,0,0.5)]">
+<header class="transition-all duration-300 w-full h-14 bg-gray-700 text-white flex justify-center fixed top-0 z-[9] shadow-[0_15px_10px_-15px_rgba(0,0,0,0.3)]">
     <x-container class="w-full px-6 flex justify-between items-center">
         <div class="flex justify-start items-center max-w-[70%]">
             <a href="javascript:void(0)" @click="$store.sidebar.toggle()" class="w-6 h-6 p-4 rounded-full sm:hidden -ml-1 mr-4 flex justify-center items-center">
@@ -7,9 +7,8 @@
             <a href="" class="text-xl truncate" id="header-title">@yield('title', \App\Utils::config(\App\Enums\ConfigKey::AppName))</a>
         </div>
         <div class="flex justify-end items-center space-x-4">
-            @if($_group->strategies->isNotEmpty())
+            @includeWhen($_is_notice, 'layouts.notice')
-                @include('layouts.strategies')
+            @includeWhen($_group->strategies->isNotEmpty(), 'layouts.strategies')
-            @endif
             @include('layouts.user-nav')
         </div>
     </x-container>

resources/views/layouts/notice.blade.php

@@ -0,0 +1,15 @@
+@if($_is_notice)
+    <button type="button" class="bg-gray-800 flex items-center text-sm rounded-full focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-white" id="open-notice" aria-expanded="false" aria-haspopup="true">
+        <div class="h-8 w-8 rounded-full flex items-center justify-center bg-white">
+            <i class="fas fa-envelope text-gray-900"></i>
+        </div>
+        <span class="px-2 sm:block hidden">公告</span>
+    </button>
+    @push('scripts')
+        <script>
+            $('#open-notice').click(function () {
+                openNotice();
+            });
+        </script>
+    @endpush
+@endif

resources/views/user/images.blade.php

@@ -269,14 +269,14 @@
                     for (const i in images) {
                         html += $('#images-item-tpl').html()
                             .replace(/__id__/g, images[i].id)
-                            .replace(/__name__/g, images[i].filename)
+                            .replace(/__name__/g, images[i].filename.replace(/\$/g, '$$$$'))
                             .replace(/__human_date__/g, images[i].human_date)
                             .replace(/__date__/g, images[i].date)
                             .replace(/__url__/g, images[i].url)
                             .replace(/__thumb_url__/g, images[i].thumb_url)
                             .replace(/__width__/g, images[i].width)
                             .replace(/__height__/g, images[i].height)
-                            .replace(/__json__/g, JSON.stringify(images[i]))
+                            .replace(/__json__/g, JSON.stringify(images[i]).replace(/\$/g, '$$$$'))
                     }
 
                     $photos.append(html);
@@ -686,8 +686,8 @@
                             let content = $('#image-detail-tpl').html()
                                 .replace(/__album_name__/g, image.album ? image.album.name : '-')
                                 .replace(/__strategy_name__/g, image.strategy ? image.strategy.name : '-')
-                                .replace(/__filename__/g, image.filename)
+                                .replace(/__filename__/g, image.filename.replace(/\$/g, '$$$$'))
-                                .replace(/__origin_name__/g, image.origin_name)
+                                .replace(/__origin_name__/g, image.origin_name.replace(/\$/g, '$$$$'))
                                 .replace(/__size__/g, utils.formatSize(image.size * 1024))
                                 .replace(/__mimetype__/g, image.mimetype)
                                 .replace(/__width__/g, image.width)

resources/views/user/settings.blade.php

@@ -5,7 +5,7 @@
         <p class="mb-3 font-semibold text-lg text-gray-700">基础设置</p>
         <form action="{{ route('settings.update') }}" method="POST">
             @csrf
-            <div class="overflow-hidden sm:rounded-md">
+            <div class="overflow-hidden sm:rounded-md shadow-custom">
                 <div class="px-3 py-4 bg-white sm:p-6">
                     <div class="grid grid-cols-6 gap-6">
                         <div class="col-span-6 sm:col-span-3">

resources/views/welcome.blade.php

@@ -10,9 +10,8 @@
                     <a href="{{ route('/') }}" class="text-white text-xl truncate">{{ \App\Utils::config(\App\Enums\ConfigKey::AppName) }}</a>
                 </div>
                 <div class="flex justify-end items-center space-x-4">
-                    @if($_group->strategies->isNotEmpty())
+                    @includeWhen($_is_notice, 'layouts.notice')
-                    @include('layouts.strategies')
+                    @includeWhen($_group->strategies->isNotEmpty(), 'layouts.strategies')
-                    @endif
 
                     @if(Auth::check())
                         @include('layouts.user-nav')

tailwind.config.js

@@ -14,7 +14,7 @@ module.exports = {
                 sans: ['Nunito', ...defaultTheme.fontFamily.sans],
             },
             boxShadow: {
-                custom: '6px 6px 30px 11px rgba(0, 0, 0, 0.03)',
+                custom: '0px 4px 6px -1px rgba(0, 0, 0, 0.04)',
             },
         },
     },