mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into chenbo_dev_0904

Browse Source
This commit is contained in:
chenbo 2023-09-05 14:20:27 +08:00
commit d7981fdd94
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/controller/CronController.php
View File

@ -28,6 +28,8 @@ class CronController extends BaseApiController
queue(TaskInformationJob::class,$v); queue(TaskInformationJob::class,$v);
} }
Log::info('定时任务结算执行成功'.date('Y-m-d H:i:s')); Log::info('定时任务结算执行成功'.date('Y-m-d H:i:s'));
return $this->success('定时任务结算执行成功');
} }
public function task_add(){ public function task_add(){

4
app/api/controller/RemoteController.php
View File

@ -63,7 +63,7 @@ class RemoteController extends BaseApiController
return false; return false;
} }
try { try {
$res = HttpClient::create()->request('GET', 'https://crmeb-test.shop.lihaink.cn/api/order/statistics', [ $res = HttpClient::create()->request('GET', env('url.shop_prefix').'/api/order/statistics', [
'query' => $parmas, 'query' => $parmas,
]); ]);
$json = json_decode($res->getContent(), true); $json = json_decode($res->getContent(), true);
@ -155,7 +155,7 @@ class RemoteController extends BaseApiController
} }
try{ try{
$list = HttpClient::create()->request('GET', 'https://crmeb-test.shop.lihaink.cn/api/region/order', [ $list = HttpClient::create()->request('GET', env('url.shop_prefix').'/api/region/order', [
'query' => $parmas, 'query' => $parmas,
]); ]);
$json_list = json_decode($list->getContent(), true); $json_list = json_decode($list->getContent(), true);