userlogin

application/user/controller/Index.php

@@ -16,9 +16,9 @@ class Index extends UserControl
 
     public function index()
     {
-        $allpower = $this->qxhans();
-        $this->assign('allpower',$allpower);
-        $this->assign('admin_info', $this->getAdminInfo());
+//        $allpower = $this->qxhans();
+//        $this->assign('allpower',$allpower);
+        $this->assign('user_info', $this->getAdminInfo());
         return $this->fetch();
     }
 

application/user/controller/Login.php

@@ -21,25 +21,25 @@ class Login extends Controller
      */
     public function index()
     {
-        if (session('admin_id')) {
+        if (session('user_id')) {
             $this->success('已经登录', 'User/Index/index');
         }
         if (request()->isPost()) {
 
-            $admin_name = input('post.admin_name');
-            $admin_password = input('post.admin_password');
+            $user_email = input('post.admin_name');
+            $user_password = input('post.admin_password');
             $captcha = input('post.captcha');
 
             $data = array(
-                'admin_name' => $admin_name,
-                'admin_password' => $admin_password,
+                'user_email' => $user_email,
+                'user_password' => $user_password,
                 'captcha' => $captcha,
             );
 
             //验证数据  BEGIN
             $rule = [
-                ['admin_name', 'require|min:2', '帐号为必填|帐号长度至少为2位'],
-                ['admin_password', 'require|min:2', '密码为必填|帐号长度至少为6位'],
+                ['user_email', 'require|min:2', '帐号为必填|帐号长度至少为2位'],
+                ['user_password', 'require|min:2', '密码为必填|帐号长度至少为6位'],
                 ['captcha', 'require|min:3', '验证码为必填|帐号长度至少为3位'],
             ];
             $validate = new Validate($rule);
@@ -54,24 +54,24 @@ class Login extends Controller
                 $this->error('验证码错误');
             }
 
-            $condition['admin_name'] = $admin_name;
-            $condition['admin_password'] = md5($admin_password);
+            $condition['user_email'] = $user_email;
+            $condition['user_password'] = md5($user_password);
 
-            $admin_info = db('admin')->where($condition)->find();
-            if (is_array($admin_info) and !empty($admin_info)) {
+            $user_info = db('user')->where($condition)->find();
+            if (is_array($user_info) and !empty($user_info)) {
                 //更新 admin 最新信息
                 $update_info = array(
-                    'admin_login_num' => ($admin_info['admin_login_num'] + 1),
-                    'admin_login_time' => TIMESTAMP
+//                    'admin_login_num' => ($admin_info['admin_login_num'] + 1),
+                    'user_loginTime' => TIMESTAMP
                 );
-                db('admin')->where('admin_id', $admin_info['admin_id'])->update($update_info);
+                db('user')->where('user_id', $user_info['user_id'])->update($update_info);
 
                 //设置 session
-                session('admin_id', $admin_info['admin_id']);
-                session('admin_name', $admin_info['admin_name']);
-                session('admin_group_id', $admin_info['admin_group_id']);
-                session('admin_is_super', $admin_info['admin_is_super']);
-                session('admin_pid', $admin_info['admin_pid']);
+                session('user_id', $user_info['user_id']);
+                session('user_email', $user_info['user_email']);
+//                session('admin_group_id', $admin_info['admin_group_id']);
+//                session('admin_is_super', $admin_info['admin_is_super']);
+//                session('admin_pid', $admin_info['admin_pid']);
 
                 return $this->redirect('User/Index/index');
             } else {

application/user/controller/UserControl.php

@@ -19,11 +19,11 @@ class UserControl extends Controller
             config('default_lang', cookie('ds_admin_lang'));
         }
         Lang::load(APP_PATH . 'admin/lang/' . config('default_lang') . '.php');
-        $this->admin_info = $this->systemLogin();
-        if ($this->admin_info['admin_id'] != 1) {
-            // 验证权限
-//            $this->checkPermission();
-        }
+        $this->user_info = $this->systemLogin();
+//        if ($this->admin_info['admin_id'] != 1) {
+//            // 验证权限
+////            $this->checkPermission();
+//        }
         $this->setMenuList();
     }
 
@@ -35,7 +35,7 @@ class UserControl extends Controller
      */
     protected final function getAdminInfo()
     {
-        return $this->admin_info;
+        return $this->user_info;
     }
 
     /**
@@ -46,18 +46,15 @@ class UserControl extends Controller
      */
     protected final function systemLogin()
     {
-        $admin_info = array(
-            'admin_id' => session('admin_id'),
-            'admin_name' => session('admin_name'),
-            'admin_group_id' => session('admin_group_id'),
-            'admin_is_super' => session('admin_is_super'),
-            'admin_pid' => session('admin_pid'),
+        $user_info = array(
+            'user_id' => session('user_id'),
+            'user_email' => session('user_email'),
         );
-        if (empty($admin_info['admin_id']) || empty($admin_info['admin_name']) || !isset($admin_info['admin_group_id']) || !isset($admin_info['admin_is_super'])) {
-            $this->redirect('Admin/Login/index');
+        if (empty($user_info['user_id']) || empty($user_info['user_email'])) {
+            $this->redirect('User/Login/index');
         }
 
-        return $admin_info;
+        return $user_info;
     }
 
     /**