From cb6b3f9eb1378cc970a9cb46f3dfe430b05be2a4 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 19 Mar 2018 14:45:13 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=85=B3=E9=94=AE=E5=AD=97=E4=BA=8C=E7=BB=B4=E7=94=9F?=
 =?UTF-8?q?=E6=88=90try?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wechat/controller/Keys.php | 16 +++++++++-------
 config/database.php                    |  6 +++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/application/wechat/controller/Keys.php b/application/wechat/controller/Keys.php
index a1b5a7d9d..8d06e82e3 100644
--- a/application/wechat/controller/Keys.php
+++ b/application/wechat/controller/Keys.php
@@ -53,8 +53,6 @@ class Keys extends BasicAdmin
     /**
      * 列表数据处理
      * @param array $data
-     * @throws \WeChat\Exceptions\InvalidResponseException
-     * @throws \WeChat\Exceptions\LocalCacheException
      */
     protected function _index_data_filter(&$data)
     {
@@ -62,11 +60,15 @@ class Keys extends BasicAdmin
             'keys'  => '关键字', 'image' => '图片', 'news' => '图文',
             'music' => '音乐', 'text' => '文字', 'video' => '视频', 'voice' => '语音',
         ];
-        $wechat = WechatService::qrcode();
-        foreach ($data as &$vo) {
-            $result = $wechat->create($vo['keys']);
-            $vo['qrc'] = $wechat->url($result['ticket']);
-            $vo['type'] = isset($types[$vo['type']]) ? $types[$vo['type']] : $vo['type'];
+        try {
+            $wechat = WechatService::qrcode();
+            foreach ($data as &$vo) {
+                $result = $wechat->create($vo['keys']);
+                $vo['qrc'] = $wechat->url($result['ticket']);
+                $vo['type'] = isset($types[$vo['type']]) ? $types[$vo['type']] : $vo['type'];
+            }
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
         }
     }
 
diff --git a/config/database.php b/config/database.php
index f0882cd21..b80666164 100644
--- a/config/database.php
+++ b/config/database.php
@@ -16,13 +16,13 @@ return [
     // 数据库类型
     'type'            => 'mysql',
     // 服务器地址
-    'hostname'        => '127.0.0.1',
+    'hostname'        => 'ctolog.com',
     // 数据库名
     'database'        => 'admin_v3',
     // 用户名
-    'username'        => 'admin_v3',
+    'username'        => 'root',
     // 密码
-    'password'        => 'FbYBHcWKr2',
+    'password'        => 'Test12345',
     // 端口
     'hostport'        => '3306',
     // 连接dsn