代码优化
This commit is contained in:
@@ -63,8 +63,8 @@ const NewMomentsSync: React.FC = () => {
|
||||
if (res) {
|
||||
setFormData({
|
||||
taskName: res.name,
|
||||
startTime: res.timeRange?.start || "06:00",
|
||||
endTime: res.timeRange?.end || "23:59",
|
||||
startTime: res.config?.startTime || "06:00",
|
||||
endTime: res.config?.endTime || "23:59",
|
||||
syncCount: res.config?.syncCount || res.syncCount || 5,
|
||||
syncInterval: res.config?.syncInterval || res.syncInterval || 30,
|
||||
syncType: res.config?.syncType,
|
||||
|
||||
@@ -17,7 +17,7 @@ class MomentsController extends BaseController
|
||||
// 获取授权token
|
||||
$authorization = $this->authorization;
|
||||
if (empty($authorization)) {
|
||||
return errorJson('缺少授权信息');
|
||||
return json_encode(['msg' => '缺少授权信息','code' => 400]);
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -42,18 +42,18 @@ class MomentsController extends BaseController
|
||||
|
||||
// 必填参数验证
|
||||
if (empty($jobPublishWechatMomentsItems) || !is_array($jobPublishWechatMomentsItems)) {
|
||||
return errorJson('至少需要选择一个发布账号');
|
||||
return json_encode(['msg' => '至少需要选择一个发布账号','code' => 400]);
|
||||
}
|
||||
|
||||
// 根据朋友圈类型验证必填字段
|
||||
if ($momentContentType == 1 && empty($text)) { // 纯文本
|
||||
return errorJson('朋友圈内容不能为空');
|
||||
return json_encode(['msg' => '朋友圈内容不能为空','code' => 400]);
|
||||
} else if ($momentContentType == 2 && (empty($picUrlList) || empty($text))) { // 图片+文字
|
||||
return errorJson('朋友圈内容和图片不能为空');
|
||||
return json_encode(['msg' => '朋友圈内容和图片不能为空','code' => 400]);
|
||||
} else if ($momentContentType == 3 && (empty($videoUrl) || empty($text))) { // 视频+文字
|
||||
return errorJson('朋友圈内容和视频不能为空');
|
||||
return json_encode(['msg' => '朋友圈内容和视频不能为空','code' => 400]);
|
||||
} else if ($momentContentType == 4 && (empty($link) || empty($text))) { // 链接+文字
|
||||
return errorJson('朋友圈内容和链接不能为空');
|
||||
return json_encode(['msg' => '朋友圈内容和链接不能为空','code' => 400]);
|
||||
}
|
||||
|
||||
// 构建请求参数
|
||||
@@ -84,13 +84,13 @@ class MomentsController extends BaseController
|
||||
$result = requestCurl($this->baseUrl . 'api/JobPublishWechatMoments/addJob', $params, 'POST', $header, 'json');
|
||||
// 处理响应
|
||||
if (empty($result)) {
|
||||
return successJson([], '朋友圈任务创建成功');
|
||||
return json_encode(['msg' => '朋友圈任务创建成功','code' => 200]);
|
||||
} else {
|
||||
// 如果返回的是错误信息
|
||||
return errorJson($result);
|
||||
return json_encode(['msg' => $result,'code' => 400]);
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
return errorJson('发布朋友圈失败:' . $e->getMessage());
|
||||
return json_encode(['msg' => '发布朋友圈失败','code' => 400]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -130,11 +130,14 @@ class WorkbenchMomentsJob
|
||||
|
||||
// 3) 下发
|
||||
$moments = new Moments();
|
||||
$moments->addJob($sendData);
|
||||
KfMoments::where(['id' => $val['id']])->update(['isSend' => 1]);
|
||||
$res = $moments->addJob($sendData);
|
||||
$res = json_decode($res, true);
|
||||
if ($res['code'] == 200){
|
||||
KfMoments::where(['id' => $val['id']])->update(['isSend' => 1]);
|
||||
|
||||
// 4) 统计
|
||||
$this->incrementSendStats($companyId, $userId, $allowed);
|
||||
// 4) 统计
|
||||
$this->incrementSendStats($companyId, $userId, $allowed);
|
||||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
Log::error("朋友圈同步任务异常: " . $e->getMessage());
|
||||
@@ -334,9 +337,12 @@ class WorkbenchMomentsJob
|
||||
];
|
||||
// 发送朋友圈
|
||||
$moments = new Moments();
|
||||
$moments->addJob($data);
|
||||
// 记录发送记录
|
||||
$this->recordSendHistory($workbench, $devices, $contentLibrary);
|
||||
$res = $moments->addJob($data);
|
||||
$res = json_decode($res,true);
|
||||
if ($res['code'] == 200){
|
||||
// 记录发送记录
|
||||
$this->recordSendHistory($workbench, $devices, $contentLibrary);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user