From 44bacc399025289d629fda06698763298732bca6 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 18 Jul 2019 15:08:58 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E5=BC=80?=
 =?UTF-8?q?=E6=94=BE=E5=B9=B3=E5=8F=B0=E6=8E=88=E6=9D=83=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/handler/PublishHandler.php         |  6 +++---
 .../store/view/config/index-store-message2.html        | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/service/handler/PublishHandler.php b/application/service/handler/PublishHandler.php
index 9a564e3bd..a704f4f0d 100644
--- a/application/service/handler/PublishHandler.php
+++ b/application/service/handler/PublishHandler.php
@@ -37,8 +37,8 @@ class PublishHandler
      * @param string $appid
      * @return string
      * @throws \WeChat\Exceptions\InvalidDecryptException
-     * @throws \think\Exception
-     * @throws \think\exception\PDOException
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
      */
     public static function handler($appid)
     {
@@ -55,7 +55,7 @@ class PublishHandler
                     return $wechat->text('TESTCOMPONENT_MSG_TYPE_TEXT_callback')->reply([], true);
                 } else {
                     $key = str_replace("QUERY_AUTH_CODE:", '', $receive['Content']);
-                    WechatService::instance('Service')->getQueryAuthorizerInfo($key);
+                    WechatService::service()->getQueryAuthorizerInfo($key);
                     return $wechat->text("{$key}_from_api")->reply([], true);
                 }
             case 'event':
diff --git a/application/store/view/config/index-store-message2.html b/application/store/view/config/index-store-message2.html
index 3d93154bd..0d689c04c 100644
--- a/application/store/view/config/index-store-message2.html
+++ b/application/store/view/config/index-store-message2.html
@@ -15,14 +15,14 @@
 
         <label class="layui-form-item margin-top-20 block relative">
             <span class="color-green margin-right-10">短信平台账号</span><span class="nowrap color-desc">Username</span>
-            <input name="sms_zt_username2" required placeholder="请输入助通短信平台账号" value="{:sysconf('sms_zt_username2')}" class="layui-input">
-            <p class="help-block">助通短信平台账号，可以联系18122377655获取账号与密码</p>
+            <input name="sms_zt_username2" required placeholder="请输入短信平台账号" value="{:sysconf('sms_zt_username2')}" class="layui-input">
+            <p class="help-block">短信平台账号，可以联系18122377655获取账号与密码</p>
         </label>
 
         <label class="layui-form-item margin-top-20 block relative">
             <span class="color-green margin-right-10">短信平台密码</span><span class="nowrap color-desc">Password</span>
-            <input name="sms_zt_password2" required placeholder="请输入助通短信平台密码" value="{:sysconf('sms_zt_password2')}" class="layui-input">
-            <p class="help-block">助通短信平台账号，可以联系18122377655获取账号与密码</p>
+            <input name="sms_zt_password2" required placeholder="请输入短信平台密码" value="{:sysconf('sms_zt_password2')}" class="layui-input">
+            <p class="help-block">短信平台账号，可以联系18122377655获取账号与密码</p>
         </label>
 
         <label class="layui-form-item margin-top-20 block relative">
@@ -33,7 +33,7 @@
 
         <label class="layui-form-item margin-top-20 block relative">
             <span class="color-green margin-right-10">注册短信模板</span><span class="nowrap color-desc">Template</span>
-            <textarea class="layui-textarea" required name="sms_reg_template2" placeholder="请输入助通短信平台密码">{:sysconf('sms_reg_template2')}</textarea>
+            <textarea class="layui-textarea" required name="sms_reg_template2" placeholder="请输入短信平台密码">{:sysconf('sms_reg_template2')}</textarea>
             <p class="help-block">会员注册短信模板，验证码变量使用 {code} 代替</p>
         </label>