周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 2bcb68f50961c2bc6ce1575822ffb20ee6b64228 2 个父辈 632cfe4f bd42318b

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

内嵌 并排对比
正在显示 20 个修改的文件 包含 470 行增加 和 444 行删除
... ... @@ -16,7 +16,7 @@ class BaseController extends Controller
protected $token = ''; //token
protected $request = [];//助手函数
protected $allCount = 0;//总条数
protected $p = 1;//当前页
protected $page = 1;//当前页
protected $row = 20;//每页条数
protected $header = [];//设置请求头参数
protected $order = 'id';
... ... @@ -35,7 +35,6 @@ class BaseController extends Controller
$info = Cache::get($this->token);
$this->user = $info;
$this->uid = $info['id'];
$this->param['project_id'] = $this->user['project_id'];
}else{
return response(['code'=>Code::USER_ERROR,'msg'=>'当前用户未登录']);
}
... ... @@ -80,8 +79,8 @@ class BaseController extends Controller
case "order":
$this->order = $v;
break;
case 'p':
$this->p = $v;
case 'page':
$this->page = $v;
break;
case 'row':
$this->row = $v;
... ...
... ... @@ -7,6 +7,7 @@ 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 Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
... ... @@ -22,25 +23,18 @@ class ComController extends BaseController
* @author :liyuhang
* @method
*/
public function login(){
$rules = [
'mobile'=>'required|string|max:12',
'password'=>'required|string',
];
//验证的提示信息
$message = [
public function login(Request $request){
$request->validate([
'mobile'=>['required,string,max:12'],
'password'=>['required,string'],
],[
'mobile.required'=>'标题必须填写',
'mobile.string'=>'标题中含有非法文字',
'password.required'=>'内容必须填写',
'password.string'=>'内容中含有非法文字',
'mobile.max' => 'account不大于12字符.',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->errors()->first()){
return $this->response($validate->errors()->first(),Code::USER_ERROR,$this->param);
}
]);
$userModel = new UserModel();
Cache::add('1345951a03fd1916a53c48c16b2fdecb','23423423423423');
$res = $userModel->login($this->param);
if($res === false){
$this->response('当前用户不存在或者被禁用,登录失败',Code::USER_ERROR,[]);
... ... @@ -94,23 +88,17 @@ class ComController extends BaseController
* @author :liyuhang
* @method
*/
public function edit_info(){
$rules = [
'password'=>'required|string|min:5',
'name'=>'required|max:20',
];
//验证的提示信息
$message = [
public function edit_info(Request $request){
$request->validate([
'password'=>['required,string,min:5'],
'name'=>['required,max:20'],
],[
'password.required'=>'密码必须填写',
'password.string'=>'密码中含有非法文字',
'password.min' => '密码不小于5字符.',
'name.required'=>'名称必须填写',
'name.min' => '名称不小于5字符.',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
}
]);
$userModel = new UserModel();
$this->param['id'] = $this->uid;
$rs = $userModel->edits($this->param);
... ...
<?php
namespace App\Http\Controllers\Bside\News;
use App\Enums\Common\Code;
use App\Http\Controllers\Bside\BaseController;
use App\Http\Requests\Bside\News\NewsCategoryRequest;
use App\Models\News\News as NewsModel;
use App\Models\News\NewsCategory as NewsCategoryModel;
use Illuminate\Http\Request;
class NewsCategoryController extends BaseController
{
/**
* @name :新闻分类列表
* @return json
* @author :liyuhang
* @method
*/
public function lists(NewsCategoryModel $newsCategory){
$lists = $newsCategory->lists($this->map,$this->page,$this->row);
$this->response('success',Code::SUCCESS,$lists);
}
/**
* @name :添加分类
* @return json
* @author :liyuhang
* @method
*/
public function add(NewsCategoryRequest $request,NewsCategoryModel $newsCategory){
$request->validated();
$rs = $newsCategory->add($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success',Code::SUCCESS);
}
/**
* @name :编辑分类
* @return void
* @author :liyuhang
* @method
*/
public function edit(NewsCategoryRequest $request,NewsCategoryModel $newsCategory){
$request->validate([
'id'=>['required']
],[
'id.required' => 'ID不能为空'
]);
$rs = $newsCategory->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success',Code::SUCCESS);
}
/**
* @name :编辑状态
* @return void
* @author :liyuhang
* @method
*/
public function status(Request $request,NewsCategoryModel $newsCategory){
$request->validate([
'id'=>['required'],
'status'=>['required'],
],[
'id.required' => 'ID不能为空',
'status.required' => 'status不能为空'
]);
$rs = $newsCategory->edit(['status'=>$this->param['status']],['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success');
}
/**
* @name :删除分类
* @return void
* @author :liyuhang
* @method
*/
public function del(Request $request,NewsCategoryModel $newsCategory,NewsModel $news){
$request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
]);
foreach ($this->param['id'] as $v){
var_dump($v);
//查询是否有子分类
$id = $newsCategory->read(['pid'=>$v],['id']);
if($id !== false){
$this->response('当前分类拥有子分类不允许删除',Code::USER_ERROR);
}
//查看当前分内下是否有商品
$id = $news->read(['category_id'=>$v],['id']);
if($id !== false){
$this->response('当前分类拥有商品',Code::USER_ERROR);
}
}
$this->param['id'] = ['in',$id];
var_dump($this->map);
die();
$rs = $newsCategory->del($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success');
}
}
... ...
<?php
namespace App\Http\Controllers\Bside\News;
use App\Http\Controllers\Bside\BaseController;
class NewsController extends BaseController
{
/**
* @name :获取新闻列表
* @return void
* @author :liyuhang
* @method
*/
public function lists(){
}
}
... ...
<?php
namespace App\Http\Controllers\Bside;
use App\Enums\Common\Code;
use App\Models\Product as ProductModel;
use App\Models\ProductClassify as ProductClassifyModel;
use Illuminate\Support\Facades\Validator;
/**
* @name:产品表
*/
class ProductController extends BaseController
{
/**
* @name : 产品列表
* @return void
* @author :liyuhang
* @method
*/
public function lists(){
//获取当前登录用户下的产品列表
$this->map['project_id'] = $this->user['project_id'];
$productModel = new ProductModel();
$lists = $productModel->lists($this->map,$this->p,$this->row,$this->order);
$this->allCount = $productModel->allCount;
$this->response('success',Code::SUCCESS, $lists);
}
/**
* @name :添加产品
* @return void
* @author :liyuhang
* @method
*/
public function add(){
//参数验证
$rules = [
'name'=>'required|max:11',
'image'=>'required',
'describe'=>'required',
'keywords'=>'required|max:50',
];
//验证的提示信息
$message = [
'name.required'=>'名称必须填写',
'name.max' => '名称不大于16字符.',
'image.required'=>'图片必须上传',
'describe.required'=>'描述必须填写',
'keywords.required'=>'关键字必须填写',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
}
//TODO::关联项目
$this->param['project_id'] = $this->user['project_id'];
$productModel = new ProductModel();
$this->param['image'] = $this->uploads();
$rs = $productModel->add($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success',Code::SUCCESS);
}
public function edit(){
//参数验证
$rules = [
'name'=>'required|max:11',
'image'=>'required',
'describe'=>'required',
'keywords'=>'required|max:50',
];
//验证的提示信息
$message = [
'name.required'=>'名称必须填写',
'name.max' => '名称不大于16字符.',
'image.required'=>'图片必须上传',
'describe.required'=>'描述必须填写',
'keywords.required'=>'关键字必须填写',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
}
if(isset($this->param['image'])){
//TODO::删除上一次的图片
$this->param['image'] = $this->uploads();
}
$productModel = new ProductModel();
$rs = $productModel->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success',Code::SUCCESS);
}
/**
* @name :修改产品状态
* @return void
* @author :liyuhang
* @method
*/
public function status(){
//参数验证
$rules = [
'id'=>'required',
'status'=>'required',
];
//验证的提示信息
$message = [
'id.required'=>'主键必须填写',
'status.required'=>'状态必须填写',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
}
$productModel = new ProductModel();
$rs = $productModel->edit(['status'=>$this->param['status']],['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success',Code::SUCCESS);
}
/**
* @name :删除产品
* @return void
* @author :liyuhang
* @method
*/
public function del(){
//参数验证
$rules = [
'id'=>'required',
];
//验证的提示信息
$message = [
'id.required'=>'主键必须填写',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
}
$productModel = new ProductModel();
$info = $productModel->read(['id'=>$this->param['id']],['image']);
//TODO::删除添加的图片
shell_exec('rm -rf '.request()->path().'../../'.$info['image']);
$rs = $productModel->del(['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success',Code::SUCCESS);
}
}
... ... @@ -5,6 +5,10 @@ namespace App\Http\Controllers\Bside;
use App\Enums\Common\Code;
use App\Http\Logic\Bside\ProjectGroupLogic;
use App\Http\Requests\Bside\ProjectGroupRequest;
use App\Models\ProjectGroup as ProjectGroupModel;
use App\Models\User as UserModel;
use Illuminate\Http\Request;
/**
* @name:用户组相关
... ... @@ -17,12 +21,25 @@ class ProjectGroupController extends BaseController
* @author :liyuhang
* @method
*/
public function lists()
public function lists(ProjectGroupModel $projectGroupModel)
{
$lists = $projectGroupModel->lists($this->map,$this->page,$this->row);
$this->response('success',Code::SUCCESS,$lists);
}
/**
* @name:添加用户组获取用户列表
* @return void
* @author :liyuhang
* @method
*/
public function get_user_lists(UserModel $userModel){
$this->map['project_id'] = $this->user['project_id'];
//获取当前项目下的所有用户
$lists = $userModel->list($this->map);
$this->response('success',Code::SUCCESS,$lists);
}
/**
* @param ProjectGroupRequest $request
* @param ProjectGroupLogic $logic
* @name : 添加用户组
... ... @@ -30,7 +47,18 @@ class ProjectGroupController extends BaseController
* @author :liyuhang
* @method
*/
public function add(ProjectGroupRequest $request){
public function add(ProjectGroupRequest $request,ProjectGroupModel $projectGroupModel){
$request->validated();
$this->param['project_id'] = $this->user['project_id'];
//TODO::成员列表：user_list
if(!isset($this->param['user_list']) || empty($this->param['user_list'])){
$this->param['user_list'] = $this->uid;
}
$this->param['admin_id'] = $this->uid;
$rs = $projectGroupModel->add($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success');
}
... ... @@ -42,8 +70,16 @@ class ProjectGroupController extends BaseController
* @author :liyuhang
* @method
*/
public function edit(ProjectGroupRequest $request){
$request->validated();
public function edit(ProjectGroupRequest $request,ProjectGroupModel $projectGroupModel){
$request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
]);
$rs = $projectGroupModel->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success');
}
... ... @@ -53,7 +89,16 @@ class ProjectGroupController extends BaseController
* @author :liyuhang
* @method
*/
public function del(){
public function del(Request $request,ProjectGroupModel $projectGroupModel){
$request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
]);
$rs = $projectGroupModel->del($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success');
}
}
... ...
... ... @@ -3,9 +3,11 @@
namespace App\Http\Controllers\Bside;
use App\Enums\Common\Code;
use App\Http\Requests\Bside\ProjectRoleRequest;
use App\Models\ProjectMenu as ProjectMenuModel;
use App\Models\ProjectRole as ProjectRoleModel;
use App\Models\User as UserModel;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
class ProjectRoleController extends BaseController
... ... @@ -22,7 +24,7 @@ class ProjectRoleController extends BaseController
$this->map['status'] = 0;
$this->map['project_id'] = $this->user['project_id'];
//获取当前登录用户自己的菜单栏
$lists = $projectRoleModel->lists($this->map,$this->p,$this->row,$this->order);
$lists = $projectRoleModel->lists($this->map,$this->page,$this->row,$this->order);
$this->response('success',Code::SUCCESS,$lists);
}
... ... @@ -56,23 +58,8 @@ class ProjectRoleController extends BaseController
* @author :liyuhang
* @method
*/
public function add(){
//TODO::获取当前用户的所在项目组
//参数验证
$rules = [
'name'=>'required|max:11',
'role_menu'=>'required|string',
];
//验证的提示信息
$message = [
'name.required'=>'名称必须填写',
'name.max' => '号码不大于11字符.',
'role_menu.required'=>'密码必须填写',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
}
public function add(ProjectRoleRequest $request){
$request->validated();
$this->param['project_id'] = $this->user['project_id'];
//获取当前项目下的角色超级管理员
$projectRoleModel = new ProjectRoleModel();
... ... @@ -94,28 +81,19 @@ class ProjectRoleController extends BaseController
* @author :liyuhang
* @method
*/
public function edit(){
//TODO::根据当前登录用户返回
//参数验证
$rules = [
'id'=>'required',
'name'=>'required|max:11',
'role_menu'=>'required',
];
//验证的提示信息
$message = [
'id.required'=>'主键必须填写',
'name.required'=>'名称必须填写',
'role_menu.required'=>'菜单权限列表填写',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE);
}
$projectRoleModel = new ProjectRoleModel();
public function edit(ProjectRoleRequest $request,ProjectRoleModel $projectRoleModel){
$request->validate([
'id'=>['required']
],[
'id.required' => 'ID不能为空'
]);
//TODO::查询当前名称是否重复
$info = $projectRoleModel->where('id','<>',$this->param['id'])
->where(['name'=>$this->param['name'],'project_id'=>$this->user['project_id']])->first();
$condition = [
['id'=>['!=',$this->param['id']]],
['name'=>$this->param['name']],
['project_id'=>$this->user['project_id']],
];
$info = $projectRoleModel->formatQuery($condition)->first();
if(!empty($info)){
$this->response('当前添加的角色已存在',Code::USER_PARAMS_ERROE);
}
... ... @@ -123,7 +101,7 @@ class ProjectRoleController extends BaseController
if($rs === false){
$this->response('编辑失败',Code::USER_PARAMS_ERROE);
}
$this->response('编辑成功',Code::SUCCESS);
$this->response('编辑成功');
}
/**
... ... @@ -132,22 +110,14 @@ class ProjectRoleController extends BaseController
* @author :liyuhang
* @method
*/
public function status(){
//参数验证
$rules = [
'id'=>'required',
'status'=>'required',
];
//验证的提示信息
$message = [
'id.required'=>'主键必须填写',
'status.required'=>'状态必须填写',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
}
$projectRoleModel = new ProjectRoleModel();
public function status(Request $request,ProjectRoleModel $projectRoleModel){
$request->validate([
'id'=>['required'],
'status'=>['required'],
],[
'id.required' => 'ID不能为空',
'status.required' => 'status不能为空'
]);
$rs = $projectRoleModel->edit(['status'=>$this->param['status']],['id'=>$this->param['id']]);
if($rs === false){
$this->response('编辑失败',Code::USER_PARAMS_ERROE);
... ... @@ -161,20 +131,12 @@ class ProjectRoleController extends BaseController
* @author :liyuhang
* @method
*/
public function del(){
//参数验证
$rules = [
'id'=>'required',
];
//验证的提示信息
$message = [
'id.required'=>'主键必须填写',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
}
$projectRoleModel = new ProjectRoleModel();
public function del(Request $request,ProjectRoleModel $projectRoleModel){
$request->validate([
'id'=>['required']
],[
'id.required' => 'ID不能为空'
]);
//查询当前角色下是否有用户
$userModel = new UserModel();
$user_info = $userModel->read(['role_id'=>$this->param['id']]);
... ... @@ -185,6 +147,6 @@ class ProjectRoleController extends BaseController
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success',Code::SUCCESS);
$this->response('success');
}
}
... ...
... ... @@ -3,8 +3,10 @@
namespace App\Http\Controllers\Bside;
use App\Enums\Common\Code;
use App\Http\Requests\Bside\UserRequest;
use App\Models\User as UserModel;
use Illuminate\Support\Facades\Validator;
use App\Rules\Ids;
use Illuminate\Http\Request;
class UserController extends BaseController
{
... ... @@ -14,11 +16,10 @@ class UserController extends BaseController
* @author :liyuhang
* @method
*/
public function lists(){
public function lists(UserModel $userModel){
//TODO::搜索参数处理
$userModel = new UserModel();
$this->map['project_id'] = $this->user['project_id'];
$lists = $userModel->lists($this->map,$this->p,$this->row,$this->order,['id','name','mobile','created_at']);
$lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at']);
if(empty($lists)){
$this->response('请求失败',Code::USER_ERROR,[]);
}
... ... @@ -31,30 +32,8 @@ class UserController extends BaseController
* @author :liyuhang
* @method
*/
public function add(){
$rules = [
'mobile'=>'required|string|max:11',
'password'=>'required|string|min:5',
'name'=>'required|max:20',
'role_id'=>'required'
];
//验证的提示信息
$message = [
'mobile.required'=>'号码必须填写',
'mobile.string'=>'号码中含有非法文字',
'mobile.max' => '号码不大于11字符.',
'password.required'=>'密码必须填写',
'password.string'=>'密码中含有非法文字',
'password.min' => '密码不小于5字符.',
'name.required'=>'名称必须填写',
'name.min' => '名称不小于5字符.',
'role_id.required'=>'角色必须填写',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_LOGIN_ERROE);
}
$userModel = new UserModel();
public function add(UserRequest $request,UserModel $userModel){
$request->validated();
$this->param['project_id'] = $this->user['project_id'];
$rs = $userModel->adds($this->param);
if($rs === false){
... ... @@ -69,31 +48,12 @@ class UserController extends BaseController
* @author :liyuhang
* @method
*/
public function edit(){
$rules = [
'id'=>'required',
'mobile'=>'required|string|max:11',
'password'=>'required|string|min:5',
'name'=>'required|max:20',
];
//验证的提示信息
$message = [
'id.required'=>'主键不能为空',
'mobile.required'=>'号码必须填写',
'mobile.string'=>'号码中含有非法文字',
'mobile.max' => '号码不大于11字符.',
'password.required'=>'密码必须填写',
'password.string'=>'密码中含有非法文字',
'password.min' => '密码不小于5字符.',
'name.required'=>'名称必须填写',
'name.min' => '名称不小于5字符.',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
}
$userModel = new UserModel();
//TODO::查询当前手机号码是否重复
public function edit(UserRequest $request,UserModel $userModel){
$request->validate([
'id'=>['required']
],[
'id.required' => 'ID不能为空'
]);
$info = $userModel->where('id','<>',$this->param['id'])
->where(['mobile'=>$this->param['mobile']])->first();
if(!empty($info)){
... ... @@ -112,27 +72,19 @@ class UserController extends BaseController
* @author :liyuhang
* @method
*/
public function status(){
//参数验证
$rules = [
'id'=>'required',
'status'=>'required',
];
//验证的提示信息
$message = [
'id.required'=>'主键必须填写',
'status.required'=>'状态必须填写',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
}
$userLogic = new UserModel();
$rs = $userLogic->edit($this->param,['id'=>$this->param['id']]);
public function status(Request $request,UserModel $userModel){
$request->validate([
'id'=>['required'],
'status'=>['required'],
],[
'id.required' => 'ID不能为空',
'status.required' => 'status不能为空'
]);
$rs = $userModel->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response($this->param['status'] == 0 ? '启用成功' : '禁用成功',Code::SUCCESS);
$this->response($this->param['status'] == 0 ? '启用成功' : '禁用成功');
}
/**
* @name :删除管理员
... ... @@ -140,19 +92,12 @@ class UserController extends BaseController
* @author :liyuhang
* @method
*/
public function del(){
$rules = [
'id'=>'required',
];
//验证的提示信息
$message = [
'id.required'=>'主键不能为空',
];
$validate = Validator::make($this->param, $rules, $message);
if($validate->fails()){
return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
}
$userModel = new UserModel();
public function del(Request $request,UserModel $userModel){
$request->validate([
'id'=>['required', new Ids()],
],[
'id.required' => 'ID不能为空',
]);
$rs = $userModel->del($this->param);
if($rs === false){
$this->response('删除失败',Code::USER_ERROR);
... ...
<?php
namespace App\Http\Logic\Bside;
use App\Models\ProjectGroup;
class ProjectGroupLogic extends BaseLogic
{
public function __construct()
{
parent::__construct();
$this->model = new ProjectGroup();
}
}
<?php
namespace App\Http\Logic\Bside;
use App\Models\User;
class UserLogic extends BaseLogic
{
public function __construct()
{
parent::__construct();
$this->model = new User();
}
}
<?php
namespace App\Http\Requests\Bside\News;
use Illuminate\Foundation\Http\FormRequest;
class NewsCategoryRequest 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',
];
}
public function messages()
{
return [
'name.required'=>'名称必须填写',
];
}
}
... ...
<?php
namespace App\Http\Requests\Bside\News;
use Illuminate\Foundation\Http\FormRequest;
class NewsRequest 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',
];
}
public function messages()
{
return [
'name.required'=>'名称必须填写',
];
}
}
... ...
... ... @@ -16,22 +16,17 @@ class ProjectGroupRequest extends FormRequest
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'name'=>['required'],
'name' => 'required|max:255',
];
}
public function messages()
{
return [
'name.required' => '请输入描述名称',
'name.required' => '请输入用户组名称',
];
}
}
... ...
<?php
namespace App\Http\Requests\Bside;
use Illuminate\Foundation\Http\FormRequest;
class ProjectRoleRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
public function rules()
{
return [
'name'=>'required|max:11',
'role_menu'=>'required|string',
];
}
public function messages()
{
return [
'name.required'=>'名称必须填写',
'name.max' => '名称不大于11字符.',
'role_menu.required'=>'角色列表必须填写',
];
}
}
... ...
... ... @@ -24,7 +24,25 @@ class UserRequest extends FormRequest
public function rules()
{
return [
'mobile'=>['required'],
'mobile'=>'required|string|max:11',
'password'=>'required|string|min:5',
'name'=>'required|max:20',
'role_id'=>'required'
];
}
public function messages()
{
return [
'mobile.required'=>'号码必须填写',
'mobile.string'=>'号码中含有非法文字',
'mobile.max' => '号码不大于11字符.',
'password.required'=>'密码必须填写',
'password.string'=>'密码中含有非法文字',
'password.min' => '密码不小于5字符.',
'name.required'=>'名称必须填写',
'name.min' => '名称不小于5字符.',
'role_id.required'=>'角色必须填写',
];
}
}
... ...
... ... @@ -15,7 +15,6 @@ class Base extends Model
'created_at' => 'datetime:Y-m-d H:i:s',
'updated_at' => 'datetime:Y-m-d H:i:s',
];
/**
* 日期序列化 勿删 删了时间就不是东八区时间了哈
* @param \DateTimeInterface $date
... ... @@ -27,30 +26,26 @@ class Base extends Model
{
return $date->format('Y-m-d H:i:s');
}
/**
* @name 列表数据
* @return void
* @author :liyuhang
* @method
*/
public function lists($map, $p, $row, $order = 'id', $fields = ['*']){
//TODO::where(['id'=>'','name'=>''])
public function lists($map, $page, $row, $order = 'id', $fields = ['*']){
$query = $this->formatQuery($map);
$lists = $query->select($fields)->orderBy($order)->paginate($row, ['*'], 'page', $p);
$lists = $query->select($fields)->orderBy($order)->paginate($row, ['*'], 'page', $page);
if (empty($lists)) {
return false;
}
$lists = $lists->toArray();
return $lists;
}
/**
* @name :无分页列表
* @param $map
* @param $order
* @param $fields
* @name :无分页列表
* @return mixed
* @author :liyuhang
* @method
... ... @@ -65,8 +60,8 @@ class Base extends Model
return $lists;
}
/**
* @param array:$condition
* @name :获取单条数据详情
* @param array
* @return mixed
* @author :liyuhang
* @method get
... ... @@ -81,8 +76,6 @@ class Base extends Model
$info = $info->toArray();
return $info;
}
/**
* @name :新增
* @return void
... ... @@ -94,7 +87,6 @@ class Base extends Model
$data['updated_at'] = date('Y-m-d H:i:s');
return $this->insert($data);
}
/**
* @name :编辑
* @return void
... ... @@ -107,7 +99,6 @@ class Base extends Model
$rs = $query->update($data);
return $rs;
}
/**
* @name : 删除数据
* @return void
... ... @@ -118,12 +109,10 @@ class Base extends Model
$query = $this->formatQuery($condition);
return $query->delete();
}
/**
* @name :参数处理查询
* @param $map = ['$k'=>['like',$v],$k1]
* @param $val
* @name :参数处理查询
* @return Base
* @author :liyuhang
* @method
... ... @@ -132,45 +121,48 @@ class Base extends Model
$model = $query ?: $this;
$query = $model->where(function ($query) use ($map){
foreach ($map as $k => $v){
if(is_array($v)){
//拼接数据
foreach ($v as $k1 => $v1){
switch ($k1){
case 'like':
// like查询 ['name|title'=> ['like','%a%']]
if (strpos($k, '|') !== false) {
$query->where(function ($query) use ($k,$v1) {
$item = explode('|', $k);
foreach ($item as $vo) {
$query->orWhere($vo, $v1[0], $v1[1]);
}
});
} else {
$query->where($k,$v1[0], $v1[1]);
}
break;
case 'in':
// in查询 ['id'=>['in'=>[1,2,3]]]
$query->whereIn($k, $v1[1]);
break;
case 'no in':
// in查询 ['id'=>['not in'=>[1,2,3]]]
$query->whereNotIn($k, $v1[1]);
break;
case 'between':
// in查询 ['id'=>['between'=>[create1,create2]]]
$query->whereBetween($k, $v1[1]);
case 'not between':
// not between查询 ['created_at'=>['not between'=>['xxx', 'xxx]]]
$query->whereNotBetween($k, $v1[1]);
break;
default:
$query->where($k,$k1,$v1[1]);
break;
}
}
}else{
if(!is_array($v)){
$query->where($k,$v);
continue;
}
foreach ($v as $k1 => $v1){
if(!is_array($v1)){
$query->where($k1,$v1);
continue;
}
switch ($v1[0]){
case 'like':
// like查询 ['name|title'=> ['like','%a%']]
if (strpos($k1, '|') !== false) {
$query->where(function ($query) use ($k1,$v1) {
$item = explode('|', $k1);
foreach ($item as $vo) {
$query->orWhere($vo, $v1[0], $v1[1]);
}
});
} else {
$query->where($k1,$v1[0], $v1[1]);
}
break;
case 'in':
// in查询 ['id'=>['in'=>[1,2,3]]]
$query->whereIn($k1, $v1[1]);
break;
case 'no in':
// in查询 ['id'=>['not in'=>[1,2,3]]]
$query->whereNotIn($k1, $v1[1]);
break;
case 'between':
// in查询 ['id'=>['between'=>[create1,create2]]]
$query->whereBetween($k1, $v1[1]);
case 'not between':
// not between查询 ['created_at'=>['not between'=>['xxx', 'xxx]]]
$query->whereNotBetween($k1, $v1[1]);
break;
default:
$query->where($k1,$v1[0],$v1[1]);
break;
}
}
}
});
... ...
<?php
namespace App\Models\News;
use App\Models\Base;
class News extends Base
{
protected $table = 'gl_news';
}
... ...
<?php
namespace App\Models\News;
use App\Models\Base;
class NewsCategory extends Base
{
protected $table = 'gl_news_category';
}
... ...
... ... @@ -119,11 +119,11 @@ class User extends Base
public function edits($param){
//查看密码是否修改
$info = $this->read(['id'=>$param['id']]);
$param['password'] = base64_encode(md5($param['password']));
if($param['password'] == $info['password']){
unset($param['password']);
}
//密码加密
$param['password'] = base64_encode(md5($param['password']));
$rs = $this->edit($param,['id'=>$param['id']]);
if($rs === false){
return false;
... ...
... ... @@ -30,16 +30,24 @@ Route::middleware(['bloginauth'])->group(function () {
//group相关路由
Route::any('/project_group/add', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'add'])->name('project_group_add');
Route::any('/project_group/edit', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'edit'])->name('project_group_edit');
Route::any('/project_group/status', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'status'])->name('project_group_status');
Route::any('/project_group/lists', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'lists'])->name('project_group_lists');
Route::any('/project_group/del', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'del'])->name('project_group_del');
Route::any('/project_group/get_user_lists', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'get_user_lists'])->name('project_group_get_user_lists');
//新闻分类相关路由
Route::any('/news_category/add', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'add'])->name('news_category_add');
Route::any('/news_category/edit', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'edit'])->name('news_category_edit');
Route::any('/news_category/lists', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'lists'])->name('news_category_lists');
Route::any('/news_category/del', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'del'])->name('news_category_del');
Route::any('/news_category/status', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'get_user_lists'])->name('news_category_status');
//产品
Route::prefix('product')->group(function () {
//产品
Route::get('/', [\App\Http\Controllers\Bside\Product\ProductController::class, 'index'])->name('product');
Route::get('/info', [\App\Http\Controllers\Bside\Product\ProductController::class, 'info'])->name('product_info');
Route::post('/save', [\App\Http\Controllers\Bside\Product\ProductController::class, 'save'])->name('product_save');
Route::post('/save', [\App\Http\Controllers\Bside\Product\ProductController::class, 'save'])->name(' ');
Route::any('/delete', [\App\Http\Controllers\Bside\Product\ProductController::class, 'delete'])->name('product_delete');
//产品分类
... ...