推进管理员管理和权限管理

app/admin/controller/Admin.php

@@ -68,4 +68,22 @@ class Admin extends Common
 
         return $this->success('保存成功','Admin/edit');
     }
+
+    public function index()
+    {
+
+        $admin_list = AppAdmin::where('id','<>',1)->paginate();
+        View::assign('list',$admin_list);
+        return View::fetch();
+    }
+
+    public function create()
+    {
+        return View::fetch();
+    }
+
+    public function save()
+    {
+        
+    }
 }

app/admin/controller/AdminGroup.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\model\AdminGroup as AppAdminGroup;
+use think\facade\View;
+use think\Request;
+
+class AdminGroup extends Common
+{
+    /**
+     * 显示资源列表
+     *
+     * @return \think\Response
+     */
+    public function index()
+    {
+        //
+        $list = AppAdminGroup::select();
+        View::assign('list',$list);
+
+        return View::fetch();
+    }
+
+    /**
+     * 显示创建资源表单页.
+     *
+     * @return \think\Response
+     */
+    public function create()
+    {
+        //
+
+        return View::fetch();
+    }
+
+    /**
+     * 保存新建的资源
+     *
+     * @param  \think\Request  $request
+     * @return \think\Response
+     */
+    public function save(Request $request)
+    {
+        //
+    }
+
+    /**
+     * 显示指定的资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function read($id)
+    {
+        //
+    }
+
+    /**
+     * 显示编辑资源表单页.
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * 保存更新的资源
+     *
+     * @param  \think\Request  $request
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * 删除指定资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function delete($id)
+    {
+        //
+    }
+}

app/admin/controller/AdminPermission.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\model\AdminPermission as AppAdminPermission;
+use think\facade\View;
+use think\Request;
+
+class AdminPermission extends Common
+{
+    /**
+     * 显示资源列表
+     *
+     * @return \think\Response
+     */
+    public function index()
+    {
+        //
+
+        $list = AppAdminPermission::paginate();
+
+        View::assign('list',$list);
+
+        return View::fetch();
+    }
+
+
+    /**
+     * 保存更新的资源
+     *
+     * @param  \think\Request  $request
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+        $post_data = $request->post();
+
+        $model_permission = AppAdminPermission::find($id);
+
+        if(isset($post_data['url'])){
+            $url_info = \explode('/',$post_data['url']);
+
+            $post_data['app'] = $url_info[0];
+            $post_data['controller'] = $url_info[1];
+            $post_data['action'] = $url_info[2];
+        }
+
+        $model_permission->data($post_data);
+
+        $model_permission->save();
+
+        return json_message();
+    }
+
+    /**
+     * 删除指定资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function delete($id)
+    {
+        //
+    }
+}

app/admin/middleware.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    '\app\middleware\PermissionRecord'
+];

app/middleware/PermissionRecord.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\middleware;
+
+use app\model\AdminPermission;
+use app\Request;
+
+class PermissionRecord
+{
+    public function handle(Request $request, \Closure $next)
+    {
+
+        $current_access_info = [
+            'app'=>$request->app(),
+            'controller'=>$request->controller(),
+            'action'=>$request->action()
+        ];
+
+        $model_permission = AdminPermission::where($current_access_info)->find();
+
+        if(empty($model_permission)){
+            AdminPermission::create($current_access_info);
+        }
+
+        return $next($request);
+    }
+}

app/model/Admin.php

@@ -15,4 +15,11 @@ class Admin extends Model
     {
         return \get_source_link($value);
     }
+
+    public function getGroupAttr()
+    {
+        if(empty($this->getData('group_id'))){
+            return '未分组';
+        }
+    }
 }

app/model/AdminGroup.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\model;
+
+use think\Model;
+use think\model\concern\SoftDelete;
+
+/**
+ * @mixin think\Model
+ */
+class AdminGroup extends Model
+{
+    //
+    use SoftDelete;
+    protected $defaultSoftDelete = 0;
+}

app/model/AdminPermission.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\model;
+
+use think\Model;
+
+/**
+ * 权限表
+ * @mixin think\Model
+ */
+class AdminPermission extends Model
+{
+    //
+}

composer.lock

@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "league/flysystem",
-            "version": "1.0.54",
+            "version": "1.0.55",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "c681ed22508947a941f113d6cf51bdcf4b84faf9"
+                "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c681ed22508947a941f113d6cf51bdcf4b84faf9",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/33c91155537c6dc899eacdc54a13ac6303f156e6",
-                "reference": "c681ed22508947a941f113d6cf51bdcf4b84faf9",
+                "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -94,7 +94,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2019-08-23T21:50:05+00:00"
+            "time": "2019-08-24T11:17:19+00:00"
         },
         {
             "name": "league/flysystem-cached-adapter",
@@ -151,16 +151,16 @@
         },
         {
             "name": "opis/closure",
-            "version": "3.3.1",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opis/closure.git",
-                "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722"
+                "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/92927e26d7fc3f271efe1f55bdbb073fbb2f0722",
+                "url": "https://api.github.com/repos/opis/closure/zipball/60a97fff133b1669a5b1776aa8ab06db3f3962b7",
-                "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722",
+                "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -214,7 +214,7 @@
                 "serialization",
                 "serialize"
             ],
