From 6ccd4055fc40d2d7d154920a1859a7c19774bd1a Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 15 Jun 2020 22:08:43 +0800 Subject: [PATCH] #238 Testing --- app/admin/controller/api/Update.php | 4 ++-- app/wechat/controller/api/Push.php | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/admin/controller/api/Update.php b/app/admin/controller/api/Update.php index b415231bf..74ca70ed5 100644 --- a/app/admin/controller/api/Update.php +++ b/app/admin/controller/api/Update.php @@ -43,8 +43,8 @@ class Update extends Controller public function tree() { $this->success('获取文件列表成功!', InstallService::instance()->getList( - unserialize($this->request->post('rules', 'a:0:{}', '')), - unserialize($this->request->post('ignore', 'a:0:{}', '')) + unserialize($this->request->post('rules', 'a:0:{}', ''), ['allowed_classes' => false]), + unserialize($this->request->post('ignore', 'a:0:{}', ''), ['allowed_classes' => false]) )); } diff --git a/app/wechat/controller/api/Push.php b/app/wechat/controller/api/Push.php index ba59665f1..30548188f 100644 --- a/app/wechat/controller/api/Push.php +++ b/app/wechat/controller/api/Push.php @@ -99,7 +99,8 @@ class Push extends Controller $this->appid = $this->request->post('appid', '', null); $this->openid = $this->request->post('openid', '', null); $this->encrypt = boolval($this->request->post('encrypt', 0)); - $this->receive = $this->toLower(unserialize($this->request->post('receive', '', null))); + $receive = $this->request->post('receive', '', null); + $this->receive = $this->toLower(unserialize($receive, ['allowed_classes' => false])); if (empty($this->appid) || empty($this->openid) || empty($this->receive)) { throw new \think\Exception('微信API实例缺失必要参数[appid,openid,receive]'); } @@ -208,7 +209,7 @@ class Push extends Controller */ private function keys($rule, $isLast = false, $isCustom = false) { - list($table, $field, $value) = explode('#', $rule . '##'); + [$table, $field, $value] = explode('#', $rule . '##'); $data = $this->app->db->name($table)->where([$field => $value])->find(); if (empty($data['type']) || (array_key_exists('status', $data) && empty($data['status']))) { return $isLast ? false : $this->keys('wechat_keys#keys#default', true, $isCustom); @@ -228,7 +229,7 @@ class Push extends Controller if (empty($data['image_url']) || !($mediaId = MediaService::instance()->upload($data['image_url'], 'image'))) return false; return $this->sendMessage('image', ['media_id' => $mediaId], $isCustom); case 'news': - list($news, $articles) = [MediaService::instance()->news($data['news_id']), []]; + [$news, $articles] = [MediaService::instance()->news($data['news_id']), []]; if (empty($news['articles'])) return false; foreach ($news['articles'] as $vo) array_push($articles, [ 'url' => url("@wechat/api.review/view", [], false, true) . "?id={$vo['id']}",