This commit is contained in:
xiaomlove
2021-04-19 20:13:21 +08:00
parent 736d42cd5c
commit 38afa63e3d
23 changed files with 1051 additions and 60 deletions

View File

@@ -17,7 +17,7 @@ class AgentAllowController extends Controller
{
$result = AgentAllow::query()->orderBy('id', 'desc')->paginate();
$resource = AgentAllowResource::collection($result);
return success('agent allow list', $resource);
return $this->success($resource);
}
/**
@@ -41,7 +41,7 @@ class AgentAllowController extends Controller
{
$result = AgentAllow::query()->findOrFail($id);
$resource = new AgentAllowResource($result);
return success('agent allow detail', $resource);
return $this->success($resource);
}
/**
@@ -56,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,6 +69,6 @@ class AgentAllowController extends Controller
{
$result = AgentAllow::query()->findOrFail($id);
$deleted = $result->delete();
return success('agent allow delete', [$deleted]);
return $this->success([$deleted]);
}
}

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", '.');
}
}

View File

@@ -0,0 +1,98 @@
<?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)
{
//
}
}

View File

@@ -8,11 +8,11 @@ use Illuminate\Http\Request;
class UserController extends Controller
{
private $user;
private $repository;
public function __construct(UserRepository $user)
public function __construct(UserRepository $repository)
{
$this->user = $user;
$this->repository = $repository;
}
/**
@@ -23,9 +23,9 @@ class UserController extends Controller
*/
public function index(Request $request)
{
$result = $this->user->getList($request->all());
$result = $this->repository->getList($request->all());
$resource = UserResource::collection($result);
return success('user list', $resource);
return $this->success($resource);
}
/**
@@ -43,9 +43,9 @@ class UserController extends Controller
'password_confirmation' => 'required|string|same:password'
];
$request->validate($rules);
$result = $this->user->store($request->all());
$result = $this->repository->store($request->all());
$resource = new UserResource($result);
return success('user store', $resource);
return $this->success($resource);
}
/**
@@ -90,8 +90,14 @@ class UserController extends Controller
'password_confirmation' => 'required|same:password',
];
$request->validate($rules);
$result = $this->user->resetPassword($request->username, $request->password, $request->password_confirmation);
$result = $this->repository->resetPassword($request->repositoryname, $request->password, $request->password_confirmation);
$resource = new UserResource($result);
return success('user reset password', $resource);
return $this->success($resource);
}
public function classes()
{
$result = $this->repository->listClass();
return $this->success($result);
}
}