background update

application/common.php

@@ -52,7 +52,8 @@ function json_success($data=[],$msg='ok')
 
 function json_error($code,$msg='')
 {
-    json_return(json_error_exception($code,$msg));
+    $error = json_error_exception($code,$msg);
+    json_return($error['code'],[],$error['msg']);
 }
 
 /**
@@ -125,42 +126,6 @@ function _curl(array $params,$is_json=false )
 
     return $result;
 }
-
-/**
- * 整理菜单住方法
- * @param $param
- * @return array
- */
-function prepareMenu($param)
-{
-    $param = objToArray($param);
-    $parent = []; //父类
-    $child = [];  //子类
-
-    foreach($param as $key=>$vo){
-
-        if(0 == $vo['type_id']){
-            $vo['href'] = '#';
-            $parent[] = $vo;
-        }else{
-            $vo['href'] = url($vo['control_name'] .'/'. $vo['action_name']); //跳转地址
-            $child[] = $vo;
-        }
-    }
-
-    foreach($parent as $key=>$vo){
-        foreach($child as $k=>$v){
-
-            if($v['type_id'] == $vo['id']){
-                $parent[$key]['child'][] = $v;
-            }
-        }
-    }
-    unset($child);
-
-    return $parent;
-}
-
 /**
  * 统一返回信息
  * @param $code
@@ -171,46 +136,6 @@ function msg($code, $data, $msg)
 {
     return compact('code', 'data', 'msg');
 }
-
-/**
- * 整理出tree数据 ---  layui tree
- * @param $pInfo
- * @param $spread
- */
-function getTree($pInfo, $spread = true)
-{
-
-    $res = [];
-    $tree = [];
-    //整理数组
-    foreach($pInfo as $key=>$vo){
-
-        if($spread){
-            $vo['spread'] = true;  //默认展开
-        }
-        $res[$vo['id']] = $vo;
-        $res[$vo['id']]['children'] = [];
-    }
-    unset($pInfo);
-
-    //查找子孙
-    foreach($res as $key=>$vo){
-        if(0 != $vo['pid']){
-            $res[$vo['pid']]['children'][] = &$res[$key];
-        }
-    }
-
-    //过滤杂质
-    foreach( $res as $key=>$vo ){
-        if(0 == $vo['pid']){
-            $tree[] = $vo;
-        }
-    }
-    unset( $res );
-
-    return $tree;
-}
-
 /**
  * 对象转换成数组
  * @param $obj
@@ -218,23 +143,4 @@ function getTree($pInfo, $spread = true)
 function objToArray($obj)
 {
     return json_decode(json_encode($obj), true);
-}
-
-
-/**
- * 权限检测
- * @param $rule
- */
-function authCheck($rule)
-{
-    $control = explode('/', $rule)['0'];
-    if(in_array($control, ['login', 'index'])){
-        return true;
-    }
-
-    if(in_array($rule, cache(session('role_id')))){
-        return true;
-    }
-
-    return false;
 }

application/index/controller/Base.php

@@ -2,52 +2,16 @@
 namespace app\index\controller;
 
 use think\Controller;
