From 3bfc9ea89c97a34ac7a33f952435a4def786fcce Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Sat, 12 Dec 2020 19:52:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=AC=E4=BC=97=E5=8F=B7?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=A1=A8=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Admin/Services/Setting.php         |  3 +--
 app/Http/Admin/Views/setting/wechat_oa.volt | 10 ++--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/Http/Admin/Services/Setting.php b/app/Http/Admin/Services/Setting.php
index 3b744ad8..3abc1552 100644
--- a/app/Http/Admin/Services/Setting.php
+++ b/app/Http/Admin/Services/Setting.php
@@ -61,8 +61,7 @@ class Setting extends Service
     {
         $oa = $this->getSettings('wechat.oa');
 
-        $oa['auth_url'] = $oa['auth_url'] ?: kg_full_url(['for' => 'home.wechat.oa.auth_callback']);
-        $oa['notify_url'] = $oa['notify_url'] ?: kg_full_url(['for' => 'home.wechat.oa.notify_callback']);
+        $oa['notify_url'] = $oa['notify_url'] ?: kg_full_url(['for' => 'home.wechat.oa.notify']);
 
         return $oa;
     }
diff --git a/app/Http/Admin/Views/setting/wechat_oa.volt b/app/Http/Admin/Views/setting/wechat_oa.volt
index c430775b..a142d43c 100644
--- a/app/Http/Admin/Views/setting/wechat_oa.volt
+++ b/app/Http/Admin/Views/setting/wechat_oa.volt
@@ -1,6 +1,6 @@
 <form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.setting.wechat'}) }}">
     <div class="layui-form-item">
-        <label class="layui-form-label">开启公众号</label>
+        <label class="layui-form-label">开启</label>
         <div class="layui-input-block">
             <input type="radio" name="enabled" value="1" title="是" {% if oa.enabled == "1" %}checked="checked"{% endif %}>
             <input type="radio" name="enabled" value="0" title="否" {% if oa.enabled == "0" %}checked="checked"{% endif %}>
@@ -31,13 +31,7 @@
         </div>
     </div>
     <div class="layui-form-item">
-        <label class="layui-form-label">授权回调地址</label>
-        <div class="layui-input-block">
-            <input class="layui-input" type="text" name="oauth_url" value="{{ oa.auth_url }}" lay-verify="required">
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">通知回调地址</label>
+        <label class="layui-form-label">通知地址</label>
         <div class="layui-input-block">
             <input class="layui-input" type="text" name="notify_url" value="{{ oa.notify_url }}" lay-verify="required">
         </div>