Merge branch 'koogua/v1.6.9'

app/Http/Admin/Controllers/TestController.php

@@ -8,9 +8,7 @@
 namespace App\Http\Admin\Controllers;
 
 use App\Http\Admin\Services\AlipayTest as AlipayTestService;
-use App\Http\Admin\Services\Setting as SettingService;
 use App\Http\Admin\Services\WxpayTest as WxpayTestService;
-use App\Services\Captcha as CaptchaService;
 use App\Services\DingTalkNotice as DingTalkNoticeService;
 use App\Services\Live as LiveService;
 use App\Services\Logic\Notice\External\Mail\Test as MailTestService;
@@ -152,30 +150,6 @@ class TestController extends Controller
         }
     }
 
-    /**
-     * @Post("/captcha", name="admin.test.captcha")
-     */
-    public function captchaAction()
-    {
-        $post = $this->request->getPost();
-
-        $captchaService = new CaptchaService();
-
-        $result = $captchaService->verify($post['ticket'], $post['rand']);
-
-        if ($result) {
-
-            $settingService = new SettingService();
-
-            $settingService->updateSettings('captcha', ['enabled' => 1]);
-
-            return $this->jsonSuccess(['msg' => '后台验证成功']);
-
-        } else {
-            return $this->jsonError(['msg' => '后台验证失败']);
-        }
-    }
-
     /**
      * @Get("/alipay", name="admin.test.alipay")
      */

app/Http/Admin/Views/setting/site.volt

@@ -37,7 +37,7 @@
                 <input class="layui-input" type="text" name="logo" placeholder="请确保存储已正确配置" value="{{ site.logo }}">
             </div>
             <div class="layui-inline">
-                <button class="layui-btn" type="button" id="upload-logo">上传文件</button>
+                <button class="layui-btn" type="button" id="upload-logo">上传</button>
             </div>
         </div>
         <div class="layui-form-item">
@@ -46,7 +46,7 @@
                 <input class="layui-input" type="text" name="favicon" placeholder="请确保存储已正确配置" value="{{ site.favicon }}">
             </div>
             <div class="layui-inline">
-                <button class="layui-btn" type="button" id="upload-favicon">上传文件</button>
+                <button class="layui-btn" type="button" id="upload-favicon">上传</button>
             </div>
         </div>
         <div class="layui-form-item">