-use app\index\model\RoleModel;
 
 class Base extends Controller{
-
-    private $noCheck = ['cabinet/check_fcode' , 'cabinet/record_store' , 'cabinet/record_fetch' , 'cabinet/add_cabinet' , 'order/order_bind_code'];
     const redis_host = 'lredis';
     const redis_port = 6379;
     const queue_name = 'net_access_queue';
 
     public function initialize(){
-        $control = lcfirst(request()->controller());
-        $action = lcfirst(request()->action());
-        $checkUrl = $control . '/' . $action;
-//        if(!in_array($checkUrl , $this->noCheck)){
-//            if(empty(session('username')) || empty(session('id'))){
-//                //登录超时
-//                json(json_error_exception('1005'))->send();
-//            }
-//            $this->cacheCheck();
-//            // 检测权限
-//            if(empty(authCheck($checkUrl))){
-//                json(json_error_exception('1000'))->send();
-//            }
-//        }
-    }
-
-    private function cacheCheck()
-    {
-        $action = cache(session('role_id'));
-
-        if(is_null($action) || empty($action)){
-
-            // 获取该管理员的角色信息
-            $roleModel = new RoleModel();
-            $info = $roleModel->getRoleInfo(session('role_id'));
-            cache(session('role_id'), $info['action']);
-        }
-    }
-
-    protected function removeRoleCache()
-    {
-        $roleModel = new RoleModel();
-        $roleList = $roleModel->getRole();
-
-        foreach ($roleList as $value) {
-            cache($value['id'], null);
+        if(empty(session('username')) || empty(session('id'))){
+            //登录超时
+            json(json_error_exception('1005'))->send();
         }
     }
 }

application/index/controller/Cabinet.php

@@ -10,6 +10,7 @@ use app\index\model\BoxActionModel;
 use app\index\model\CabinetModel;
 use app\index\model\BoxModel;
 use app\index\model\OrderModel;
+use app\index\model\UserModel;
 use think\App;
 use think\facade\Log;
 use think\Session;
@@ -229,6 +230,26 @@ class Cabinet extends Base
     }
 
 