-            "time": "2019-07-09T21:58:11+00:00"
+            "time": "2019-09-02T21:07:33+00:00"
         },
         {
             "name": "psr/cache",
@@ -436,12 +436,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/top-think/framework.git",
-                "reference": "dbdaa91044bccbdeed564fbd672fd0ba24a3aadd"
+                "reference": "7c7d4e0e4afb7156167a9714fdbd26b6f7aa8934"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/top-think/framework/zipball/dbdaa91044bccbdeed564fbd672fd0ba24a3aadd",
+                "url": "https://api.github.com/repos/top-think/framework/zipball/7c7d4e0e4afb7156167a9714fdbd26b6f7aa8934",
-                "reference": "dbdaa91044bccbdeed564fbd672fd0ba24a3aadd",
+                "reference": "7c7d4e0e4afb7156167a9714fdbd26b6f7aa8934",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -496,7 +496,7 @@
                 "orm",
                 "thinkphp"
             ],
-            "time": "2019-08-23T13:10:19+00:00"
+            "time": "2019-09-01T11:17:14+00:00"
         },
         {
             "name": "topthink/think-captcha",
@@ -657,12 +657,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/top-think/think-orm.git",
-                "reference": "e8987c69c7cd9b4bd8358edf58004f94abc736d3"
+                "reference": "49c18c9ba68403451031f6afac9c6091cb071115"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/top-think/think-orm/zipball/e8987c69c7cd9b4bd8358edf58004f94abc736d3",
+                "url": "https://api.github.com/repos/top-think/think-orm/zipball/49c18c9ba68403451031f6afac9c6091cb071115",
-                "reference": "e8987c69c7cd9b4bd8358edf58004f94abc736d3",
+                "reference": "49c18c9ba68403451031f6afac9c6091cb071115",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -699,7 +699,7 @@
                 "database",
                 "orm"
             ],
-            "time": "2019-08-23T13:16:17+00:00"
+            "time": "2019-09-02T06:01:06+00:00"
         },
         {
             "name": "topthink/think-template",
@@ -924,16 +924,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v4.3.3",
+            "version": "v4.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "e4110b992d2cbe198d7d3b244d079c1c58761d07"
+                "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e4110b992d2cbe198d7d3b244d079c1c58761d07",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/641043e0f3e615990a0f29479f9c117e8a6698c6",
-                "reference": "e4110b992d2cbe198d7d3b244d079c1c58761d07",
+                "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1002,7 +1002,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2019-07-27T06:42:46+00:00"
+            "time": "2019-08-26T08:26:39+00:00"
         }
     ],
     "aliases": [],

view/admin/admin/create.html

