From c854252784e21690915fa1a8d2106d82719d3ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 15 Sep 2021 23:48:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1=E5=AA=92?=
 =?UTF-8?q?=E4=BD=93=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wechat/model/WechatMedia.php    | 28 ++++++++++++++++++++++++++++
 app/wechat/service/MediaService.php |  5 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 app/wechat/model/WechatMedia.php

diff --git a/app/wechat/model/WechatMedia.php b/app/wechat/model/WechatMedia.php
new file mode 100644
index 000000000..4119e5b3b
--- /dev/null
+++ b/app/wechat/model/WechatMedia.php
@@ -0,0 +1,28 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2021 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: https://thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// | 免费声明 ( https://thinkadmin.top/disclaimer )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
+// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
+// +----------------------------------------------------------------------
+
+namespace app\wechat\model;
+
+use think\admin\Model;
+
+/**
+ * 微信媒体文件模型
+ * Class WechatMedia
+ * @package app\wechat\model
+ */
+class WechatMedia extends Model
+{
+}
\ No newline at end of file
diff --git a/app/wechat/service/MediaService.php b/app/wechat/service/MediaService.php
index 5c8b8b08e..45e7a9653 100644
--- a/app/wechat/service/MediaService.php
+++ b/app/wechat/service/MediaService.php
@@ -16,6 +16,7 @@
 
 namespace app\wechat\service;
 
+use app\wechat\model\WechatMedia;
 use app\wechat\model\WechatNews;
 use app\wechat\model\WechatNewsArticle;
 use think\admin\Service;
@@ -70,9 +71,9 @@ class MediaService extends Service
     public function upload(string $url, string $type = 'image', array $video = []): string
     {
         $map = ['md5' => md5($url), 'appid' => WechatService::instance()->getAppid()];
-        if (($mediaId = $this->app->db->name('WechatMedia')->where($map)->value('media_id'))) return $mediaId;
+        if (($mediaId = WechatMedia::mk()->where($map)->value('media_id'))) return $mediaId;
         $result = WechatService::WeChatMedia()->addMaterial(self::buildCurlFile($url), $type, $video);
-        data_save('WechatMedia', [
+        data_save(WechatMedia::class, [
             'local_url' => $url, 'md5' => $map['md5'], 'type' => $type, 'appid' => $map['appid'],
             'media_url' => $result['url'] ?? '', 'media_id' => $result['media_id'],
         ], 'type', $map);