+    public function CabinetList(){
+        $param = input('param.');
+
+        $limit = isset($param['pageSize']) ? $param['pageSize'] : 10;
+        $param['pageNumber'] = isset($param['pageNumber']) ? $param['pageNumber'] : 1;
+        $offset = ($param['pageNumber'] - 1) * $limit;
+
+        $CabinetModel = new CabinetModel();
+        $selectResult = $CabinetModel->getCabinetsByWhere($offset, $limit);
+
+        // 拼装参数
+        foreach($selectResult as $key=>$vo){
+
+        }
+        $return['total'] = $CabinetModel->getAllCabinets();  //总数量
+        $return['rows'] = $selectResult;
+        json_success($return);
+    }
+
+
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     private function proc_request($queue_name, $key, $params){

application/index/controller/Index.php

@@ -1,15 +1,11 @@
 <?php
 namespace app\index\controller;
 
-use app\index\model\NodeModel;
 
 class Index extends Base
 {
     public function index()
     {
-        // 获取权限菜单
-        $node = new NodeModel();
-        $menu = $node->getMenu(session('rules'));
-        json_return(200,$menu,'success');
+        echo 'hi';
     }
 }

application/index/controller/Login.php

@@ -14,7 +14,7 @@ class Login extends Controller{
         $password = input('post.password');
 
         $UserModel = new UserModel();
-        $hasUser = $UserModel->checkUser($username,$password);
+        $hasUser = $UserModel->checkUser($username);
         if(empty($hasUser)){
             //管理员不存在
             return json(json_error_exception('1001'));
@@ -30,7 +30,7 @@ class Login extends Controller{
         // 更新管理员状态
         $param = [
             'last_login_ip' => request()->ip(),
-            'last_login_time' => date()
+            'last_login_time' => date("Y-m-d H:i:s"),
         ];
 
         $res = $UserModel->updateStatus($param, $hasUser['id']);
@@ -40,9 +40,6 @@ class Login extends Controller{
         }
         session('username', $hasUser['user_name']);
         session('id', $hasUser['id']);
-        session('role', $hasUser['role_name']);
-        session('role_id', $hasUser['role_id']);
-        session('rules', $hasUser['rules']);
 
         json_return(200,[],'success');
     }
@@ -52,9 +49,6 @@ class Login extends Controller{
     public function login_out(){
         session('username', null);
         session('id', null);
-        session('role', null);
-        session('role_id', null);
-        session('rule', null);
         json_return(200,[],'success');
     }
 }

application/index/controller/Node.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace app\index\controller;
-
-use app\index\controller\Base;
-use app\index\model\NodeModel;
-
-class Node extends Base{
-
-    // 节点列表
-    public function nodeList()
-    {
-        $node = new NodeModel();
-        $nodes = $node->getNodeList();
-
-        $nodes = getTree(objToArray($nodes), false);
-        json_return(200 , $nodes , 'success');
-    }
-
-    // 添加节点
-    public function nodeAdd()
-    {
-        $param = input('post.');
-
-        $node = new NodeModel();
-        $flag = $node->insertNode($param);
-        if($flag['code'] != 1){
-            return json(json_error_exception('1006',$flag['msg']));
-        }
-        $this->removeRoleCache();
-        json_return(200,[],'success');
-    }
-
-    // 删除节点
-    public function nodeDel()
-    {
-        $id = input('param.id');
-
-        $role = new NodeModel();
-        $flag = $role->delNode($id);
-        if($flag['code'] != 1){
-            return json(json_error_exception('1006',$flag['msg']));
-        }
-        $this->removeRoleCache();
-        json_return(200,[],'success');
-    }
-
-}

application/index/controller/Role.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace app\index\controller;
-
-use app\index\controller\Base;
-use app\index\model\RoleModel;
-class Role extends Base{
-
-    // 角色列表
-    public function roleList()
-    {
-        $param = input('param.');
-
-        $limit = isset($param['pageSize']) ? $param['pageSize'] : 10;
-        $param['pageNumber'] = isset($param['pageNumber']) ? $param['pageNumber'] : 1;
-        $offset = ($param['pageNumber'] - 1) * $limit;
-
-        $where = [];
-        if (!empty($param['searchText'])) {
-            $where['role_name'] = ['like', '%' . $param['searchText'] . '%'];
-        }
-
-        $user = new RoleModel();
-        $selectResult = $user->getRoleByWhere($where, $offset, $limit);
-
-        $return['total'] = $user->getAllRole($where);  // 总数据
-        $return['rows'] = $selectResult;
-
-        json_return(200 , $return , 'success');
-    }
-
-    // 添加角色
-    public function roleAdd()
-    {
-        $param = input('post.');
-        $validate = new \app\index\validate\RoleValidate;
-        if (!$validate->check($param)) {
-            return json(json_error_exception('1006',$validate->getError()));
-        }
-        $role = new RoleModel();
-        $flag = $role->insertRole($param);
-        if($flag['code'] != 1){
-            return json(json_error_exception('1006',$flag['msg']));
-        }
-        json_return(200,[],'success');
-    }
-
-    // 删除角色
-    public function roleDel()
-    {
-        $id = input('post.id');
-        $role = new RoleModel();
-        $flag = $role->delRole($id);
-        if($flag['code'] != 1){
-            return json(json_error_exception('1006',$flag['msg']));
-        }
-        $this->removeRoleCache();
-        json_return(200,[],'success');
-    }
-}

application/index/controller/User.php

@@ -8,7 +8,7 @@ use app\index\model\UserModel;
 class User extends Base{
 
     //用户列表
-    public function userList()
+    public function UserList()
     {
         $param = input('param.');
 
@@ -36,7 +36,7 @@ class User extends Base{
     }
 
     // 添加用户
-    public function userAdd()
+    public function UserAdd()
     {
         $param = input('post.');
 
@@ -54,12 +54,12 @@ class User extends Base{
     }
 
     // 删除用户
-    public function userDel()
+    public function UserDel()
     {
         $id = input('param.id');
 
-        $role = new UserModel();
-        $flag = $role->delUser($id);
+        $UserModel = new UserModel();
+        $flag = $UserModel->delUser($id);
         if($flag['code'] != 1){
             return json(json_error_exception('1006',$flag['msg']));
         }

application/index/model/CabinetModel.php

@@ -51,4 +51,24 @@ class CabinetModel extends Model{
         }
     }
 
+    /**
+     * 根据搜索条件获取用户列表信息
+     * @param $where
+     * @param $offset
+     * @param $limit
+     */
+    public function getCabinetsByWhere( $offset, $limit)
+    {
+        return $this->limit($offset, $limit)->order('id desc')->select();
+    }
+
+    /**
+     * 根据搜索条件获取所有的用户数量
+     * @param $where
+     */
+    public function getAllCabinets()
+    {
+        return $this->count();
+    }
+
 }

application/index/model/NodeModel.php

@@ -1,77 +0,0 @@
-<?php
-
-namespace app\index\model;
-
-use think\Model;
-
-class NodeModel extends Model{
-    // 确定链接表名
-    protected $name = 'node';
-
-    /**
-     * 根据条件获取访问权限节点数据
-     * @param $where
-     */
-    public function getActions($where)
-    {
-        return $this->field('control_name,action_name')->where($where)->select();
-    }
-
-    /**
-     * 根据节点数据获取对应的菜单
-     * @param $nodeStr
-     */
-    public function getMenu($nodeStr = '')
-    {
-        if(empty($nodeStr)){
-            return [];
-        }
-        // 超级管理员没有节点数组 * 号表示
-        $where = '*' == $nodeStr ? 'is_menu = 2' : 'is_menu = 2 and id in(' . $nodeStr . ')';
-
-        $result = $this->field('id,node_name,type_id,control_name,action_name,style')
-            ->where($where)->select();
-        return prepareMenu($result);
-    }
-
-    /**
-     * 获取节点数据
-     * @return mixed
-     */
-    public function getNodeList()
-    {
-        return $this->field('id,node_name name,type_id pid,is_menu,style,control_name,action_name')->select();
-    }
-
-    /**
-     * 插入节点信息
-     * @param $param
-     */
-    public function insertNode($param)
-    {
-        try{
-
-            $this->save($param);
-            return msg(1, '', '添加节点成功');
-        }catch(PDOException $e){
-
-            return msg(-2, '', $e->getMessage());
-        }
-    }
-
-    /**
-     * 删除节点
-     * @param $id
-     */
-    public function delNode($id)
-    {
-        try{
-
-            $this->where('id', $id)->delete();
-            return msg(1, '', '删除节点成功');
-
-        }catch(PDOException $e){
-            return msg(-1, '', $e->getMessage());
-        }
-    }
-}

application/index/model/RoleModel.php

@@ -1,105 +0,0 @@
-<?php
-
-namespace app\index\model;
-
-use think\Model;
-use app\index\model\NodeModel;
-
-class RoleModel extends Model{
-    // 确定链接表名
-    protected $name = 'role';
-
-    /**
-     * 获取角色信息
-     * @param $id
-     */
-    public function getRoleInfo($id)
-    {
-        $result = $this->where('id', $id)->find()->toArray();
-        // 超级管理员权限是 *
-        if(empty($result['rule'])){
-            $result['action'] = '';
-            return $result;
-        }else if('*' == $result['rule']){
-            $where = '';
-        }else{
-            $where = 'id in(' . $result['rule'] . ')';
-        }
-
-        // 查询权限节点
-        $nodeModel = new NodeModel();
-        $res = $nodeModel->getActions($where);
-
-        foreach($res as $key=>$vo){
-
-            if('#' != $vo['action_name']){
-                $result['action'][] = $vo['control_name'] . '/' . $vo['action_name'];
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * 根据搜索条件获取角色列表信息
-     * @param $where
-     * @param $offset
-     * @param $limit
-     */
-    public function getRoleByWhere($where, $offset, $limit)
-    {
-
-        return $this->where($where)->limit($offset, $limit)->order('id desc')->select();
-    }
-
-    /**
-     * 根据搜索条件获取所有的角色数量
-     * @param $where
-     */
-    public function getAllRole($where)
-    {
-        return $this->where($where)->count();
-    }
-
-    /**
-     * 插入角色信息
-     * @param $param
-     */
-    public function insertRole($param)
-    {
-        try{
-            $param['create_timestamp'] = $param['update_timestamp'] = date('Y-m-d H:i:s');
-            $result = $this->save($param);
-            if(false === $result){
-                // 验证失败 输出错误信息
-                return msg(-1, '', $this->getError());
-            }else{
-
-                return msg(1, '', '添加角色成功');
-            }
-        }catch(PDOException $e){
-
-            return msg(-2, '', $e->getMessage());
-        }
-    }
-
-    /**
-     * 删除角色
-     * @param $id
-     */
-    public function delRole($id)
-    {
-        try{
-            $this->where('id', $id)->delete();
-            return msg(1, '', '删除角色成功');
-        }catch(PDOException $e){
-            return msg(-1, '', $e->getMessage());
-        }
-    }
-
-    // 获取所有的角色信息
-    public function getRole()
-    {
-        return $this->select();
-    }
-}

application/index/model/UserModel.php

@@ -3,6 +3,7 @@
 namespace app\index\model;
 
 use think\Model;
+use think\exception\PDOException;
 
 class UserModel extends Model{
     // 确定链接表名
@@ -12,11 +13,10 @@ class UserModel extends Model{
      * 根据用户名检测用户数据
      * @param $userName
      */
-    public function checkUser($userName,$password)
+    public function checkUser($userName)
     {
         return $this->alias('u')
-            ->field('u.id,u.user_name,r.role_name,u.role_id,r.rules,u.password,u.status')
-            ->join('role r', 'u.role_id = r.id')
+            ->field('u.id,u.user_name,u.password,u.status')
             ->where('u.user_name', $userName)
             ->find();
     }
@@ -29,9 +29,7 @@ class UserModel extends Model{
      */
     public function getUsersByWhere($where, $offset, $limit)
     {
-        return $this->alias('user')->field( 'user.*,role_name')
-            ->join('role rol', 'user.role_id = ' . 'rol.id')
-            ->where($where)->limit($offset, $limit)->order('id desc')->select();
+        return $this->where($where)->limit($offset, $limit)->order('id desc')->select();
     }
 
     /**
@@ -44,7 +42,7 @@ class UserModel extends Model{
     }
 
     /**
-     * 更新管理员状态
+     * 管理员登录信息同步错误
      * @param array $param
      */
     public function updateStatus($param = [], $uid)

application/index/validate/RoleValidate.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace app\index\validate;
-
-use think\Validate;
-
-class RoleValidate extends Validate
-{
-    protected $rule = array(
-        'role_name'   => 'require|unique:role',
-    );
-    protected $message = array(
-        'role_name.require'    => '角色已经存在',
-    );
-}

application/index/validate/UserValidate.php

@@ -12,9 +12,9 @@ class UserValidate extends Validate
         'repassword' => 'require|confirm:password'
     );
     protected $message = array(
-        'user_name.require'    => '用户名必须',
-        'user_name.unique'    => '用户名已存在',
-        'password.require' => '密码必须',
+        'user_name.require'     => '用户名必须',
+        'user_name.unique'      => '用户名已存在',
+        'password.require'      => '密码必须',
         'repassword.require'    => '确认密码和密码必须一致',
     );
 }

docker-compose-windows.yml

@@ -17,7 +17,7 @@ services:
   lredis:
     image: redis:alpine
     ports:
-      - "6380:6380"
+      - "6380:6379"
     volumes:
       - /d/phpstudy_pro/WWW/apisongcan/conf/etc/localtime:/etc/localtime:ro
     container_name: "logic-redis"

route/route.php

@@ -1,10 +1,11 @@
 <?php
     Route::group('/',array(
-        '/'                         => 'index/index/index',
-        'userAdd'                   => 'index/user/userAdd',
-        'roleList'                  => 'index/user/roleList',
-        'roleAdd'                   => 'index/user/roleAdd',
-        'roleDel'                   => 'index/user/roleDel',
+        'Login'                     => 'index/login/login',
+        'LoginOut'                  => 'index/login/login_out',
+        'UserAdd'                   => 'index/user/UserAdd',
+        'UserList'                  => 'index/user/UserList',
+        'UserDel'                   => 'index/user/UserDel',
+
 
         'test'                      => 'index/cabinet/test',