Merge pull request #179 from maxincai/master

批量添加好友导入数据时，未配置提醒自建应用报错信息优化
mochat-cloud · Oct 21, 2021 · 6547f8d · 6547f8d
2 parents 589824f + 1648af4
commit 6547f8d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 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
@@ -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
@@ -28,7 +28,7 @@
         '/weWork/callback',
         '/dashboard/corp/weWorkCallback',
         '/',
-        '/dashboard/{wxVerifyTxt}',
+        '/{wxVerifyTxt}',
         '/dashboard/officialAccount/authEventCallback',
         '/dashboard/{appId}/officialAccount/messageEventCallback',
         '/operation/officialAccount/authRedirect',

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
@@ -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;