lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-14 04:20:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/php8' into php8

Browse Source
This commit is contained in:
xiaomlove
2021-04-21 00:11:11 +08:00
parent c7a6616618 15bd8e800b
commit 85571dd55f
160 changed files with 127343 additions and 10808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Controllers/AgentAllowController.php
View File

@@ -2,7 +2,6 @@
namespace App\Http\Controllers;
use App\Http\Requests\AgentAllowRequest;
use App\Http\Resources\AgentAllowResource;
use App\Models\AgentAllow;
use Illuminate\Http\Request;
@@ -16,33 +15,33 @@ class AgentAllowController extends Controller
*/
public function index()
{
$result = AgentAllow::query()->paginate();
$result = AgentAllow::query()->orderBy('id', 'desc')->paginate();
$resource = AgentAllowResource::collection($result);
return success('agent allow list', $resource);
return $this->success($resource);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return array
* @return \Illuminate\Http\Response
*/
public function store(AgentAllowRequest $request)
public function store(Request $request)
{
$result = AgentAllow::query()->create($request->all());
$resource = new AgentAllowResource($result);
return success('agent allow store', $resource);
//
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
* @return array
*/
public function show($id)
{
//
$result = AgentAllow::query()->findOrFail($id);
$resource = new AgentAllowResource($result);
return $this->success($resource);
}
/**
@@ -57,7 +56,7 @@ class AgentAllowController extends Controller
$result = AgentAllow::query()->findOrFail($id);
$result->update($request->all());
$resource = new AgentAllowResource($result);
return success('agent allow update', $resource);
return $this->success($resource);
}
/**
@@ -69,7 +68,7 @@ class AgentAllowController extends Controller
public function destroy($id)
{
$result = AgentAllow::query()->findOrFail($id);
$success = $result->delete();
return success('agent allow delete', $success);
$deleted = $result->delete();
return $this->success([$deleted]);
}
}

43
app/Http/Controllers/Controller.php
View File

@@ -6,8 +6,51 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Support\Str;
class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
public function success($data, $msg = null)
{
if (is_null($msg)) {
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
$caller = $backtrace[1];
$msg = $this->getReturnMsg($caller);
}
return success($msg, $data);
}
public function fail($data, $msg = null)
{
if (is_null($msg)) {
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
$caller = $backtrace[1];
$msg = $this->getReturnMsg($caller);
}
return fail($msg, $data);
}
protected function getReturnMsg(array $backtrace)
{
$title = $this->title ?? '';
if (empty($title)) {
$title = $backtrace['class'];
$pos = strripos($title, '\\');
$title = substr($title, $pos + 1);
$title = str_replace('Controller', '', $title);
}
$action = $backtrace['function'];
$map = [
'index' => 'list',
'show' => 'detail',
'update' => 'update',
'destroy' => 'delete',
];
if (isset($map[$action])) {
$action = $map[$action];
}
return Str::slug("$title.$action", '.');
}
}

104
app/Http/Controllers/ExamController.php Normal file
View File

@@ -0,0 +1,104 @@
<?php
namespace App\Http\Controllers;
use App\Http\Resources\ExamResource;
use App\Http\Resources\UserResource;
use App\Repositories\ExamRepository;
use App\Repositories\UserRepository;
use Illuminate\Http\Request;
class ExamController extends Controller
{
private $repository;
public function __construct(ExamRepository $repository)
{
$this->repository = $repository;
}
/**
* Display a listing of the resource.
*
* @param Request $request
* @return array
*/
public function index(Request $request)
{
$result = $this->repository->getList($request->all());
$resource = ExamResource::collection($result);
return $this->success($resource);
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return array
*/
public function store(Request $request)
{
$rules = [
'name' => 'required|string',
'begin' => 'required|date_format:Y-m-d H:i:s',
'end' => 'required|date_format:Y-m-d H:i:s',
'requires' => 'required|array|min:1',
'filters' => 'required|array|min:1',
];
$request->validate($rules);
$result = $this->repository->store($request->all());
$resource = new ExamResource($result);
return $this->success($resource);
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return array
*/
public function update(Request $request, $id)
{
$rules = [
'name' => 'required|string',
'begin' => 'required|date_format:Y-m-d H:i:s',
'end' => 'required|date_format:Y-m-d H:i:s',
'requires' => 'required|array|min:1',
'filters' => 'required|array|min:1',
];
$request->validate($rules);
$result = $this->repository->update($request->all(), $id);
$resource = new ExamResource($result);
return $this->success($resource);
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
//
}
public function indexes()
{
$result = $this->repository->listIndexes();
return $this->success($result);
}
}

49
app/Http/Controllers/UserController.php
View File

@@ -3,22 +3,29 @@
namespace App\Http\Controllers;
use App\Http\Resources\UserResource;
use App\Models\User;
use App\Repositories\UserRepository;
use Illuminate\Http\Request;
class UserController extends Controller
{
private $repository;
public function __construct(UserRepository $repository)
{
$this->repository = $repository;
}
/**
* Display a listing of the resource.
*
* @param Request $request
* @return array
*/
public function index(Request $request)
{
$result = (new UserRepository())->getList($request->all());
$result = $this->repository->getList($request->all());
$resource = UserResource::collection($result);
return success('user list', $resource);
return $this->success($resource);
}
/**
@@ -29,9 +36,16 @@ class UserController extends Controller
*/
public function store(Request $request)
{
$result = (new UserRepository())->store($request->all());
$rules = [
'username' => 'required|string',
'email' => 'required|email|unique:users',
'password' => 'required|string|min:6|max:40',
'password_confirmation' => 'required|string|same:password'
];
$request->validate($rules);
$result = $this->repository->store($request->all());
$resource = new UserResource($result);
return success('user store', $resource);
return $this->success($resource);
}
/**
@@ -50,21 +64,40 @@ class UserController extends Controller
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return array
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return array
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
//
}
public function resetPassword(Request $request)
{
$rules = [
'username' => 'required|string|exists:users',
'password' => 'required|string|min:6|max:40',
'password_confirmation' => 'required|same:password',
];
$request->validate($rules);
$result = $this->repository->resetPassword($request->repositoryname, $request->password, $request->password_confirmation);
$resource = new UserResource($result);
return $this->success($resource);
}
public function classes()
{
$result = $this->repository->listClass();
return $this->success($result);
}
}

2
app/Http/Resources/AgentAllowResource.php
View File

@@ -16,6 +16,7 @@ class AgentAllowResource extends JsonResource
{
return [
'id' => $this->id,
'family' => $this->family,
'start_name' => $this->start_name,
'peer_id_pattern' => $this->peer_id_pattern,
'peer_id_match_num' => $this->peer_id_match_num,
@@ -27,6 +28,7 @@ class AgentAllowResource extends JsonResource
'agent_start' => $this->agent_start,
'exception' => $this->exception,
'comment' => $this->comment,
'allowhttps' => $this->allowhttps,
'hits' => $this->hits,
];
}

28
app/Http/Resources/ExamResource.php Normal file
View File

@@ -0,0 +1,28 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
class ExamResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array
*/
public function toArray($request)
{
return [
'id' => $this->id,
'name' => $this->name,
'description' => $this->description,
'begin' => $this->begin,
'end' => $this->end,
'filters' => $this->filters,
'requires' => $this->requires,
'status' => $this->status,
];
}
}

7
app/Http/Resources/UserResource.php
View File

@@ -16,9 +16,16 @@ class UserResource extends JsonResource
{
return [
'id' => $this->id,
'email' => $this->email,
'username' => $this->username,
'status' => $this->status,
'added' => $this->added,
'class' => $this->class,
'avatar' => $this->avatar,
'uploaded' => $this->uploaded,
'downloaded' => $this->downloaded,
'seedtime' => $this->seedtime,
'leechtime' => $this->leechtime,
];
}
}