From cd9422afc1411d217554188be67736a2c84dd4ee Mon Sep 17 00:00:00 2001 From: koogua Date: Tue, 9 Aug 2022 16:43:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B8=85=E7=90=86=E7=BE=A4=E7=BB=84=E6=AE=8B?= =?UTF-8?q?=E7=95=99=202.=E4=BC=98=E5=8C=96HtmlPurifier=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 8 +++++++- app/Http/Admin/Controllers/UploadController.php | 1 - app/Http/Admin/Views/setting/storage.volt | 4 ---- app/Library/AppInfo.php | 2 +- app/Library/Purifier.php | 8 +++++++- app/Services/MyStorage.php | 14 -------------- public/static/admin/img/default/group_avatar.png | Bin 6366 -> 0 bytes 7 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 public/static/admin/img/default/group_avatar.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a422486..bd434834 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,14 @@ +### [v1.5.7](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.7)(2022-08-28) + +- 清理群组残留 +- 优化HtmlPurifier缓存目录自动创建 + ### [v1.5.6](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.6)(2022-08-08) - 增加应用内命令行migrations - 移除群组和微聊模块 -- kindeditor替换vditor - markdown转html +- kindeditor替换vditor +- markdown转html ### [v1.5.5](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.5)(2022-07-27) diff --git a/app/Http/Admin/Controllers/UploadController.php b/app/Http/Admin/Controllers/UploadController.php index 268ec1a7..26c76045 100644 --- a/app/Http/Admin/Controllers/UploadController.php +++ b/app/Http/Admin/Controllers/UploadController.php @@ -148,7 +148,6 @@ class UploadController extends Controller $items = []; $items['user_avatar'] = $service->uploadDefaultUserAvatar(); - $items['group_avatar'] = $service->uploadDefaultGroupAvatar(); $items['course_cover'] = $service->uploadDefaultCourseCover(); $items['package_cover'] = $service->uploadDefaultPackageCover(); $items['gift_cover'] = $service->uploadDefaultGiftCover(); diff --git a/app/Http/Admin/Views/setting/storage.volt b/app/Http/Admin/Views/setting/storage.volt index 5e3a45b3..18c13f2f 100644 --- a/app/Http/Admin/Views/setting/storage.volt +++ b/app/Http/Admin/Views/setting/storage.volt @@ -117,10 +117,6 @@ 用户头像 public/static/admin/img/default/user_cover.png - - 群组头像 - public/static/admin/img/default/group_cover.png - 课程封面 public/static/admin/img/default/course_cover.png diff --git a/app/Library/AppInfo.php b/app/Library/AppInfo.php index 6fa3bc44..f214b7e6 100644 --- a/app/Library/AppInfo.php +++ b/app/Library/AppInfo.php @@ -16,7 +16,7 @@ class AppInfo protected $link = 'https://koogua.com'; - protected $version = '1.5.6'; + protected $version = '1.5.7'; public function __get($name) { diff --git a/app/Library/Purifier.php b/app/Library/Purifier.php index 883a6780..e73fb979 100644 --- a/app/Library/Purifier.php +++ b/app/Library/Purifier.php @@ -55,7 +55,13 @@ class Purifier $config->set($key, $value); } - $config->set('Cache.SerializerPath', cache_path('purifier')); + $serializerPath = cache_path('purifier'); + + if (file_exists($serializerPath) == false) { + mkdir($serializerPath, 0777); + } + + $config->set('Cache.SerializerPath', $serializerPath); return $config; } diff --git a/app/Services/MyStorage.php b/app/Services/MyStorage.php index e3af32d4..fe195294 100644 --- a/app/Services/MyStorage.php +++ b/app/Services/MyStorage.php @@ -49,20 +49,6 @@ class MyStorage extends Storage return $this->putFile($key, $filename); } - /** - * 上传默认群组头像 - * - * @return false|mixed|string - */ - public function uploadDefaultGroupAvatar() - { - $filename = static_path('admin/img/default/group_avatar.png'); - - $key = '/img/default/group_avatar.png'; - - return $this->putFile($key, $filename); - } - /** * 上传默认课程封面 * diff --git a/public/static/admin/img/default/group_avatar.png b/public/static/admin/img/default/group_avatar.png deleted file mode 100644 index 579dc1c6e68efae9cf11dd20ae11101664047adf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6366 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 Ud@OT|4@?xI{2yGQ7G@FtKN3kq@c;k-