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
@@ -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]);
}
}
+43
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", '.');
}
}
+98
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)
{
//
}
}
+15 -9
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);
}
}
+28
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,
];
}
}
+13
View File
@@ -0,0 +1,13 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Exam extends NexusModel
{
use HasFactory;
protected $fillable = ['name', 'description', 'begin', 'end', 'status'];
}
+13
View File
@@ -0,0 +1,13 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class ExamProgress extends NexusModel
{
use HasFactory;
protected $fillable = ['exam_id', 'uid', 'type_id', 'value'];
}
+46 -1
View File
@@ -2,7 +2,6 @@
namespace App\Models;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
@@ -16,6 +15,52 @@ class User extends Authenticatable
const STATUS_CONFIRMED = 'confirmed';
const STATUS_PENDING = 'pending';
const CLASS_PEASANT = "0";
const CLASS_USER = "1";
const CLASS_POWER_USER = "2";
const CLASS_ELITE_USER = "3";
const CLASS_CRAZY_USER = "4";
const CLASS_INSANE_USER = "5";
const CLASS_VETERAN_USER = "6";
const CLASS_EXTREME_USER = "7";
const CLASS_ULTIMATE_USER = "8";
const CLASS_NEXUS_MASTER = "9";
const CLASS_VIP = "10";
const CLASS_RETIREE = "11";
const CLASS_UPLOADER = "12";
const CLASS_FORUM_MODERATOR = "12.1";
const CLASS_MODERATOR = "13";
const CLASS_ADMINISTRATOR = "14";
const CLASS_SYSOP = "15";
const CLASS_STAFFLEADER = "16";
public static $classes = [
self::CLASS_PEASANT => ['text' => 'Peasant'],
self::CLASS_USER => ['text' => 'User'],
self::CLASS_POWER_USER => ['text' => 'Power User'],
self::CLASS_ELITE_USER => ['text' => 'Elite User'],
self::CLASS_CRAZY_USER => ['text' => 'Crazy User'],
self::CLASS_INSANE_USER => ['text' => 'Insane User'],
self::CLASS_VETERAN_USER => ['text' => 'Veteran User'],
self::CLASS_EXTREME_USER => ['text' => 'Extreme User'],
self::CLASS_ULTIMATE_USER => ['text' => 'Eltimate User'],
self::CLASS_NEXUS_MASTER => ['text' => 'Nexus Master'],
self::CLASS_VIP => ['text' => 'Vip'],
self::CLASS_RETIREE => ['text' => 'Retiree'],
self::CLASS_UPLOADER => ['text' => 'Uploader'],
self::CLASS_FORUM_MODERATOR => ['text' => 'Forum Moderator'],
self::CLASS_MODERATOR => ['text' => 'Moderator'],
self::CLASS_ADMINISTRATOR => ['text' => 'Administrator'],
self::CLASS_SYSOP => ['text' => 'Sysop'],
self::CLASS_STAFFLEADER => ['text' => 'Staff Leader'],
];
public function getClassTextAttribute()
{
return self::$classes[$this->class]['text'] ?? '';
}
/**
* 为数组 / JSON 序列化准备日期。
+31
View File
@@ -0,0 +1,31 @@
<?php
namespace App\Repositories;
use App\Models\Exam;
use App\Models\Setting;
use App\Models\User;
class ExamRepository extends BaseRepository
{
public function getList(array $params)
{
$query = Exam::query();
list($sortField, $sortType) = $this->getSortFieldAndType($params);
$query->orderBy($sortField, $sortType);
return $query->paginate();
}
public function store(array $params)
{
$exam = Exam::query()->create($params);
return $exam;
}
public function update(array $params, $id)
{
$exam = Exam::query()->findOrFail($id);
$exam->update($params);
return $exam;
}
}
+9
View File
@@ -53,4 +53,13 @@ class UserRepository extends BaseRepository
$user->update($update);
return $user;
}
public function listClass()
{
$out = [];
foreach(User::$classes as $key => $value) {
$out[(string)$key] = $value['text'];
}
return $out;
}
}