Skip to content

W
workbiu-admin
Commit 75932c50 authored by gxx's avatar gxx
Browse files
Options

新增用户权限表

parent 05d76b0c
Show whitespace changes
Inline Side-by-side
Showing with 470 additions and 36 deletions
app/Http/Controllers/AuthController.php
View file @ 75932c50
......@@ -2,17 +2,48 @@
namespace App\Http\Controllers;
use App\Models\Role;
use App\Models\User;
use App\Util\Message;
use Illuminate\Http\Request;
class AuthController extends Controller
{
public function add()
{
// $result =false;
// try{
// $owner = new Role();
// $owner->name = '第10权限';
// $owner->display_name = '这是最最最最厉害的3权限';
// $owner->description = 'heihh';
// $owner->save();
// $result = true;
// }catch (\Exception $e){
// // 生成日志；
// }
// if ($result){
// return Message::makeSuccess('6666');
// }
// return Message::makeError('2333333');
//
// $user = User::where('id','=','2')->first();
//
// $user->attachRole('1');
//
// dd($user);
}
public function getAll()
{
echo 123;
return view('admin/auth/authtables');
$roles = Role::paginate(6);
return view('admin/auth/authtables',compact('roles'));
}
}
app/Models/Role.php 0 → 100644
View file @ 75932c50
<?php
/**
* Created by PhpStorm.
* User: Aladin
* Date: 2017/10/12
* Time: 14:07
*/
namespace App\Models;
use Zizaco\Entrust\EntrustRole;
class Role extends EntrustRole
{
}
\ No newline at end of file
app/Models/User.php
View file @ 75932c50
......@@ -4,10 +4,16 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Notifications\Notifiable;
use Zizaco\Entrust\Traits\EntrustRoleTrait as EntrustUserTrait;
class User extends Model
{
use SoftDeletes;
use Notifiable;
use EntrustUserTrait { restore as private restoreA; }
use SoftDeletes { restore as private restoreB; }
protected $dates = ['delete_at'];
protected $hidden =['password'];
......@@ -38,4 +44,10 @@ class User extends Model
{
return $this->hasMany('App\Models\Schedule','creator_id','id');
}
public function restore()
{
$this->restoreA();
$this->restoreB();
}
}
composer.lock
View file @ 75932c50
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "31667d774c1e0cb4754ae6075f8d724d",
"content-hash": "d4e3e944fa48764ff2615b64aecbebe5",
"packages": [
{
"name": "dnoegel/php-xdg-base-dir",
......@@ -2463,6 +2463,74 @@
"environment"
],
"time": "2016-09-01T10:05:43+00:00"
},
{
"name": "zizaco/entrust",
"version": "5.2.x-dev",
"source": {
"type": "git",
"url": "https://github.com/Zizaco/entrust.git",
"reference": "3623cc052937d9e62543402b50f24065720d44b9"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/Zizaco/entrust/3623cc052937d9e62543402b50f24065720d44b9.zip",
"reference": "3623cc052937d9e62543402b50f24065720d44b9",
"shasum": ""
},
"require": {
"illuminate/cache": "~5.0",
"illuminate/console": "~5.0",
"illuminate/support": "~5.0",
"php": ">=5.5.0"
},
"require-dev": {
"illuminate/database": "~5.0",
"mockery/mockery": "dev-master",
"phpunit/phpunit": "~4.1",
"sami/sami": "dev-master"
},
"type": "library",
"autoload": {
"classmap": [
"src/commands"
],
"psr-4": {
"Zizaco\\Entrust\\": "src/Entrust/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Andrew Elkins",
"homepage": "http://andrewelkins.com"
},
{
"name": "Zizaco Zizuini",
"email": "zizaco@gmail.com"
},
{
"name": "Ben Batschelet",
"homepage": "http://github.com/bbatsche"
},
{
"name": "Michele Angioni",
"email": "michele.angioni@gmail.com"
}
],
"description": "This package provides a flexible way to add Role-based Permissions to Laravel",
"keywords": [
"acl",
"auth",
"illuminate",
"laravel",
"permission",
"roles"
],
"time": "2016-12-29T06:25:06+00:00"
}
],
"packages-dev": [
......@@ -4139,7 +4207,9 @@
],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": [],
"stability-flags": {
"zizaco/entrust": 20
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
......
config/app.php
View file @ 75932c50
......@@ -186,6 +186,7 @@ return [
App\Providers\SMSServiceProvider::class,
App\Providers\UserServiceProvider::class,
Zizaco\Entrust\EntrustServiceProvider::class,
......@@ -238,6 +239,9 @@ return [
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
'Entrust' => Zizaco\Entrust\EntrustFacade::class,
],
];
config/auth.php
View file @ 75932c50
......@@ -68,12 +68,13 @@ return [
'users' => [
'driver' => 'eloquent',
'model' => App\User::class,
'table' => 'users',
],
// 'users' => [
// 'driver' => 'database',
// 'table' => 'users',
// ],
// 'users' => [
// 'driver' => 'database',
// 'table' => 'users',
// ],
],
/*
......
config/entrust.php 0 → 100644
View file @ 75932c50
<?php
/**
* This file is part of Entrust,
* a role & permission management solution for Laravel.
*
* @license MIT
* @package Zizaco\Entrust
*/
return [
/*
|--------------------------------------------------------------------------
| Entrust Role Model
|--------------------------------------------------------------------------
|
| This is the Role model used by Entrust to create correct relations. Update
| the role if it is in a different namespace.
|
*/
'role' => 'App\Role',
/*
|--------------------------------------------------------------------------
| Entrust Roles Table
|--------------------------------------------------------------------------
|
| This is the roles table used by Entrust to save roles to the database.
|
*/
'roles_table' => 'roles',
/*
|--------------------------------------------------------------------------
| Entrust Permission Model
|--------------------------------------------------------------------------
|
| This is the Permission model used by Entrust to create correct relations.
| Update the permission if it is in a different namespace.
|
*/
'permission' => 'App\Permission',
/*
|--------------------------------------------------------------------------
| Entrust Permissions Table
|--------------------------------------------------------------------------
|
| This is the permissions table used by Entrust to save permissions to the
| database.
|
*/
'permissions_table' => 'permissions',
/*
|--------------------------------------------------------------------------
| Entrust permission_role Table
|--------------------------------------------------------------------------
|
| This is the permission_role table used by Entrust to save relationship
| between permissions and roles to the database.
|
*/
'permission_role_table' => 'permission_role',
/*
|--------------------------------------------------------------------------
| Entrust role_user Table
|--------------------------------------------------------------------------
|
| This is the role_user table used by Entrust to save assigned roles to the
| database.
|
*/
'role_user_table' => 'role_user',
/*
|--------------------------------------------------------------------------
| User Foreign key on Entrust's role_user Table (Pivot)
|--------------------------------------------------------------------------
*/
'user_foreign_key' => 'user_id',
/*
|--------------------------------------------------------------------------
| Role Foreign key on Entrust's role_user Table (Pivot)
|--------------------------------------------------------------------------
*/
'role_foreign_key' => 'role_id',
];
database/migrations/2017_10_12_140450_entrust_setup_tables.php 0 → 100644
View file @ 75932c50
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class EntrustSetupTables extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
// Create table for storing roles
Schema::create('roles', function (Blueprint $table) {
$table->increments('id');
$table->string('name')->unique();
$table->string('display_name')->nullable();
$table->string('description')->nullable();
$table->timestamps();
});
// Create table for associating roles to users (Many-to-Many)
Schema::create('role_user', function (Blueprint $table) {
$table->integer('user_id')->unsigned();
$table->integer('role_id')->unsigned();
$table->foreign('user_id')->references('id')->on('users')
->onUpdate('cascade')->onDelete('cascade');
$table->foreign('role_id')->references('id')->on('roles')
->onUpdate('cascade')->onDelete('cascade');
$table->primary(['user_id', 'role_id']);
});
// Create table for storing permissions
Schema::create('permissions', function (Blueprint $table) {
$table->increments('id');
$table->string('name')->unique();
$table->string('display_name')->nullable();
$table->string('description')->nullable();
$table->timestamps();
});
// Create table for associating permissions to roles (Many-to-Many)
Schema::create('permission_role', function (Blueprint $table) {
$table->integer('permission_id')->unsigned();
$table->integer('role_id')->unsigned();
$table->foreign('permission_id')->references('id')->on('permissions')
->onUpdate('cascade')->onDelete('cascade');
$table->foreign('role_id')->references('id')->on('roles')
->onUpdate('cascade')->onDelete('cascade');
$table->primary(['permission_id', 'role_id']);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('permission_role');
Schema::drop('permissions');
Schema::drop('role_user');
Schema::drop('roles');
}
}
resources/views/admin/auth/add.blade.php 0 → 100644
View file @ 75932c50
@extends('admin/dashboard')
@section('content')
<!-- general form elements -->
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">新增权限</h3>
</div>
<!-- /.box-header -->
<!-- form start -->
<form role="form" action="{{url('auth/add')}}" method="post" enctype="multipart/form-data">
{{csrf_field()}}
<div class="box-body">
<div class="form-group">
<label for="exampleInputFile">头像</label>
<p>
<img src="{{asset($result['head_icon'])}}" alt="" width="100px" height="80px" style="border-radius: 80%">
</p>
</div>
<div class="form-group">
<label for="exampleInputEmail1">用户名</label>
<input type="text" class="form-control" id="exampleInputEmail1" placeholder="User_email" name="user_name" value="{{$result['user_name']}}">
<input type="hidden" name="id" value="{{$result['id']}}">
</div>
<div class="form-group">
<label for="exampleInputPassword1">真实姓名</label>
<input type="text" class="form-control" id="exampleInputPassword1" placeholder="Real_name" name="real_name" value="{{$result['real_name']}}">
</div>
<div class="form-group">
<label for="exampleInputPassword1">手机</label>
<input type="text" class="form-control" id="exampleInputPassword1" placeholder="Phone" name="phone" value="{{$result['phone']==''?'':$result['phone']}}">
</div>
<div class="form-group">
<label for="exampleInputEmail1">性别</label>
<input type="text" class="form-control" id="exampleInputEmail1" placeholder="Gender" name="gender" value="{{$result['gender']==0?'男':'女'}}">
</div>
<div class="form-group">
<label for="exampleInputPassword1">邮箱</label>
<input type="email" class="form-control" id="exampleInputPassword1" placeholder="Email" name="email" value="{{$result['email']==''?'':$result['email']}}">
</div>
<div class="form-group">
<label for="exampleInputFile">更换头像</label>
<input type="file" id="exampleInputFile" name="head_icon" >
</div>
</div>
<!-- /.box-body -->
<div class="box-footer">
<button type="submit" class="btn btn-primary">保存</button>
</div>
</form>
</div>
<script src="{{url('js/jquery-3.2.1.min.js')}}"> </script>
{{--<script>--}}
{{--$("#exampleInputFile").change(function(){--}}
{{--var file = this.files[0];--}}
{{--// 判断文件大小--}}
{{--if(file.size > 5*1024*1024){--}}
{{--alert('文件过大！');--}}
{{--}--}}
{{--// 使用FileReader 接口--}}
{{--var reader = new FileReader();--}}
{{--// 成功读取--}}
{{--reader.onload = function(){--}}
{{--// 通过reader.result 属性 来访问生成的 base 64 DataURL--}}
{{--var fileInfo = reader.result;--}}
{{--$('#Preview').attr('src',fileInfo).css({width:100,height:90});--}}
{{--//console.log(fileInfo);--}}
{{--var name = $('#exampleInputFile').val();--}}
{{--// 分割字符串--}}
{{--var arr = name.split('\\');--}}
{{--var fileName = arr[arr.length-1];--}}
{{--base64_uploading(fileInfo,fileName);--}}
{{--}--}}
{{--reader.readAsDataURL(file);--}}
{{--})--}}
{{--//AJAX 上传base 64--}}
{{--function base64_uploading(base64Data,fileName){--}}
{{--$.ajax({--}}
{{--type: 'post',--}}
{{--url: "{{url('user/update')}}",--}}
{{--data: {--}}
{{--'base64':base64Data,--}}
{{--'name':fileName--}}
{{--},--}}
{{--dataType:"json",--}}
{{--headers: {--}}
{{--'X-CSRF-TOKEN': $('meta[name="_token"]').attr('content')--}}
{{--},--}}
{{--success:function(data){--}}
{{--console.log(data);--}}
{{--if (data ==1 ){--}}
{{--alert('上传成功')--}}
{{--}else {--}}
{{--alert('上传失败')--}}
{{--}--}}
{{--},--}}
{{--error:function (data) {--}}
{{--alert(1);--}}
{{--console.log(data);--}}
{{--}--}}
{{--})--}}
{{--}--}}
{{--</script>--}}
@endsection
\ No newline at end of file
resources/views/admin/auth/authtables.blade.php
View file @ 75932c50
......@@ -47,32 +47,29 @@
<tr>
<th>ID</th>
<th>权限名称</th>
<th>创建者</th>
<th>简介</th>
<th>cover_img</th>
<th>角色唯一标识</th>
<th>角色名</th>
<th>角色描述</th>
<th>操作</th>
</tr>
</thead>
{{--@if($projects == null)--}}
{{--<tbody>--}}
{{--<tr>--}}
{{--<td colspan="8" style="text-align: center;color: red"> 数据暂无 </td>--}}
{{--</tr>--}}
{{--</tbody>--}}
{{--</table>--}}
{{--@else--}}
{{--@foreach($projects as $project)--}}
@if($roles == null)
<tbody>
<tr>
<td colspan="8" style="text-align: center;color: red"> 数据暂无 </td>
</tr>
</tbody>
</table>
@else
@foreach($roles as $role)
<tbody>
<tr>
<td>1</td>
<td>上天权限</td>
<td>{{$role['id']}}</td>
<td>{{$role['name']}}</td>
<td></td>
<td></td>
<td><img src="" alt="" width="50px" height="40px"> </td>
<td>{{$role['display_name']}}</td>
<td>{{$role['description']}}</td>
<td>
<a href="" class="btn btn-info" > 查看详情 </a>
......@@ -81,9 +78,9 @@
</td>
</tr>
</tbody>
{{--@endforeach--}}
@endforeach
</table>
{{--{{ $groups->links() }}--}}
{{ $roles->links() }}
</div>
<!-- /.box-body -->
</div>
......@@ -93,5 +90,5 @@
</div>
<!-- /.row -->
</section>
{{--@endif--}}
@endif
@endsection
\ No newline at end of file
resources/views/admin/sidebar.blade.php
View file @ 75932c50
......@@ -71,6 +71,7 @@
</a>
<ul class="treeview-menu">
<li><a href="{{url('auth/getAll')}}">权限列表</a></li>
<li><a href="{{url('auth/add')}}">新增权限</a></li>
{{--<li><a href="#">Link in level 2</a></li>--}}
</ul>
......
resources/views/auth/login.blade.php
View file @ 75932c50
......@@ -15,8 +15,7 @@
<label for="email" class="col-md-4 control-label">E-Mail Address</label>
<div class="col-md-6">
{{--<input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required autofocus>--}}
<input id="email" type="text" class="form-control" name="phone" value="{{ old('phone') }}" required autofocus>
<input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required autofocus>
@if ($errors->has('email'))
<span class="help-block">
......
routes/web.php
View file @ 75932c50
......@@ -82,6 +82,7 @@ Route::group(['prefix'=> 'project'],function (){
// 权限
Route::group(['prefix'=> 'auth'],function (){
Route::get('getAll','AuthController@getAll')->name('auth.getAll');
Route::get('add','AuthController@add')->name('auth.add');
});
......@@ -101,3 +102,7 @@ Route::get('table',function (){
Auth::routes();
Route::get('/home', 'HomeController@index')->name('home');
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment