diff --git a/app/Http/Controllers/Api/ApproveController.php b/app/Http/Controllers/Api/ApproveController.php index c162e882d..437af3314 100755 --- a/app/Http/Controllers/Api/ApproveController.php +++ b/app/Http/Controllers/Api/ApproveController.php @@ -995,7 +995,7 @@ class ApproveController extends AbstractController return WebSocketDialogMsg::sendMsg($msg_action, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true); } // 查找最后一条消息msg_id - $msg_action = 'update-' . $toUser['msg_id']; + $msg_action = 'change-' . $toUser['msg_id']; } // try { diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index f8a226bf6..883bdd875 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -2115,7 +2115,7 @@ class UsersController extends AbstractController 'latest_online_time' => date( 'Y-m-d H:i:s', UserCheckinRecord::whereUserid($user->userid) - ->whereYear('created_at', $year) + ->whereYear(DB::raw('from_unixtime(report_time)'), $year) ->where(function ($query) { $query->where(function ($query) { $query->whereRaw('HOUR(FROM_UNIXTIME(report_time)) < 6'); diff --git a/app/Tasks/BotReceiveMsgTask.php b/app/Tasks/BotReceiveMsgTask.php index 6c5f4aacb..54d8bc426 100644 --- a/app/Tasks/BotReceiveMsgTask.php +++ b/app/Tasks/BotReceiveMsgTask.php @@ -380,6 +380,7 @@ class BotReceiveMsgTask extends AbstractTask 'openai_agency' => $setting['openai_agency'], 'openai_model' => $setting['openai_model'], 'server_url' => $serverUrl, + 'chunk_size' => 7, ]; if (empty($extras['openai_key'])) { $error = 'Robot disabled.'; diff --git a/docker-compose.yml b/docker-compose.yml index 24c478d41..9ed81ccbc 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -169,7 +169,7 @@ services: ai: container_name: "dootask-ai-${APP_ID}" - image: "kuaifan/dooai:0.0.8" + image: "kuaifan/dooai:0.0.9" networks: extnetwork: ipv4_address: "${APP_IPPR}.12" @@ -177,7 +177,7 @@ services: okr: container_name: "dootask-okr-${APP_ID}" - image: "kuaifan/doookr:0.0.27" + image: "kuaifan/doookr:0.0.28" environment: TZ: "${TIMEZONE:-PRC}" DOO_TASK_URL: "http://${APP_IPPR}.3" diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 68c0b9ea3..a14fb0e8f 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -1139,7 +1139,8 @@ export default { watch: { '$route': { - handler({name, params}) { + handler(data) { + const { name, params } = data || {} if (name != 'manage-messenger') { return }