mirror of
https://github.com/ProxyPanel/ProxyPanel.git
synced 2026-04-06 20:50:01 +00:00
8f06a74b48
1. 修复原版本中节点/用户每日流量日志记录错误； 原版：在30号看到的29号的总流量，其实是28号当天产生的流量；依次类推全部流量都错位1天； 现：日流量表精确到当天，天流量表精确到当前； 2. 修复原流量折线图的日期-流量配对错误； 原版：并不是按照记录日期，而是按照有的记录； 现：按照记录日期排序； ----- 以上皆为SSRPanel中遗留的问题代码----- 3. 简化，规范化日期转换 4. 清理多余代码；
115 lines
2.8 KiB
PHP
115 lines
2.8 KiB
PHP
<?php
|
||
|
||
namespace App\Http\Controllers\Admin;
|
||
|
||
use App\Components\Helpers;
|
||
use App\Http\Controllers\Controller;
|
||
use App\Models\Marketing;
|
||
use DB;
|
||
use Exception;
|
||
use GuzzleHttp\Client;
|
||
use Illuminate\Http\JsonResponse;
|
||
use Illuminate\Http\Request;
|
||
use Log;
|
||
use Response;
|
||
use RuntimeException;
|
||
|
||
/**
|
||
* 促销控制器
|
||
*
|
||
* Class MarketingController
|
||
*
|
||
* @package App\Http\Controllers\Controller
|
||
*/
|
||
class MarketingController extends Controller {
|
||
protected static $systemConfig;
|
||
|
||
public function __construct() {
|
||
self::$systemConfig = Helpers::systemConfig();
|
||
}
|
||
|
||
// 邮件群发消息列表
|
||
public function emailList(Request $request): \Illuminate\Http\Response {
|
||
$status = $request->input('status');
|
||
|
||
$query = Marketing::query()->whereType(1);
|
||
|
||
if(isset($status)){
|
||
$query->whereStatus($status);
|
||
}
|
||
|
||
$view['list'] = $query->paginate(15)->appends($request->except('page'));
|
||
|
||
return Response::view('admin.marketing.emailList', $view);
|
||
}
|
||
|
||
// 消息通道群发列表
|
||
public function pushList(Request $request): \Illuminate\Http\Response {
|
||
$status = $request->input('status');
|
||
|
||
$query = Marketing::query()->whereType(2);
|
||
|
||
if(isset($status)){
|
||
$query->whereStatus($status);
|
||
}
|
||
|
||
$view['list'] = $query->paginate(15);
|
||
|
||
return Response::view('admin.marketing.pushList', $view);
|
||
}
|
||
|
||
// 添加推送消息
|
||
public function addPushMarketing(Request $request): ?JsonResponse {
|
||
$title = $request->input('title');
|
||
$content = $request->input('content');
|
||
|
||
if(!self::$systemConfig['is_push_bear']){
|
||
return Response::json(['status' => 'fail', 'message' => '推送失败：请先启用并配置PushBear']);
|
||
}
|
||
|
||
try{
|
||
DB::beginTransaction();
|
||
|
||
$response = (new Client())->get('https://pushbear.ftqq.com/sub', [
|
||
'query' => [
|
||
'sendkey' => self::$systemConfig['push_bear_send_key'],
|
||
'text' => $title,
|
||
'desp' => $content
|
||
]
|
||
]);
|
||
|
||
$result = json_decode($response->getBody(), true);
|
||
if($result->code){ // 失败
|
||
$this->addMarketing(2, $title, $content, -1, $result->message);
|
||
|
||
throw new RuntimeException($result->message);
|
||
}
|
||
|
||
$this->addMarketing(2, $title, $content, 1);
|
||
|
||
DB::commit();
|
||
|
||
return Response::json(['status' => 'success', 'message' => '推送成功']);
|
||
}catch(Exception $e){
|
||
Log::info('PushBear消息推送失败：'.$e->getMessage());
|
||
|
||
DB::rollBack();
|
||
|
||
return Response::json(['status' => 'fail', 'message' => '推送失败：'.$e->getMessage()]);
|
||
}
|
||
}
|
||
|
||
private function addMarketing($type = 1, $title = '', $content = '', $status = 1, $error = '', $receiver = ''
|
||
): bool {
|
||
$marketing = new Marketing();
|
||
$marketing->type = $type;
|
||
$marketing->receiver = $receiver;
|
||
$marketing->title = $title;
|
||
$marketing->content = $content;
|
||
$marketing->error = $error;
|
||
$marketing->status = $status;
|
||
|
||
return $marketing->save();
|
||
}
|
||
}
|