定时任务提交
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\common\model\CompanyAccountModel;
|
||||
use app\api\model\CompanyAccountModel;
|
||||
use think\facade\Request;
|
||||
|
||||
class AccountController extends BaseController
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\common\model\UserModel;
|
||||
use app\common\model\UserTokenModel;
|
||||
use think\Controller;
|
||||
use think\facade\Env;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\common\model\DeviceModel;
|
||||
use app\api\model\DeviceModel;
|
||||
use think\facade\Request;
|
||||
use think\facade\Env;
|
||||
use Endroid\QrCode\QrCode;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\common\model\FriendTaskModel;
|
||||
use app\api\model\FriendTaskModel;
|
||||
use think\facade\Request;
|
||||
|
||||
class FriendTaskController extends BaseController
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\common\model\CompanyAccountModel;
|
||||
use app\api\model\CompanyAccountModel;
|
||||
use think\facade\Env;
|
||||
use think\Response;
|
||||
|
||||
|
||||
@@ -100,12 +100,13 @@ class WebSocketController extends BaseController
|
||||
$result = json_encode($result);
|
||||
$this->client->send($result);
|
||||
$message = $this->client->receive();
|
||||
$message = json_decode($message, 1);
|
||||
//关闭WS链接
|
||||
$this->client->close();
|
||||
Log::write('WS个人消息发送');
|
||||
$this->success('消息成功发送', json_decode($message, 1), 200);
|
||||
//Log::write('WS个人消息发送');
|
||||
successJson($message, '消息成功发送');
|
||||
} else {
|
||||
$this->error('非法请求');
|
||||
errorJson('非法请求');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -160,17 +161,16 @@ class WebSocketController extends BaseController
|
||||
$message = $this->client->receive();
|
||||
//关闭WS链接
|
||||
$this->client->close();
|
||||
Log::write('WS群消息发送');
|
||||
Log::write($message);
|
||||
//Log::write('WS群消息发送');
|
||||
//Log::write($message);
|
||||
$message = json_decode($message, 1);
|
||||
} catch (\Exception $e) {
|
||||
$msg = $e->getMessage();
|
||||
}
|
||||
|
||||
$this->success($msg, $message, 200);
|
||||
successJson($message,$msg);
|
||||
|
||||
} else {
|
||||
$this->error('非法请求');
|
||||
errorJson('非法请求');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -224,15 +224,14 @@ class WebSocketController extends BaseController
|
||||
$message = $this->client->receive();
|
||||
//关闭WS链接
|
||||
$this->client->close();
|
||||
Log::write('WS群消息发送');
|
||||
Log::write($message);
|
||||
//Log::write('WS群消息发送');
|
||||
//Log::write($message);
|
||||
$message = json_decode($message, 1);
|
||||
} catch (\Exception $e) {
|
||||
$msg = $e->getMessage();
|
||||
}
|
||||
|
||||
$this->success($msg, $message, 200);
|
||||
|
||||
successJson($message,$msg);
|
||||
}
|
||||
|
||||
|
||||
@@ -274,10 +273,10 @@ class WebSocketController extends BaseController
|
||||
"seq" => time(),
|
||||
];
|
||||
$params = json_encode($params);
|
||||
Log::write('WS获取朋友圈信息参数:' . json_encode($params, 256));
|
||||
//Log::write('WS获取朋友圈信息参数:' . json_encode($params, 256));
|
||||
$this->client->send($params);
|
||||
$message = $this->client->receive();
|
||||
Log::write('WS获取朋友圈信息成功,结果:' . $message);
|
||||
//Log::write('WS获取朋友圈信息成功,结果:' . $message);
|
||||
$message = json_decode($message, 1);
|
||||
|
||||
// 存储朋友圈数据到数据库
|
||||
@@ -290,9 +289,10 @@ class WebSocketController extends BaseController
|
||||
} catch (\Exception $e) {
|
||||
$msg = $e->getMessage();
|
||||
}
|
||||
$this->success($msg, $message, 200);
|
||||
|
||||
successJson($message,$msg);
|
||||
} else {
|
||||
$this->error('非法请求');
|
||||
errorJson('非法请求');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -348,10 +348,10 @@ class WebSocketController extends BaseController
|
||||
}
|
||||
}
|
||||
|
||||
Log::write('朋友圈数据已存入数据库,共' . count($momentList) . '条');
|
||||
//Log::write('朋友圈数据已存入数据库,共' . count($momentList) . '条');
|
||||
return true;
|
||||
} catch (\Exception $e) {
|
||||
Log::write('保存朋友圈数据失败:' . $e->getMessage(), 'error');
|
||||
//Log::write('保存朋友圈数据失败:' . $e->getMessage(), 'error');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -396,15 +396,16 @@ class WebSocketController extends BaseController
|
||||
$params = json_encode($params);
|
||||
$this->client->send($params);
|
||||
$message = $this->client->receive();
|
||||
Log::write('WS获取朋友圈图片/视频链接成功,结果:' . json_encode($message, 256));
|
||||
//Log::write('WS获取朋友圈图片/视频链接成功,结果:' . json_encode($message, 256));
|
||||
//关闭WS链接
|
||||
$this->client->close();
|
||||
} catch (\Exception $e) {
|
||||
$msg = $e->getMessage();
|
||||
}
|
||||
$this->success($msg, $message, 200);
|
||||
|
||||
successJson($message,$msg);
|
||||
} else {
|
||||
$this->error('非法请求');
|
||||
errorJson('非法请求');
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,8 +2,9 @@
|
||||
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\common\model\WechatChatroomModel;
|
||||
use app\common\model\WechatChatroomMemberModel;
|
||||
use app\api\model\WechatChatroomModel;
|
||||
use app\api\model\WechatChatroomMemberModel;
|
||||
use app\job\WechatChatroomJob;
|
||||
use think\facade\Request;
|
||||
|
||||
class WechatChatroomController extends BaseController
|
||||
@@ -180,4 +181,32 @@ class WechatChatroomController extends BaseController
|
||||
WechatChatroomMemberModel::create($data);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 同步微信群聊数据
|
||||
* 此方法用于手动触发微信群聊数据同步任务
|
||||
* @return \think\response\Json
|
||||
*/
|
||||
public function syncChatrooms()
|
||||
{
|
||||
try {
|
||||
// 获取请求参数
|
||||
$pageIndex = $this->request->param('pageIndex', 0);
|
||||
$pageSize = $this->request->param('pageSize', 100);
|
||||
$keyword = $this->request->param('keyword', '');
|
||||
$wechatAccountKeyword = $this->request->param('wechatAccountKeyword', '');
|
||||
$isDeleted = $this->request->param('isDeleted', '');
|
||||
|
||||
// 添加同步任务到队列
|
||||
$result = WechatChatroomJob::addSyncTask($pageIndex, $pageSize, $keyword, $wechatAccountKeyword, $isDeleted);
|
||||
|
||||
if ($result) {
|
||||
return successJson([], '微信群聊同步任务已添加到队列');
|
||||
} else {
|
||||
return errorJson('添加同步任务失败');
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
return errorJson('添加同步任务异常:' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\common\model\WechatAccountModel;
|
||||
use app\api\model\WechatAccountModel;
|
||||
|
||||
class WechatController extends BaseController
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\common\model\WechatFriendModel;
|
||||
use app\api\model\WechatFriendModel;
|
||||
use think\facade\Request;
|
||||
|
||||
class WechatFriendController extends BaseController
|
||||
|
||||
10
Server/application/api/model/CompanyAccountModel.php
Normal file
10
Server/application/api/model/CompanyAccountModel.php
Normal file
@@ -0,0 +1,10 @@
|
||||
<?php
|
||||
|
||||
namespace app\api\model;
|
||||
|
||||
use think\Model;
|
||||
|
||||
class CompanyAccountModel extends Model
|
||||
{
|
||||
|
||||
}
|
||||
9
Server/application/api/model/DeviceModel.php
Normal file
9
Server/application/api/model/DeviceModel.php
Normal file
@@ -0,0 +1,9 @@
|
||||
<?php
|
||||
|
||||
namespace app\api\model;
|
||||
|
||||
use think\Model;
|
||||
|
||||
class DeviceModel extends Model {
|
||||
|
||||
}
|
||||
10
Server/application/api/model/FriendTaskModel.php
Normal file
10
Server/application/api/model/FriendTaskModel.php
Normal file
@@ -0,0 +1,10 @@
|
||||
<?php
|
||||
|
||||
namespace app\api\model;
|
||||
|
||||
use think\Model;
|
||||
|
||||
class FriendTaskModel extends Model
|
||||
{
|
||||
|
||||
}
|
||||
10
Server/application/api/model/WechatAccountModel.php
Normal file
10
Server/application/api/model/WechatAccountModel.php
Normal file
@@ -0,0 +1,10 @@
|
||||
<?php
|
||||
|
||||
namespace app\api\model;
|
||||
|
||||
use think\Model;
|
||||
|
||||
class WechatAccountModel extends Model
|
||||
{
|
||||
|
||||
}
|
||||
10
Server/application/api/model/WechatChatroomMemberModel.php
Normal file
10
Server/application/api/model/WechatChatroomMemberModel.php
Normal file
@@ -0,0 +1,10 @@
|
||||
<?php
|
||||
|
||||
namespace app\api\model;
|
||||
|
||||
use think\Model;
|
||||
|
||||
class WechatChatroomMemberModel extends Model
|
||||
{
|
||||
|
||||
}
|
||||
10
Server/application/api/model/WechatChatroomModel.php
Normal file
10
Server/application/api/model/WechatChatroomModel.php
Normal file
@@ -0,0 +1,10 @@
|
||||
<?php
|
||||
|
||||
namespace app\api\model;
|
||||
|
||||
use think\Model;
|
||||
|
||||
class WechatChatroomModel extends Model
|
||||
{
|
||||
|
||||
}
|
||||
10
Server/application/api/model/WechatFriendModel.php
Normal file
10
Server/application/api/model/WechatFriendModel.php
Normal file
@@ -0,0 +1,10 @@
|
||||
<?php
|
||||
|
||||
namespace app\api\model;
|
||||
|
||||
use think\Model;
|
||||
|
||||
class WechatFriendModel extends Model
|
||||
{
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user