@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>基本资料</title>
+    {include file="common/_require"}
+</head>
+<body class="layui-layout-body">
+    
+    <div class="layui-layout layui-layout-admin">
+        {include file="common/_header"}
+    
+        {include file="common/left_admin_manage"}
+    
+        <div class="layui-body">
+    
+            <div style="padding:15px">
+                <div class="main-header">
+                    <span class="layui-breadcrumb">
+                        <a>首页</a>
+                        <a><cite>添加管理员</cite></a>
+                    </span>
+                </div>
+                <div class="main-container">
+                    <div class="layui-row">
+                        <div class="layui-col-md6">
+                            <fieldset class="layui-elem-field">
+                                <legend>管理员管理</legend>
+                                <div class="layui-field-box">
+                                    <form action="{:url('Admin/save')}" method="POST" class="layui-form">
+                                        <div class="layui-form-item">
+                                            <div class="layui-form-label">登录账号</div>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="account" required lay-verify="required" value="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-form-label">昵称</div>
+                                            <div class="layui-input-block">
+                                                <input type="text" name="nickname" required lay-verify="required" value="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-form-label">密码</div>
+                                            <div class="layui-input-block">
+                                                <input type="password" name="password" required lay-verify="required" value="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-form-label">头像</div>
+                                            <div class="layui-input-block">
+                                                <div>
+                                                    <div class="layui-btn upload-admin-avatar">上传</div>
+                                                </div>
+                                                <div>
+                                                    <img class="layui-circle admin-avatar" style="width: 80px" src="" alt="" srcset="">
+                                                </div>
+                                                <input type="hidden" name="avatar" value="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <button class="layui-btn layui-btn-fluid" type="submit">创建</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            </fieldset>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    
+    
+        {include file="common/_footer"}
+
+        <script>
+            layui.config({
+                base:'/static/lib/layui/lib/cropper/'
+            }).use(['layer','upload','croppers'],function(){
+                var upload = layui.upload;
+                var croppers = layui.croppers;
+                
+
+                var uploadSiteLogo = croppers.render({
+                    elem:'.upload-admin-avatar',
+                    url:'{:url("api/Files/save")}',
+                    data:{
+                        type:2,
+                        dir:'admin_avatar'
+                    }
+                    ,saveW:150     //保存宽度
+                    ,saveH:150
+                    ,mark:1/1    //选取比例
+                    ,area:'900px'  //弹窗宽度
+                    ,accept:'images',
+                    done:function(result){
+                        if(result.code == 0){
+                            layer.msg('上传成功');
+                            $('input[name="avatar"]').val(result.data.save_name);
+                            $('.admin-avatar').attr('src',result.data.src);
+                        }else{
+                            layer.msg(result.msg)
+                        }
+                    }
+                })
+
+            })
+        </script>
+    </div>
+</body>
+</html>

view/admin/admin/index.html

@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>应用管理</title>
+    {include file="common/_require"}
+</head>
+
+<body class="layui-layout-body">
+
+    <div class="layui-layout layui-layout-admin">
+        {include file="common/_header"}
+
+        {include file="common/left_admin_manage"}
+
+        <div class="layui-body">
+
+            <div style="padding:15px">
+                <div class="main-header">
+                    <span class="layui-breadcrumb">
+                        <a>首页</a>
+                        <a><cite>管理员管理</cite></a>
+                    </span>
+                </div>
+                <div class="main-container">
+                    <div>
+                        <a class="layui-btn" href="{:url('Admin/create')}">添加管理员</a>
+                    </div>
+                    <div>
+                        <table class="layui-table">
+                            <thead>
+                                <tr>
+                                    <th>ID</th>
+                                    <th>头像</th>
+                                    <th>账号</th>
+                                    <th>昵称</th>
+                                    <th>分组</th>
+                                    <th>操作</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {volist name='$list' id='vo'}
+                                    
+                                <tr>
+                                    <td>{$vo.id}</td>
+                                    <td><img src="{$vo.avatar}" alt=""></td>
+                                    <td>{$vo.account}</td>
+                                    <td>{$vo.nickname}</td>
+                                    <td>{$vo.group}</td>
+                                    <td>
+                                        <div class="layui-btn-container">
+                                            <a class="layui-btn layui-btn-sm" href="{:url('Admin/editaccount',['id'=>{$vo.id}])}">编辑</a>
+                                            <div class="layui-btn layui-btn-sm">
+                                                删除
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                                {/volist}
+                                {if condition="count($list) eq 0" }
+                                    <tr>
+                                        <td colspan="6">暂无数据</td>
+                                    </tr>
+                                {/if}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+        {include file="common/_footer"}
+    </div>
+</body>
+
+</html>

view/admin/admin_group/index.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>应用管理</title>
+    {include file="common/_require"}
+</head>
+<body class="layui-layout-body">
+    
+    <div class="layui-layout layui-layout-admin">
+        {include file="common/_header"}
+    
+        {include file="common/left_admin_manage"}
+    
+        <div class="layui-body">
+    
+            <div style="padding:15px">
+                <div class="main-header">
+                    <span class="layui-breadcrumb">
+                        <a>首页</a>
+                        <a><cite>系统信息</cite></a>
+                    </span>
+                </div>
+                <div class="main-container">
+                    <div>
+                        <div class="layui-btn-container">
+                            <a class="layui-btn" href="{:url('AdminGroup/create')}">添加分组</a>
+                        </div>
+                    </div>
+                    <div>
+                        <table class="layui-table">
+                            <thead>
+                                <tr>
+                                    <th>ID</th>
+                                    <th>分组名称</th>
+                                    <th>操作</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                
+                                {if condition="count($list) eq 0" }
+                                    <tr>
+                                    <td colspan="3">暂无数据</td>
+                                    </tr>
+                                {/if}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    
+    
+        {include file="common/_footer"}
+    </div>
+</body>
+</html>

