周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 4900c1c6ddf9ab17e0135ae0c7e1256786d06b33 2 个父辈 dd7385b1 62be60a6

Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

内嵌 并排对比
正在显示 24 个修改的文件 包含 274 行增加 和 73 行删除
... ... @@ -2,7 +2,10 @@
namespace App\Http\Controllers\Aside\User;
use App\Enums\Common\Code;
use App\Http\Controllers\Aside\BaseController;
use App\Http\Requests\Aside\User\ProjectRoleRequest;
use App\Models\User\ProjectMenu as ProjectMenuModel;
class ProjectMenuController extends BaseController
{
... ... @@ -13,6 +16,52 @@ class ProjectMenuController extends BaseController
* @method
*/
public function lists(){
$menuModel = new ProjectMenuModel();
$lists = $menuModel->lists($this->map,$this->page,$this->row,$this->order,['*']);
$this->response('success',Code::SUCCESS,$lists);
}
/**
* @name :详情
* @return void
* @author :liyuhang
* @method
*/
public function info(ProjectRoleRequest $request){
$request->validate([
'id'=>'required'
],[
'id.required' => 'ID不能为空'
]);
}
/**
* @name :添加菜单
* @return void
* @author :liyuhang
* @method
*/
public function add(){
}
/**
* @name :编辑菜单
* @return void
* @author :liyuhang
* @method
*/
public function edit(){
}
/**
* @name :删除菜单
* @return void
* @author :liyuhang
* @method
*/
public function del(){
}
}
... ...
... ... @@ -6,7 +6,7 @@ use App\Enums\Common\Code;
use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\User\ProjectRoleLogic;
use App\Http\Requests\Aside\User\ProjectRoleRequest;
use App\Models\ProjectRole as ProjectRoleModel;
use App\Models\User\ProjectRole as ProjectRoleModel;
class ProjectRoleController extends BaseController
{
... ... @@ -23,6 +23,16 @@ class ProjectRoleController extends BaseController
}
/**
* @name :添加角色时获取菜单列表
* @return void
* @author :liyuhang
* @method
*/
public function get_menu(ProjectRoleLogic $roleLogic){
$list = $roleLogic->role_get_menu();
$this->response('success',Code::SUCCESS,$list);
}
/**
* @name :添加角色
* @return void
* @author :liyuhang
... ... @@ -31,6 +41,7 @@ class ProjectRoleController extends BaseController
public function add(ProjectRoleRequest $request,ProjectRoleLogic $roleLogic){
$request->validated();
//TODO::添加
$roleLogic->role_add();
$this->response('success');
}
... ... @@ -47,6 +58,7 @@ class ProjectRoleController extends BaseController
'id.required' => 'ID不能为空'
]);
//TODO::编辑
$roleLogic->role_edit();
$this->response('success');
}
... ... @@ -57,6 +69,7 @@ class ProjectRoleController extends BaseController
'id.required' => 'ID不能为空'
]);
//TODO::详情
$roleLogic->role_info();
$this->response('success');
}
/**
... ... @@ -71,6 +84,7 @@ class ProjectRoleController extends BaseController
],[
'id.required' => 'ID不能为空'
]);
$roleLogic->role_del();
//TODO::删除
$this->response('success');
}
... ...
... ... @@ -6,7 +6,7 @@ use App\Enums\Common\Code;
use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\User\UserLogic;
use App\Http\Requests\Aside\User\UserRequest;
use App\Models\User as UserModel;
use App\Models\User\User as UserModel;
class ProjectUserController extends BaseController
{
... ...
... ... @@ -5,11 +5,12 @@ namespace App\Http\Controllers\Bside;
use App\Enums\Common\Code;
use App\Models\Project;
use App\Models\Project as ProjectModel;
use App\Models\ProjectMenu as ProjectMenuModel;
use App\Models\ProjectRole as ProjectRoleModel;
use App\Models\User as UserModel;
use App\Models\User\ProjectMenu as ProjectMenuModel;
use App\Models\User\ProjectRole as ProjectRoleModel;
use App\Models\User\User as UserModel;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
/***
* 当前为公共类 所有方法均不需要验证登录token
*/
... ...
... ... @@ -26,8 +26,6 @@ class CategoryController extends BaseController
}
$sort = ['id' => 'desc'];
$data = $logic->getList($map, $sort, ['id', 'pid', 'title', 'image', 'keywords', 'describe', 'status','created_at'],0);
var_dump($data);
die();
return $this->success(Arr::listToTree($data));
}
... ...
<?php
namespace App\Http\Controllers\Bside;
namespace App\Http\Controllers\Bside\User;
use App\Enums\Common\Code;
use App\Http\Controllers\Bside\BaseController;
use App\Http\Controllers\Bside\Ids;
use App\Http\Controllers\Bside\json;
use App\Http\Logic\Bside\ProjectGroupLogic;
use App\Http\Requests\Bside\ProjectGroupRequest;
use App\Http\Requests\Bside\User\ProjectGroupRequest;
use App\Models\ProjectGroup as ProjectGroupModel;
use App\Models\User as UserModel;
use App\Models\User\User as UserModel;
use Illuminate\Http\Request;
... ...
<?php
namespace App\Http\Controllers\Bside;
namespace App\Http\Controllers\Bside\User;
use App\Enums\Common\Code;
use App\Http\Logic\Bside\RoleLogic;
use App\Http\Requests\Bside\ProjectRoleRequest;
use App\Models\ProjectRole as ProjectRoleModel;
use App\Models\User as UserModel;
use App\Http\Controllers\Bside\BaseController;
use App\Http\Logic\Bside\User\RoleLogic;
use App\Http\Requests\Bside\User\ProjectRoleRequest;
use App\Models\User\ProjectRole as ProjectRoleModel;
use App\Models\User\User as UserModel;
use Illuminate\Http\Request;
class ProjectRoleController extends BaseController
... ...
<?php
namespace App\Http\Controllers\Bside;
namespace App\Http\Controllers\Bside\User;
use App\Enums\Common\Code;
use App\Http\Logic\Bside\UserLogic;
use App\Http\Requests\Bside\UserRequest;
use App\Models\User as UserModel;
use App\Http\Controllers\Bside\BaseController;
use App\Http\Controllers\Bside\json;
use App\Http\Logic\Bside\User\UserLogic;
use App\Http\Requests\Bside\User\UserRequest;
use App\Models\User\User as UserModel;
use Illuminate\Http\Request;
class UserController extends BaseController
... ...
<?php
namespace App\Http\Logic\Aside\User;
use App\Http\Logic\Aside\BaseLogic;
use App\Models\User\ProjectMenu;
class ProjectMenuLogic extends BaseLogic
{
public function __construct()
{
parent::__construct();
$this->model = new ProjectMenu();
$this->param = $this->requestAll;
}
}
... ...
... ... @@ -3,10 +3,13 @@
namespace App\Http\Logic\Aside\User;
use App\Http\Logic\Aside\BaseLogic;
use App\Models\ProjectRole;
use App\Models\User\ProjectMenu as ProjectMenuModel;
use App\Models\User\ProjectRole;
class ProjectRoleLogic extends BaseLogic
{
const STATUS_ONE = 0;
public function __construct()
{
parent::__construct();
... ... @@ -15,4 +18,82 @@ class ProjectRoleLogic extends BaseLogic
$this->param = $this->requestAll;
}
/**
* @name :菜单列表
* @return void
* @author :liyuhang
* @method
*/
public function role_get_menu(){
$menuModel = new ProjectMenuModel();
$this->param['status'] = $this::STATUS_ONE;
$lists = $menuModel->list($this->param,'id');
$menu = array();
if(!empty($lists)){
foreach ($lists as $k => $v){
$v = (array)$v;
if ($v['pid'] == 0) {
$v['sub'] = _get_child($v['id'], $lists);
$menu[] = $v;
}
}
}
$this->success($menu);
}
/**
* @name :详情
* @return void
* @author :liyuhang
* @method
*/
public function role_info(){
$info = $this->model->read($this->param);
if($info === false){
$this->fail('当前数据不存在');
}
$this->success($info);
}
/**
* @name :添加角色
* @return void
* @author :liyuhang
* @method
*/
public function role_add(){
$rs = $this->model->add($this->param);
if($rs === false){
$this->fail('添加失败');
}
$this->success();
}
/**
* @name :编辑角色
* @return void
* @author :liyuhang
* @method
*/
public function role_edit(){
$rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->fail('编辑失败');
}
$this->success();
}
/**
* @name :删除角色
* @return void
* @author :liyuhang
* @method
*/
public function role_del(){
$this->param['id'] = ['in',$this->param['id']];
$rs = $this->model->del($this->param);
if($rs === false){
$this->fail('编辑失败');
}
$this->success();
}
}
... ...
... ... @@ -2,9 +2,8 @@
namespace App\Http\Logic\Aside\User;
use App\Enums\Common\Code;
use App\Http\Logic\Aside\BaseLogic;
use App\Models\User;
use App\Models\User\User;
class UserLogic extends BaseLogic
{
... ... @@ -25,7 +24,7 @@ class UserLogic extends BaseLogic
public function user_info(){
$info = $this->model->read($this->param);
if($info === false){
$this->fail('添加失败');
$this->fail('当前数据不存在');
}
return $this->success($info);
}
... ... @@ -62,7 +61,7 @@ class UserLogic extends BaseLogic
//TODO::上传头像
$rs = $this->model->edits($this->param);
if($rs === false){
$this->fail('添加失败');
$this->fail('编辑失败');
}
return $this->success();
}
... ...
<?php
namespace App\Http\Logic\Bside;
namespace App\Http\Logic\Bside\User;
use App\Enums\Common\Code;
use App\Models\ProjectMenu as ProjectMenuModel;
use App\Models\ProjectRole as ProjectRoleModel;
use App\Models\User;
use App\Models\User as UserModel;
use App\Http\Logic\Bside\BaseLogic;
use App\Models\User\ProjectMenu as ProjectMenuModel;
use App\Models\User\ProjectRole as ProjectRoleModel;
use App\Models\User\User;
class RoleLogic extends BaseLogic
{
... ... @@ -84,7 +84,7 @@ class RoleLogic extends BaseLogic
*/
public function role_del(){
//查询当前角色下是否有用户
$userModel = new UserModel();
$userModel = new User();
//批量删除
foreach ($this->param['id'] as $v){
$user_info = $userModel->read(['role_id'=>$v]);
... ...
<?php
namespace App\Http\Logic\Bside;
namespace App\Http\Logic\Bside\User;
use App\Enums\Common\Code;
use App\Http\Logic\Bside\BaseLogic;
use App\Models\Image;
use App\Models\User;
use Illuminate\Support\Facades\DB;
use App\Models\User\User;
class UserLogic extends BaseLogic
{
... ...
... ... @@ -2,10 +2,6 @@
namespace App\Http\Middleware;
use App\Enums\Common\Code;
use App\Models\ProjectMenu;
use App\Models\ProjectRole as ProjectRoleModel;
class AccessToken
{
/**
... ...
... ... @@ -3,14 +3,12 @@
namespace App\Http\Middleware\Bside;
use App\Enums\Common\Code;
use App\Models\ProjectMenu;
use App\Models\ProjectRole as ProjectRoleModel;
use App\Services\ProjectServer;
use App\Models\User\ProjectMenu;
use App\Models\User\ProjectRole as ProjectRoleModel;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Cache;
use Illuminate\Http\Exceptions\HttpResponseException;
class LoginAuthMiddleware
{
/**
... ...
<?php
namespace App\Http\Requests\Aside\User;
use Illuminate\Foundation\Http\FormRequest;
class ProjectMenuRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'name'=>'required|string|max:11||unique:gl_project_menu',
];
}
public function messages()
{
return [
'name.required'=>'名称必须填写',
'name.min' => '名称不小于5字符.',
];
}
}
... ...
<?php
namespace App\Http\Requests\Bside;
namespace App\Http\Requests\Bside\User;
use Illuminate\Foundation\Http\FormRequest;
... ...
<?php
namespace App\Http\Requests\Bside;
namespace App\Http\Requests\Bside\User;
use Illuminate\Foundation\Http\FormRequest;
... ...
<?php
namespace App\Http\Requests\Bside;
namespace App\Http\Requests\Bside\User;
use Illuminate\Foundation\Http\FormRequest;
... ...
<?php
namespace App\Models;
namespace App\Models\User;
use App\Models\Base;
class ProjectMenu extends Base
{
... ...
<?php
namespace App\Models;
namespace App\Models\User;
use App\Models\Base;
class ProjectRole extends Base
{
... ...
<?php
namespace App\Models;
namespace App\Models\User;
//use Illuminate\Contracts\Auth\MustVerifyEmail;
use App\Models\ProjectRole as ProjectRoleModel;
use App\Models\User as UserModel;
use App\Models\Base;
use App\Models\User\ProjectRole as ProjectRoleModel;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
//use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Facades\Cache;
use Laravel\Sanctum\HasApiTokens;
//use Illuminate\Foundation\Auth\User as Authenticatable;
class User extends Base
{
use HasApiTokens, HasFactory, Notifiable;
... ...
... ... @@ -62,7 +62,7 @@ return [
'providers' => [
'users' => [
'driver' => 'eloquent',
'model' => App\Models\User::class,
'model' => \App\Models\User\User::class,
],
// 'users' => [
... ...
... ... @@ -18,12 +18,12 @@ Route::middleware(['bloginauth'])->group(function () {
Route::any('/notice/', [\App\Http\Controllers\Bside\NoticeController::class, 'lists'])->name('notice_lists');
//用户相关路由
Route::prefix('user')->group(function () {
Route::any('/', [\App\Http\Controllers\Bside\UserController::class, 'lists'])->name('user_lists');
Route::any('/add', [\App\Http\Controllers\Bside\UserController::class, 'add'])->name('user_add');
Route::any('/edit', [\App\Http\Controllers\Bside\UserController::class, 'edit'])->name('user_edit');
Route::any('/status', [\App\Http\Controllers\Bside\UserController::class, 'status'])->name('user_status');
Route::any('/info', [\App\Http\Controllers\Bside\UserController::class, 'info'])->name('user_info');
Route::any('/del', [\App\Http\Controllers\Bside\UserController::class, 'del'])->name('user_del');
Route::any('/', [\App\Http\Controllers\Bside\User\UserController::class, 'lists'])->name('user_lists');
Route::any('/add', [\App\Http\Controllers\Bside\User\UserController::class, 'add'])->name('user_add');
Route::any('/edit', [\App\Http\Controllers\Bside\User\UserController::class, 'edit'])->name('user_edit');
Route::any('/status', [\App\Http\Controllers\Bside\User\UserController::class, 'status'])->name('user_status');
Route::any('/info', [\App\Http\Controllers\Bside\User\UserController::class, 'info'])->name('user_info');
Route::any('/del', [\App\Http\Controllers\Bside\User\UserController::class, 'del'])->name('user_del');
});
//站内信
... ... @@ -34,24 +34,24 @@ Route::middleware(['bloginauth'])->group(function () {
//用户角色相关路由
Route::prefix('role')->group(function () {
Route::any('/', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'lists'])->name('project_role_lists');
Route::any('/get_role_menu', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'get_role_menu'])->name('project_get_role_add');
Route::any('/add', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'add'])->name('project_role_add');
Route::any('/edit', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'edit'])->name('project_role_edit');
Route::any('/info', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'status'])->name('project_role_info');
Route::any('/status', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'status'])->name('project_role_status');
Route::any('/del', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'del'])->name('project_role_del');
Route::any('/get_user_list', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'get_user_list'])->name('project_role_get_user_list');
Route::any('/', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'lists'])->name('project_role_lists');
Route::any('/get_role_menu', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'get_role_menu'])->name('project_get_role_add');
Route::any('/add', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'add'])->name('project_role_add');
Route::any('/edit', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'edit'])->name('project_role_edit');
Route::any('/info', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'status'])->name('project_role_info');
Route::any('/status', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'status'])->name('project_role_status');
Route::any('/del', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'del'])->name('project_role_del');
Route::any('/get_user_list', [\App\Http\Controllers\Bside\User\ProjectRoleController::class, 'get_user_list'])->name('project_role_get_user_list');
});
//group相关路
Route::prefix('group')->group(function () {
Route::any('/', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'lists'])->name('project_group_lists');
Route::any('/add', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'add'])->name('project_group_add');
Route::any('/edit', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'edit'])->name('project_group_edit');
Route::any('/info', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'info'])->name('project_group_info');
Route::any('/del', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'del'])->name('project_group_del');
Route::any('/get_user_lists', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'get_user_lists'])->name('project_group_get_user_lists');
Route::any('/', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'lists'])->name('project_group_lists');
Route::any('/add', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'add'])->name('project_group_add');
Route::any('/edit', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'edit'])->name('project_group_edit');
Route::any('/info', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'info'])->name('project_group_info');
Route::any('/del', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'del'])->name('project_group_del');
Route::any('/get_user_lists', [\App\Http\Controllers\Bside\User\ProjectGroupController::class, 'get_user_lists'])->name('project_group_get_user_lists');
});
//新闻相关路由
... ...