zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.nuttyreading.com/zm/tougao

Browse Source
This commit is contained in:
wyn
2026-08-04 10:38:58 +08:00
parent 97fa5ed432 a3a0ceef17
commit 485d7c8d97
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -89,7 +89,7 @@ citation_chat_timeout = 120
[expert_country] [expert_country]
chat_url_local = http://125.39.141.154:10002/v1/chat/completions chat_url_local = http://125.39.141.154:10002/v1/chat/completions
chat_url_remote = http://chat.taimed.cn/v1/chat/completions chat_url_remote = http://chat.taimed.cn/v1/chat/completions
context_limit = 2000 context_limit = 200
[scopus] [scopus]
api_key = 54f915fc96e86b94ae8722ce7fdd69c7 api_key = 54f915fc96e86b94ae8722ce7fdd69c7

4
application/api/controller/EmailClient.php
View File

@@ -2405,8 +2405,8 @@ class EmailClient extends Base
'bounce_count' => 0, 'bounce_count' => 0,
'state' => 0, 'state' => 0,
'smtp_ids' => $smtpIds, 'smtp_ids' => $smtpIds,
'min_interval' => 30, 'min_interval' => max(intval($factory['min_interval']),30),
'max_interval' => 60, 'max_interval' => max(intval($factory['max_interval']),60),
'max_bounce_rate' => 5, 'max_bounce_rate' => 5,
'no_repeat_days' => $noRepeatDays, 'no_repeat_days' => $noRepeatDays,
'send_start_hour' => 8, 'send_start_hour' => 8,

5
application/api/controller/PromotionFactory.php
View File

@@ -128,6 +128,8 @@ class PromotionFactory extends Base
'fetch_ids' => trim(isset($data['fetch_ids']) ? (string)$data['fetch_ids'] : ''), 'fetch_ids' => trim(isset($data['fetch_ids']) ? (string)$data['fetch_ids'] : ''),
'target_partitions' => trim(isset($data['target_partitions']) ? (string)$data['target_partitions'] : ''), 'target_partitions' => trim(isset($data['target_partitions']) ? (string)$data['target_partitions'] : ''),
'target_country_ids' => trim(isset($data['target_country_ids']) ? (string)$data['target_country_ids'] : ''), 'target_country_ids' => trim(isset($data['target_country_ids']) ? (string)$data['target_country_ids'] : ''),
'min_interval' => intval(isset($data['min_interval']) ? $data['min_interval'] : 0),
'max_interval' => intval(isset($data['max_interval']) ? $data['max_interval'] : 0),
'state' => 0, 'state' => 0,
'ctime' => $now, 'ctime' => $now,
]); ]);
@@ -185,9 +187,10 @@ class PromotionFactory extends Base
$allowedFields = [ $allowedFields = [
'type', 'expert_type', 'email_ids', 'send_count', 'type', 'expert_type', 'email_ids', 'send_count',
'template_id', 'style_id', 'fetch_ids', 'template_id', 'style_id', 'fetch_ids',
'min_interval', 'max_interval',
'target_partitions', 'target_country_ids', 'target_partitions', 'target_country_ids',
]; ];
$intFields = ['type', 'expert_type', 'send_count', 'template_id', 'style_id']; $intFields = ['type', 'expert_type', 'send_count', 'template_id', 'style_id', 'min_interval', 'max_interval'];
foreach ($allowedFields as $f) { foreach ($allowedFields as $f) {
if (isset($data[$f])) { if (isset($data[$f])) {

2
application/api/job/FillExpertCountry.php
View File

@@ -34,6 +34,6 @@ class FillExpertCountry
$job->delete(); $job->delete();
// 链式：下一条也不透传固定 URL，继续按条动态选模型 // 链式：下一条也不透传固定 URL，继续按条动态选模型
$service->enqueueNextCountryFill(1, $queue, ''); // $service->enqueueNextCountryFill(5, $queue, '');
} }
} }