- 修复缓存数据库驱动

src/cache/Mysql.php

@@ -17,7 +17,9 @@
 namespace DtApp\ThinkLibrary\cache;
 
 use DtApp\ThinkLibrary\exception\CacheException;
+use think\db\exception\DataNotFoundException;
 use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 use think\facade\Db;
 
 /**
@@ -74,13 +76,17 @@ class Mysql
      * 获取
      * @return string
      * @throws CacheException
+     * @throws DbException
+     * @throws DataNotFoundException
+     * @throws ModelNotFoundException
      */
     public function get()
     {
         if (empty($this->cache_name)) throw new CacheException("名称未配置");
         $cache = Db::table($this->table)
             ->where('cache_name', $this->cache_name)
-            ->field('cache_expire,cache_value');
+            ->field('cache_expire,cache_value')
+            ->find();
         if (empty($cache['cache_expire'])) return $cache['cache_value'];
         if ($cache['cache_expire'] < time()) return "";
         return $cache['cache_value'];

src/service/WeChat/MiniService.php

@@ -22,6 +22,9 @@ use DtApp\ThinkLibrary\exception\CurlException;
 use DtApp\ThinkLibrary\exception\WeChatException;
 use DtApp\ThinkLibrary\Service;
 use DtApp\ThinkLibrary\service\Curl\HttpService;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 /**
  * 微信小程序
@@ -80,6 +83,9 @@ class MiniService extends Service
      * @return bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function getPaidUnionId(string $openid)
@@ -99,6 +105,9 @@ class MiniService extends Service
      * @return array|bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function createWxaQrCode(array $data = [])
@@ -120,6 +129,9 @@ class MiniService extends Service
      * @return array|bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function getWxaCode(array $data = [])
@@ -141,6 +153,9 @@ class MiniService extends Service
      * @return array|bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function getWxaCodeUnLimit(array $data = [])
@@ -162,6 +177,9 @@ class MiniService extends Service
      * @return bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function addTemplate(array $data = [])
@@ -182,6 +200,9 @@ class MiniService extends Service
      * @return bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function deleteTemplate(string $priTmplId)
@@ -204,6 +225,9 @@ class MiniService extends Service
      * @return bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function getCategory()
@@ -223,6 +247,9 @@ class MiniService extends Service
      * @return bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function getPubTemplateKeyWordsById(string $tid)
@@ -246,6 +273,9 @@ class MiniService extends Service
      * @return bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function getPubTemplateTitleList(array $data = [])
@@ -265,6 +295,9 @@ class MiniService extends Service
      * @return bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function getTemplateList()
@@ -284,6 +317,9 @@ class MiniService extends Service
      * @return bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function send(array $data = [])
@@ -336,6 +372,9 @@ class MiniService extends Service
      * @return bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function accessToken()
@@ -347,9 +386,12 @@ class MiniService extends Service
     /**
      * 获取access_token信息
      * @return array|bool|mixed|string|string[]
+     * @throws CacheException
      * @throws CurlException
      * @throws WeChatException
-     * @throws CacheException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      */
     private function getAccessToken()
     {

src/service/WeChat/WebApps.php

@@ -24,6 +24,9 @@ use DtApp\ThinkLibrary\facade\Pregs;
 use DtApp\ThinkLibrary\facade\Urls;
 use DtApp\ThinkLibrary\Service;
 use DtApp\ThinkLibrary\service\Curl\HttpService;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 /**
  * Class WebApps
@@ -219,8 +222,12 @@ class WebApps extends Service
     /**
      * 分享
      * @return array
+     * @throws CacheException
      * @throws CurlException
-     * @throws WeChatException|CacheException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws WeChatException
      */
     public function share()
     {
@@ -264,6 +271,9 @@ class WebApps extends Service
      * @return array|bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function qrCode(array $data)
@@ -283,6 +293,9 @@ class WebApps extends Service
      * @return array|bool|mixed|string
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function messageTemplateSend(array $data = [])
@@ -303,6 +316,9 @@ class WebApps extends Service
      * @return bool
      * @throws CacheException
      * @throws CurlException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      * @throws WeChatException
      */
     public function shortUrl(string $long_url)
@@ -322,8 +338,12 @@ class WebApps extends Service
     /**
      * 获取access_token信息
      * @return array|bool|mixed|string|string[]
+     * @throws CacheException
      * @throws CurlException
-     * @throws CacheException|WeChatException
+     * @throws WeChatException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
      */
     private function getAccessToken()
     {