diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php index ae0a508af..d8248df36 100755 --- a/app/Http/Controllers/Api/DialogController.php +++ b/app/Http/Controllers/Api/DialogController.php @@ -957,7 +957,7 @@ class DialogController extends AbstractController * @apiGroup dialog * @apiName msg__stream * - * @apiParam {String} [type] 消息类型(暂时无用,预留) + * @apiParam {String} [source] 消息来源 * - ai: 默认 * @apiParam {Number} userid 通知会员ID * @apiParam {String} stream_url 流动消息地址 @@ -975,7 +975,7 @@ class DialogController extends AbstractController return Base::retError('参数错误'); } // - $stream_url = '/ai' . preg_replace('/^\/ai/?', '/', $stream_url); + $stream_url = '/ai' . preg_replace('/^\/ai\/?/', '/', $stream_url); // $params = [ 'userid' => $userid, diff --git a/app/Tasks/BotReceiveMsgTask.php b/app/Tasks/BotReceiveMsgTask.php index e63b8b431..9c2b596ad 100644 --- a/app/Tasks/BotReceiveMsgTask.php +++ b/app/Tasks/BotReceiveMsgTask.php @@ -426,10 +426,10 @@ class BotReceiveMsgTask extends AbstractTask if ($type === 'wenxin') { $extras['api_key'] .= ':' . $setting['wenxin_secret']; } - if (empty($extras[$type . '_key'])) { + if (empty($extras['api_key'])) { $errorContent = '机器人未启用。'; - } elseif (in_array($this->client['platform'], ['win', 'mac', 'web']) - && !Base::judgeClientVersion("0.29.11", $this->client['version'])) { + } + if (in_array($this->client['platform'], ['win', 'mac', 'web']) && !Base::judgeClientVersion("0.29.11", $this->client['version'])) { $errorContent = '当前客户端版本低(所需版本≥v0.29.11)。'; } $webhookUrl = "{$serverUrl}/ai/chat"; diff --git a/docker-compose.yml b/docker-compose.yml index 9d9aabed2..fef5ec027 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -167,7 +167,7 @@ services: ai: container_name: "dootask-ai-${APP_ID}" - image: "kuaifan/dootask-ai:0.0.5" + image: "kuaifan/dootask-ai:0.0.9" environment: REDIS_HOST: "${REDIS_HOST}" REDIS_PORT: "${REDIS_PORT}" diff --git a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue index 09e290684..61a467d41 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue @@ -19,7 +19,7 @@ :placeholder="$L(field.placeholder)"/>