From ec7af94f71f71ccfeb66e4dbabb234a359c412ed Mon Sep 17 00:00:00 2001 From: zzw <2318266924@qq.com> Date: Thu, 29 Feb 2024 11:39:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Tasks/BotReceiveMsgTask.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Tasks/BotReceiveMsgTask.php b/app/Tasks/BotReceiveMsgTask.php index fbc7eddde..be49abf66 100644 --- a/app/Tasks/BotReceiveMsgTask.php +++ b/app/Tasks/BotReceiveMsgTask.php @@ -470,7 +470,7 @@ class BotReceiveMsgTask extends AbstractTask } // try { - $res = Ihttp::ihttp_post($webhookUrl, [ + $data = [ 'text' => $command, 'token' => User::generateToken($botUser), 'dialog_id' => $dialog->id, @@ -481,7 +481,8 @@ class BotReceiveMsgTask extends AbstractTask 'bot_uid' => $botUser->userid, 'version' => Base::getVersion(), 'extras' => Base::array2json($extras) - ], 10); + ]; + $res = Ihttp::ihttp_post($webhookUrl, $data, 10); if ($userBot) { $userBot->webhook_num++; $userBot->save(); From c1361fadda5a831eb08dca94d6820ddcb9bb23ba Mon Sep 17 00:00:00 2001 From: weifs <605403358@qq.com> Date: Thu, 29 Feb 2024 15:26:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?perf:=20=20okr=E5=92=8C=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 2 +- .../assets/js/pages/manage/approve/index.vue | 35 ++++++++++--------- resources/assets/sass/pages/page-approve.scss | 5 +-- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 62299c412..a4c6d2f85 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -178,7 +178,7 @@ services: okr: container_name: "dootask-okr-${APP_ID}" - image: "kuaifan/doookr:0.0.35" + image: "kuaifan/doookr:0.0.36" environment: TZ: "${TIMEZONE:-PRC}" DOO_TASK_URL: "http://${APP_IPPR}.3" diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue index 4d7726c30..796a46b3b 100644 --- a/resources/assets/js/pages/manage/approve/index.vue +++ b/resources/assets/js/pages/manage/approve/index.vue @@ -492,21 +492,22 @@ export default { // 列表点击事件 clickList(item){ - this.unreadList.map(h=>{ h._active = false; }) - this.doneList.map(h=>{ h._active = false; }) - this.notifyList.map(h=>{ h._active = false; }) - this.initiatedList.map(h=>{ h._active = false; }) - item._active = true; + this.unreadList.map(h => { h._active = false; }) + this.doneList.map(h => { h._active = false; }) + this.notifyList.map(h => { h._active = false; }) + this.initiatedList.map(h => { h._active = false; }) // - if( window.innerWidth < 426 ){ - this.goForward({name: 'manage-approve-details', query: { id: item.id } }); + if (window.innerWidth < 426) { + this.goForward({ name: 'manage-approve-details', query: { id: item.id } }); return; } - if( window.innerWidth < 1010 ){ + if (window.innerWidth < 1010) { this.detailsShow = true; + } else { + item._active = true; } this.details = {} - this.$nextTick(()=>{ + this.$nextTick(() => { this.details = item }) }, @@ -649,19 +650,21 @@ export default { // 更新数据 updateData(key,data,type) { let listKey = key + 'List' - let activeIndex = this[listKey].map((h, index) => h._active ? index : -1).filter(h => h > -1)[0] || 0 this[key + 'Total'] = data.total; type != 'scroll' ? (this[listKey] = data.rows) : data.rows.map(h => { if (this[listKey].map(item => { return item.id }).indexOf(h.id) == -1) { this[listKey].push(h) } }); - if(this[listKey].length > 0){ - this[listKey][activeIndex]._active = true; - if (this.tabsValue == key) { - this.$nextTick(() => { - this.details = this[listKey][activeIndex] || {} - }) + if (window.innerWidth > 1010){ + let activeIndex = this[listKey].map((h, index) => h._active ? index : -1).filter(h => h > -1)[0] || 0 + if (this[listKey].length > 0){ + this[listKey][activeIndex]._active = true; + if (this.tabsValue == key) { + this.$nextTick(() => { + this.details = this[listKey][activeIndex] || {} + }) + } } } }, diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss index c5e81527a..695376d94 100644 --- a/resources/assets/sass/pages/page-approve.scss +++ b/resources/assets/sass/pages/page-approve.scss @@ -166,6 +166,9 @@ .approve-list-active { border: 1px solid #8bcf70; + @media (max-width: 1010px) { + border: 1px solid #eeeeee; + } } } @@ -405,9 +408,7 @@ bottom: 1px; display: flex; z-index: 9; - // background: #ffffff; background: #00000005; - } .comment { From c9234a4b491ee61ac1611e75c5228b1de825a601 Mon Sep 17 00:00:00 2001 From: weifs <605403358@qq.com> Date: Thu, 29 Feb 2024 16:22:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=20=E5=8D=87=E7=BA=A7okr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a4c6d2f85..0e6bf94c5 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -178,7 +178,7 @@ services: okr: container_name: "dootask-okr-${APP_ID}" - image: "kuaifan/doookr:0.0.36" + image: "kuaifan/doookr:0.0.37" environment: TZ: "${TIMEZONE:-PRC}" DOO_TASK_URL: "http://${APP_IPPR}.3" From 6230bf94c5abfa7e67c6226e0b0dc088d80ff055 Mon Sep 17 00:00:00 2001 From: zzw <2318266924@qq.com> Date: Fri, 1 Mar 2024 17:47:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4gemini=E6=9C=BA?= =?UTF-8?q?=E5=99=A8=E4=BA=BA=E8=AE=BE=E7=BD=AE=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/SystemController.php | 2 ++ app/Tasks/BotReceiveMsgTask.php | 1 + .../assets/js/pages/manage/setting/components/SystemAibot.vue | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index 2e2033b20..9fd3eac47 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -275,6 +275,7 @@ class SystemController extends AbstractController 'gemini_key', 'gemini_model', 'gemini_agency', + 'gemini_timeout' ]; if ($type == 'save') { @@ -326,6 +327,7 @@ class SystemController extends AbstractController $setting['wenxin_model'] = $setting['wenxin_model'] ?: 'eb-instant'; $setting['qianwen_model'] = $setting['qianwen_model'] ?: 'qwen-v1'; $setting['gemini_model'] = $setting['gemini_model'] ?: 'gemini-1.0-pro'; + $setting['gemini_timeout'] = $setting['gemini_timeout'] ?: 20; if (env("SYSTEM_SETTING") == 'disabled') { foreach ($keys as $item) { if (strlen($setting[$item]) > 12) { diff --git a/app/Tasks/BotReceiveMsgTask.php b/app/Tasks/BotReceiveMsgTask.php index be49abf66..7d8753d9e 100644 --- a/app/Tasks/BotReceiveMsgTask.php +++ b/app/Tasks/BotReceiveMsgTask.php @@ -446,6 +446,7 @@ class BotReceiveMsgTask extends AbstractTask 'gemini_key' => $setting['gemini_key'], 'gemini_model' => $setting['gemini_model'], 'gemini_agency' => $setting['gemini_agency'], + 'gemini_timeout' => $setting['gemini_timeout'], 'server_url' => $serverUrl, ]; if (empty($extras['gemini_key'])) { diff --git a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue index 33f013763..cc1f9d7b2 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemAibot.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemAibot.vue @@ -83,10 +83,12 @@
{{$L('查看说明')}} https://ai.google.dev/models?hl=zh-cn
 + + +
{{$L('例如：http://proxy.com 或 socks5://proxy.com')}}