|
|
@@ -8,6 +8,7 @@ use App\Models\Prediction;
|
|
|
use App\Services\IssueService;
|
|
|
use Illuminate\Validation\ValidationException;
|
|
|
use Exception;
|
|
|
+use Carbon\Carbon;
|
|
|
|
|
|
class Issue extends BaseController
|
|
|
{
|
|
|
@@ -24,10 +25,10 @@ class Issue extends BaseController
|
|
|
function yuanTou()
|
|
|
{
|
|
|
$data = file_get_contents("https://pc28ya.com/index.php?action=getMyOpensJson");
|
|
|
- $data = json_decode($data,true);
|
|
|
+ $data = json_decode($data, true);
|
|
|
$data = array_reverse($data['data']);
|
|
|
- foreach ($data as &$item){
|
|
|
- $item['keno'] = explode(',',$item['keno']);
|
|
|
+ foreach ($data as &$item) {
|
|
|
+ $item['keno'] = explode(',', $item['keno']);
|
|
|
sort($item['keno']);
|
|
|
}
|
|
|
return $this->success($data);
|
|
|
@@ -39,8 +40,8 @@ class Issue extends BaseController
|
|
|
* @apiGroup Issue
|
|
|
* @apiVersion 1.0.0
|
|
|
*
|
|
|
- * @apiParam {String} [date] 日期 默认当天
|
|
|
- * - 格式：yyyy-mm-dd
|
|
|
+ * @apiParam {int} date 日期 默认0
|
|
|
+ * - 前1天 则date=1 前2天则date=2
|
|
|
*
|
|
|
* @apiSuccess {int} code
|
|
|
* @apiSuccess {int} timestamp
|
|
|
@@ -69,10 +70,10 @@ class Issue extends BaseController
|
|
|
{
|
|
|
try {
|
|
|
request()->validate([
|
|
|
- 'date' => ['nullable', 'date', 'date_format:Y-m-d']
|
|
|
+ 'date' => ['required', 'integer', 'min:0', 'max:30']
|
|
|
]);
|
|
|
- $date = request()->input('date', null);
|
|
|
- if (!$date) $date = date("Y-m-d");
|
|
|
+ $date = request()->input('date');
|
|
|
+ $date = Carbon::now()->subDays($date)->toDateString();
|
|
|
$list = CaoHistory::where('date', $date)->get()->toArray();
|
|
|
if (count($list) > 0) {
|
|
|
$list = $list[0];
|
|
|
@@ -303,9 +304,9 @@ class Issue extends BaseController
|
|
|
->where('id', '<=', 91)
|
|
|
->get();
|
|
|
|
|
|
- $count = \App\Models\Issue::count();
|
|
|
+ $count = Cao::whereIn('id', [1, 2])->sum('val');
|
|
|
$data = [
|
|
|
- 'total' => $count,
|
|
|
+ 'total' => intval($count),
|
|
|
'list' => $list
|
|
|
];
|
|
|
|
seven