From 9a351ed0e6b1de62140d2d3035366457ad930260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E6=96=B0=E6=89=8D?= <maxincai@126.com>
Date: Thu, 21 Oct 2021 16:35:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](1.1.?=
 =?UTF-8?q?5):=20=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0=E5=A5=BD=E5=8F=8B?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E6=9C=AA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8F=90=E9=86=92=E8=87=AA=E5=BB=BA=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mochat/contact-batch-add/src/Logic/ImportStoreLogic.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/api-server/plugin/mochat/contact-batch-add/src/Logic/ImportStoreLogic.php b/api-server/plugin/mochat/contact-batch-add/src/Logic/ImportStoreLogic.php
index e8e024c2..60ebfa6f 100755
--- a/api-server/plugin/mochat/contact-batch-add/src/Logic/ImportStoreLogic.php
+++ b/api-server/plugin/mochat/contact-batch-add/src/Logic/ImportStoreLogic.php
@@ -170,6 +170,10 @@ private function sendMessage(int $recordId, int $corpId)
         $workAgentService = make(WorkAgentContract::class);
         $agent = $workAgentService->getWorkAgentRemindByCorpId((int) $corpId, ['id']);
 
+        if (empty($agent)) {
+            throw new CommonException(ErrorCode::SERVER_ERROR, '未配置自建应用信息，无法发送提醒！');
+        }
+
         foreach ($list as $item) {
             $employee = $this->workEmployee->getWorkEmployeeById($item['employeeId']);
             $url = Url::getSidebarBaseUrl() . '/contactBatchAdd?agentId=' . $agent['id'] . '&batchId=' . $recordId;

From 1648af4a0b53ffe8dab63dd8737b0de21c16550b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E6=96=B0=E6=89=8D?= <maxincai@126.com>
Date: Thu, 21 Oct 2021 16:37:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Bug=E4=BF=AE=E5=A4=8D](1.1.5):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E5=8F=AF=E4=BF=A1?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/core/work-agent/src/Action/Dashboard/TxtVerifyShow.php  | 2 +-
 api-server/config/autoload/framework.php                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api-server/app/core/work-agent/src/Action/Dashboard/TxtVerifyShow.php b/api-server/app/core/work-agent/src/Action/Dashboard/TxtVerifyShow.php
index 76be7edf..7077d77e 100644
--- a/api-server/app/core/work-agent/src/Action/Dashboard/TxtVerifyShow.php
+++ b/api-server/app/core/work-agent/src/Action/Dashboard/TxtVerifyShow.php
@@ -20,7 +20,7 @@
 class TxtVerifyShow extends AbstractAction
 {
     /**
-     * @RequestMapping(path="/dashboard/{wxVerifyTxt:WW_verify_[0-9a-zA-Z]{16}\.txt$}", methods="GET")
+     * @RequestMapping(path="/{wxVerifyTxt:WW_verify_[0-9a-zA-Z]{16}\.txt$}", methods="GET")
      * @return null|string ...
      */
     public function handle(): ?string
diff --git a/api-server/config/autoload/framework.php b/api-server/config/autoload/framework.php
index fdca8b39..8975d9b7 100755
--- a/api-server/config/autoload/framework.php
+++ b/api-server/config/autoload/framework.php
@@ -28,7 +28,7 @@
         '/weWork/callback',
         '/dashboard/corp/weWorkCallback',
         '/',
-        '/dashboard/{wxVerifyTxt}',
+        '/{wxVerifyTxt}',
         '/dashboard/officialAccount/authEventCallback',
         '/dashboard/{appId}/officialAccount/messageEventCallback',
         '/operation/officialAccount/authRedirect',