view/admin/admin_permission/index.html

@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>应用管理</title>
+    {include file="common/_require"}
+</head>
+
+<body class="layui-layout-body">
+
+    <div class="layui-layout layui-layout-admin">
+        {include file="common/_header"}
+
+        {include file="common/left_admin_manage"}
+
+        <div class="layui-body">
+
+            <div style="padding:15px">
+                <div class="main-header">
+                    <span class="layui-breadcrumb">
+                        <a>首页</a>
+                        <a><cite>系统信息</cite></a>
+                    </span>
+                </div>
+                <div class="main-container">
+                    <div>
+                        <div class="layui-btn-container">
+                            <div class="layui-btn">添加权限</div>
+                        </div>
+                    </div>
+                    <div>
+                        <table class="layui-table">
+                            <thead>
+                                <tr>
+                                    <th>ID</th>
+                                    <th>权限名称</th>
+                                    <th>权限URL</th>
+                                    <th>操作</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {volist name='list' id='vo'}
+                                    
+                                <tr class="item" data-id="{$vo.id}">
+                                    <td>{$vo.id}</td>
+                                    <td>
+                                        <span>{$vo.name}</span>
+                                        <div class="layui-btn layui-btn-sm set-name" data-name="{$vo.name}">设置</div>
+                                    </td>
+                                    <td>
+                                        <span>{$vo.app}/{$vo.controller}/{$vo.action}</span>
+                                        <div class="layui-btn layui-btn-sm set-url" data-url="{$vo.app}/{$vo.controller}/{$vo.action}">设置</div>
+                                    </td>
+                                    <td>
+                                        <div class="layui-btn-container">
+                                            <div class="layui-btn layui-btn-sm delete">删除</div>
+                                        </div>
+                                    </td>
+                                </tr>
+                                {/volist}
+                               {if condition="count($list) eq 0" }
+                                   <tr>
+                                       <td colspan="3">暂无数据</td>
+                                   </tr>
+                               {/if}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+
+        {include file="common/_footer"}
+
+        <script>
+        
+            layui.use(['layer'],function(){
+                $('.set-name').click(function(){
+                    var item = this;
+                    layer.prompt({
+                        value:$(item).data('name')
+                    },function(value,index){
+                        $.post('{:url("AdminPermission/update")}',{
+                            id:$(item).parents('tr').data('id'),
+                            name:value
+                        },function(result){
+                            layer.close(index)
+                            $(item).siblings('span').text(value)
+                        })
+                    })
+                })
+                $('.set-url').click(function(){
+                    var item = this;
+                    layer.prompt({
+                        value:$(item).data('url')
+                    },function(value,index){
+                        $.post('{:url("AdminPermission/update")}',{
+                            id:$(item).parents('tr').data('id'),
+                            url:value
+                        },function(result){
+                            layer.close(index)
+                            $(item).siblings('span').text(value)
+                        })
+                    })
+                })
+
+                $('.delete').click(function(){
+                    
+                })
+            })
+        
+        </script>
+    </div>
+</body>
+
+</html>

view/admin/common/_header.html

@@ -5,6 +5,7 @@
         <li class="layui-nav-item"><a href="{:url('admin/Index/index')}">首页</a></li>
         <li class="layui-nav-item"><a href="">用户管理</a></li>
         <li class="layui-nav-item"><a href="{:url('File/index')}">文件管理</a></li>
+        <li class="layui-nav-item"><a href="{:url('admin/Admin/index')}">管理员管理</a></li>
         <li class="layui-nav-item"><a href="{:url('admin/System/index')}">系统设置</a></li>
     </ul>
     <ul class="layui-nav layui-layout-right">

view/admin/common/left_admin_manage.html

@@ -0,0 +1,16 @@
+<div class="layui-side layui-bg-black">
+    <div class="layui-side-scroll">
+        <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
+        <ul class="layui-nav layui-nav-tree" lay-filter="test">
+            <li class="layui-nav-item layui-nav-itemed">
+                <a class="" href="{:url('admin/Admin/index')}">管理员列表</a>
+            </li>
+            <li class="layui-nav-item layui-nav-itemed">
+                <a class="" href="{:url('admin/AdminGroup/index')}">分组管理</a>
+            </li>
+            <li class="layui-nav-item layui-nav-itemed">
+                <a class="" href="{:url('admin/AdminPermission/index')}">权限管理</a>
+            </li>
+        </ul>
+    </div>
+</div>