新增：富文本全新升级

Author: modstart

module/Banner/Docs/release.md

@@ -1,3 +1,9 @@
+## 1.8.0
+
+- 优化：视频 `Banner` 概率不播放问题
+
+---
+
 ## 1.7.0  调用方式，增加remark参数，手机支持视频背景
 
 - 新增：模块快速调用方式

module/Banner/View/inc/banner.blade.php

@@ -61,7 +61,7 @@
                             <div class="cover">
                                 <video class="video-player"
                                        src="{{\ModStart\Core\Assets\AssetsUtil::fix($b['video'])}}"
-                                       autoplay="autoplay" loop="loop" muted="muted"></video>
+                                       autoplay loop muted playsinline></video>
                             </div>
                         </a>
                     @endif

module/Banner/View/pc/public/banner.blade.php

@@ -62,7 +62,7 @@
                             <div class="cover">
                                 <video class="video-player"
                                        src="{{\ModStart\Core\Assets\AssetsUtil::fix($b['video'])}}"
-                                       autoplay="autoplay" loop="loop" muted="muted"></video>
+                                       autoplay loop muted playsinline></video>
                             </div>
                         </a>
                     @endif

module/Banner/config.json

@@ -13,7 +13,7 @@
     ],
     "modstartVersion": ">=2.6.0",
     "title": "通用轮播",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "author": "官方",
     "description": "提供多位置轮播图片基础管理功能",
     "config": {

module/Site/Admin/Controller/ConfigController.php

@@ -38,6 +38,14 @@ public function setting(AdminConfigBuilder $builder)
         $builder->text('Site_ContactAddress', '地址');
         $builder->image('Site_ContactQrcode', '联系二维码')->help('可传带二维码的公众号/微信/QQ等，方便用户扫码联系');
 
+        $builder->layoutSeparator('其他配置');
+        $builder->complexFieldsList('Site_PublicInternalUrlMap', '内外网链接节流映射')
+            ->fields([
+                ['name' => 'public', 'title' => '外网地址', 'type' => 'text', 'defaultValue' => '', 'placeholder' => 'https://public.example.com', 'tip' => '',],
+                ['name' => 'internal', 'title' => '内网地址', 'type' => 'text', 'defaultValue' => '', 'placeholder' => 'https://internal.example.com', 'tip' => '',],
+            ])
+            ->help('在使用第三方存储时，程序拉取外网地址会造成流量浪费，使用此功能可将外网地址映射为内网地址，节省流量');
+
         $builder->formClass('wide');
         return $builder->perform();
     }

module/Site/Docs/release.md

@@ -1,3 +1,9 @@
+## 1.7.0
+
+- 新增：内外网链接节流映射配置
+
+---
+
 ## 1.6.0 增加联系客服页面 site/contact（支持弹窗）
 
 - 新增：增加联系客服页面 site/contact（支持弹窗）

module/Vendor/Command/ScheduleRunAllCommand.php

@@ -0,0 +1,54 @@
+<?php
+
+
+namespace Module\Vendor\Command;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+use ModStart\Core\Util\ArrayUtil;
+use ModStart\Core\Util\FileUtil;
+use ModStart\Core\Util\ShellUtil;
+use ModStart\Core\Util\TimeUtil;
+use ModStart\ModStart;
+use Module\Vendor\Util\CacheUtil;
+
+class ScheduleRunAllCommand extends Command
+{
+    protected $signature = 'modstart:schedule-run-all {php} {dir}';
+
+    public function handle()
+    {
+        $php = $this->argument('php');
+        $dir = $this->argument('dir');
+        $hash = md5($php . ':' . $dir);
+        $projects = CacheUtil::remember("Vendor:ScheduleRunAll:Projects:" . $hash,
+            3600,
+            function () use ($dir) {
+                $projects = FileUtil::listFiles($dir);
+                $projects = array_filter($projects, function ($p) {
+                    return $p['isDir']
+                        && @file_exists($p['pathname'] . '/artisan')
+                        && @file_exists($p['pathname'] . '/.env')
+                        && !Str::startsWith($p['filename'], '_delete.')
+                        && @file_exists($p['pathname'] . '/vendor/modstart/modstart-' . ModStart::env());
+                });
+                shuffle($projects);
+                return ArrayUtil::keepItemsKeys($projects, ['pathname']);
+            });
+        foreach ($projects as $project) {
+            $start = TimeUtil::millitime();
+            $command = "$php {$project['pathname']}/artisan schedule:run";
+            Log::info("Vendor.ScheduleRunAllCommand.Run - {$command}");
+            $result = ShellUtil::run($command, false);
+            $result = str_replace([
+                "\r"
+            ], "", $result);
+            $result = str_replace("\n", " ", $result);
+            $result = str_replace("Running scheduled command: Closure", "√", $result);
+            $result = str_replace("No scheduled commands are ready to run.", "〇", $result);
+            $ms = TimeUtil::millitime() - $start;
+            Log::info("Vendor.ScheduleRunAllCommand.Result - {$result} - {$ms}ms");
+        }
+    }
+}

module/Vendor/Core/ModuleServiceProvider.php

@@ -4,7 +4,11 @@
 
 use Illuminate\Events\Dispatcher;
 use Illuminate\Support\ServiceProvider;
+use Module\Vendor\Command\ScheduleRunAllCommand;
 use Module\Vendor\Command\ScheduleRunnerCommand;
+use Module\Vendor\Provider\Schedule\ScheduleBiz;
+use Module\Vendor\Schedule\DataTempCleanScheduleBiz;
+use Module\Vendor\Schedule\TempFileCleanScheduleBiz;
 
 class ModuleServiceProvider extends ServiceProvider
 {
@@ -17,7 +21,12 @@ public function boot(Dispatcher $events)
     {
         $this->commands([
             ScheduleRunnerCommand::class,
+            ScheduleRunAllCommand::class,
         ]);
+        if (class_exists(DataTempCleanScheduleBiz::class)) {
+            ScheduleBiz::register(DataTempCleanScheduleBiz::class);
+            ScheduleBiz::register(TempFileCleanScheduleBiz::class);
+        }
     }
 
     /**

module/Vendor/Docs/release.md

@@ -1,3 +1,10 @@
+## 4.2.0
+
+- 新增：临时上传文件data_temp自动清除调度任务
+- 新增：临时缓存文件自动清理任务调度
+
+---
+
 ## 4.1.0 功能特性优化，已知问题修复
 
 - 功能特性优化，已知问题修复

module/Vendor/Installer/function.php

@@ -286,7 +286,7 @@ function env($key, $defaultValue = '')
 {
     static $values = null;
     if (null === $values) {
-        $values = \ModStart\Core\Env\EnvUtil::all(ENV_FILE_EXAMPLE);
+        $values = \ModStart\Core\Util\EnvUtil::all(ENV_FILE_EXAMPLE);
     }
     return isset($values[$key]) ? $values[$key] : $defaultValue;
 }