修复 路由问题

This commit is contained in:
iVampireSP.com 2022-09-09 02:35:00 +08:00
parent 386a3e7f20
commit 2a20a17bac
No known key found for this signature in database
GPG Key ID: 2F7B001CA27A8132
4 changed files with 21 additions and 11 deletions

View File

@ -2,12 +2,9 @@
namespace App\Http\Controllers\Remote\Host; namespace App\Http\Controllers\Remote\Host;
use App\Models\Host;
use Ramsey\Uuid\Uuid;
use App\Models\User\Task; use App\Models\User\Task;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Cache;
class TaskController extends Controller class TaskController extends Controller
{ {
@ -63,8 +60,10 @@ public function update(Request $request, Task $task)
'status' => 'sometimes|in:pending,processing,need_operation,done,success,failed,error,canceled', 'status' => 'sometimes|in:pending,processing,need_operation,done,success,failed,error,canceled',
]); ]);
$task->update($request->all()); $task->update($request->all());
return $this->updated($task); return $this->updated($task);
} }
} }

View File

@ -26,12 +26,17 @@ class Task extends Model
public $incrementing = false; public $incrementing = false;
public function scopeUser($query) { // key type string
protected $keyType = 'string';
public function scopeUser($query)
{
return $query->where('user_id', auth()->id()); return $query->where('user_id', auth()->id());
} }
public function host() { public function host()
{
return $this->belongsTo(Host::class); return $this->belongsTo(Host::class);
} }
@ -43,6 +48,7 @@ protected static function boot()
// id 为 uuid // id 为 uuid
$model->id = Uuid::uuid4()->toString(); $model->id = Uuid::uuid4()->toString();
// host_id 和 user_id 至少存在一个 // host_id 和 user_id 至少存在一个
if (!$model->host_id && !$model->user_id) { if (!$model->host_id && !$model->user_id) {
throw new CommonException('host_id 和 user_id 至少存在一个'); throw new CommonException('host_id 和 user_id 至少存在一个');
@ -51,17 +57,22 @@ protected static function boot()
// if host_id // if host_id
if ($model->host_id) { if ($model->host_id) {
$model->load('host'); $model->load('host');
// dd($model);
if ($model->host === null) {
throw new CommonException('host_id 不存在');
}
// dd($model);
// dd($model->host_id); // dd($model->host_id);
// $host = Host::where('id', $model->host_id)->first(); // $host = Host::where('id', $model->host_id)->first();
// dd($host); // dd($host);
$model->user_id = $model->host->user_id; $model->user_id = $model->host->user_id;
} }
}); });
// updateing // updateing

View File

@ -70,7 +70,7 @@ private function alipayOptions()
// $options->alipayPublicKey = Storage::get('alipayCertPublicKey_RSA2.crt'); // $options->alipayPublicKey = Storage::get('alipayCertPublicKey_RSA2.crt');
//可设置异步通知接收服务地址(可选) //可设置异步通知接收服务地址(可选)
$options->notifyUrl = "http://rcrmqishil.sharedwithexpose.com/api/pay/notify"; $options->notifyUrl = route('balances.notify');
return $options; return $options;

View File

@ -31,13 +31,13 @@
$router->post('/', [ $router->post('/', [
'uses' => 'Host\TaskController@store' 'uses' => 'Host\TaskController@store'
]); ]);
$router->get('/{tasks}', [ $router->get('/{task}', [
'uses' => 'Host\TaskController@show' 'uses' => 'Host\TaskController@show'
]); ]);
$router->patch('/{tasks}', [ $router->patch('/{task}', [
'uses' => 'Host\TaskController@update' 'uses' => 'Host\TaskController@update'
]); ]);
$router->delete('/{tasks}', [ $router->delete('/{task}', [
'uses' => 'Host\TaskController@destroy' 'uses' => 'Host\TaskController@destroy'
]); ]);
}); });