From f07f24175c47f46e85bdf454f1f8b36fbeabaaf1 Mon Sep 17 00:00:00 2001 From: taoser Date: Sun, 29 Nov 2020 17:27:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95ip=E5=92=8C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/lib/Msgres.php | 2 + app/common/model/User.php | 32 +++----- app/event.php | 4 +- app/event/UserLogin.php | 16 ++++ app/index/controller/Index.php | 1 + app/index/controller/Login.php | 22 ++++-- app/index/lang/en-us.php | 3 + app/index/lang/zh-cn.php | 3 + app/index/lang/zh-tw.php | 137 +++++++++++++++++++++------------ app/listener/UserLogin.php | 42 ++++++++++ 10 files changed, 180 insertions(+), 82 deletions(-) create mode 100644 app/event/UserLogin.php create mode 100644 app/listener/UserLogin.php diff --git a/app/common/lib/Msgres.php b/app/common/lib/Msgres.php index 1e5597a..7aea1e7 100644 --- a/app/common/lib/Msgres.php +++ b/app/common/lib/Msgres.php @@ -18,6 +18,8 @@ class Msgres return $res = [ 'success' => 0, 'error' => 1, + 'login_success' => Lang::get('login success'), + 'login_error' => Lang::get('login error'), 'add_success' => Lang::get('add success'), 'add_error' => Lang::get('add error'), 'edit_success' => Lang::get('edit success'), diff --git a/app/common/model/User.php b/app/common/model/User.php index 6cfc585..7180bea 100644 --- a/app/common/model/User.php +++ b/app/common/model/User.php @@ -43,8 +43,8 @@ class User extends Model //登陆校验 public function login($data) { - //查询用户 - $user = Db::name('user')->whereOr('email',$data['name'])->whereOr('name',$data['name'])->find(); + //查询使用邮箱或者用户名登陆 + $user = $this::whereOr('email',$data['name'])->whereOr('name',$data['name'])->find(); //对输入的密码字段进行MD5加密，再进行数据库的查询 $salt = substr(md5($user['create_time']),-6); @@ -63,33 +63,19 @@ class User extends Model //Cookie::set('user_id', $user['id'], 604800); //Cookie::set('user_name', $user['name'], 604800); } - - $ip = request()->ip(); -/* - $url = 'http://ip-api.com/json/'.$ip.'?lang=zh-CN'; - //$url = 'http://ip-api.com/json/?lang=zh-CN'; - $add = Api::urlGet($url); - if($add->status == 'success'){ - $city = $add->city; - } else { - $city ='未知'; - } -*/ - Db::name('user')->where('id',$user['id'])->update( - [ - //'city' => $city, - 'last_login_ip' => $ip, - 'last_login_time' => time() - ] - ); - Log::channel('login')->info('login:{user} {ip}',['user'=>$user['name'],'ip'=>$ip]); - + //查询结果1表示有用户，用户名密码正确 return 1; }else{ return '用户名或密码错误'; } } + + //更新数据 + public function updata($data) + { + //dump($data); + } //注册校验 public function reg($data) diff --git a/app/event.php b/app/event.php index 0a5c5d1..e3e9df4 100644 --- a/app/event.php +++ b/app/event.php @@ -2,7 +2,8 @@ // 事件定义文件 return [ 'bind' => [ - 'Message' => 'app\event\Message', + 'UserLogin' => 'app\event\UserLogin', + 'Message' => 'app\event\Message', ], 'listen' => [ @@ -11,6 +12,7 @@ return [ 'HttpEnd' => [], 'LogLevel' => [], 'LogWrite' => [], + 'UserLogin' => ['app\listener\UserLogin'], 'Message' => ['app\listener\Message'], 'CommMsg' => ['app\listener\CommMsg'], ], diff --git a/app/event/UserLogin.php b/app/event/UserLogin.php new file mode 100644 index 0000000..461a755 --- /dev/null +++ b/app/event/UserLogin.php @@ -0,0 +1,16 @@ +name = $name; + $this->ip = $ip; + } +} diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index 52d2a4e..3535ef8 100644 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -23,6 +23,7 @@ class Index extends BaseController public function index() { $types = input('type'); + //幻灯 $slider = new \app\common\model\Slider(); $sliders = $slider->getSliderList(); diff --git a/app/index/controller/Login.php b/app/index/controller/Login.php index c9bb55d..4accd4c 100644 --- a/app/index/controller/Login.php +++ b/app/index/controller/Login.php @@ -2,6 +2,7 @@ namespace app\index\Controller; use app\common\controller\BaseController; +use app\common\lib\Msgres; use app\common\validate\User as userValidate; use think\exception\ValidateException; use think\facade\Db; @@ -10,8 +11,9 @@ use think\facade\Session; use think\facade\Cookie; use think\facade\Cache; use think\facade\View; -use app\common\model\User as userModel; +use app\common\model\User; use taoler\com\Message; +use app\event\UserLogin; class Login extends BaseController { @@ -32,15 +34,16 @@ class Login extends BaseController Cookie::set('url',$url); if(Request::isAjax()) { + //登陆前数据校验 $data = Request::param(); //邮箱正则表达式 $pattern = "/^([0-9A-Za-z\\-_\\.]+)@([0-9a-z]+\\.[a-z]{2,3}(\\.[a-z]{2})?)$/i"; //判断输入的是邮箱还是用户名 - if (preg_match($pattern, $data['name'])){ + if (preg_match($pattern, $data['name'])){ + //输入邮箱email登陆验证 $data['email'] = $data['name']; unset($data['name']); - //输入邮箱email登陆验证 try{ validate(userValidate::class) ->scene('loginEmail') @@ -63,13 +66,18 @@ class Login extends BaseController } } //登陆请求 - $user = new \app\common\model\User(); + $user = new User(); $res = $user->login($data); if ($res == 1) { + $ip = request()->ip(); + $name = $data['name']; + //时间更新ip和日志 + event(new UserLogin($name,$ip)); //获取系统站内通知信息 //Message::insertMsg(session('user_id')); //跳转到登陆前页面 - return json(['code'=>0,'msg'=>'登陆成功','url'=> Cookie::get('url')]); + //return json(['code'=>0,'msg'=>'登陆成功','url'=> Cookie::get('url')]); + return Msgres::success('login_success',Cookie::get('url')); } else { return json(['code'=>-1,'msg'=>$res]); } @@ -92,7 +100,7 @@ class Login extends BaseController return json(['code'=>-1,'msg'=>$e->getError()]); } - $user = new userModel; + $user = new User(); $result = $user->reg($data); if ($result == 1) { @@ -186,7 +194,7 @@ class Login extends BaseController } $data['uid'] = Cache::get('userid'); - $user = new \app\common\model\User(); + $user = new User(); $res = $user->respass($data); if ($res == 1) { return json(['code'=>0,'msg'=>'修改成功','url'=>(string) url('login/index')]); diff --git a/app/index/lang/en-us.php b/app/index/lang/en-us.php index 1b19ab8..1079258 100644 --- a/app/index/lang/en-us.php +++ b/app/index/lang/en-us.php @@ -11,6 +11,8 @@ return [ 'delete' => 'delete', 'edit' => 'edit', 'uploads' => 'Upload', + 'login success' => 'login success', + 'login error' => 'login error', 'add success' => 'add success!', 'add error' => 'add error', 'edit success' => 'edit success', @@ -85,6 +87,7 @@ return [ //Sign in/up 'username' => 'Username', 'password' => 'Password', + 'username or password error' => 'username or password error', 'new password' => 'New Password', 'reset password' => 'Reset password', 'retrieve password' => 'Retrieve password', diff --git a/app/index/lang/zh-cn.php b/app/index/lang/zh-cn.php index 6e00fa0..e2fdbcd 100644 --- a/app/index/lang/zh-cn.php +++ b/app/index/lang/zh-cn.php @@ -11,6 +11,8 @@ return [ 'delete' => '删除', 'edit' => '编辑', 'uploads' => '上传', + 'login success' => '登录成功', + 'login error' => '登录失败', 'add success' => '添加成功!', 'add error' => '添加失败', 'edit success' => '修改成功', @@ -86,6 +88,7 @@ return [ //Sign in/up 'username' => '用户', 'password' => '密码', + 'username or password error' => '用户或密码错误', 'new password' => '新密码', 'reset password' => '重置密码', 'retrieve password' => '找回密码', diff --git a/app/index/lang/zh-tw.php b/app/index/lang/zh-tw.php index eade333..7f99124 100644 --- a/app/index/lang/zh-tw.php +++ b/app/index/lang/zh-tw.php @@ -2,18 +2,37 @@ return [ //語言 - 'language' => 'language', - 'chinese' => '中文簡體', - 'english' => 'English', - - //menu - 'index' => '首頁', + 'language' => 'language', + 'chinese' => '中文簡體', + 'english' => 'english', + + //彈窗提示消息 + 'add' => '添加', + 'delete' => '刪除', + 'edit' => '編輯', + 'uploads' => '上傳', + 'login success' => '登錄成功', + 'login error' => '登錄失敗', + 'add success' => '添加成功!', + 'add error' => '添加失敗', + 'edit success' => '修改成功', + 'edit error' => '修改失敗', + 'delete success' => '刪除成功', + 'delete error' => '刪除失敗', + 'upload success' => '上傳成功', + 'upload error' => '上傳失敗', + 'upgrade success' => '升級成功', + 'upgrade error' => '升級失敗', + 'illegal request' => '非法請求', + + //菜單 + 'index' => 'index', 'home page' => '首頁', 'user center' => '用戶中心', 'set info' => '設置', 'my message' => '我的消息', 'my page' => '我的主頁', - + 'login' => '登錄', 'logout' => '退出', 'sign in' => '簽到', @@ -22,54 +41,54 @@ return [ 'discuss' => '討論', 'case' => '案例', 'timeline' => '框架日誌', - + //帖子 - 'poster' => '贴主', - 'title color' => '顏色', - 'add_post' => '添加帖子', - 'my collection' => '我的收藏', - 'cancel collection' => '取消收藏', - 'all' => '綜合', - 'finished' => '已結', - 'end' => '已結', - 'no finished' => '未結', - 'hot' => '熱貼', - 'top' => '精貼', - 'cancel hoting' => '取消精貼', - 'cancel topping' => '取消置頂', - 'go sign' => '去簽到', - 'more post' => '更多帖子', - 'friendly link' => '友情鏈接', - 'reviewers list' => '回帖熱榜', - 'hot post list' => '本周熱議', - 'links list' => '溫馨通道', - 'statement' => '說明', - 'trends' => '動態', - 'sponsor' => '鉆級贊助商', - 'i want to join' => '我要加入', - 'official products' => '官方產品', - 'no comments' => '暫時還沒有評論', - 'submit comments' => '提交評論', - 'reply' => '回復', - 'replies' => '次回復', - 'accept' => '采納', - 'please input the content' => '請輸入內容', - 'ads area' => '廣告區', - 'enclosure' => '附件', - 'download files' => '下載文件', - - //message - 'add' => '添加', - 'delete' => '刪除', - 'add success' => '添加成功!', - 'add error' => '添加失敗', - 'edit success' => '修改成功', - 'edit error' => '修改失敗', - 'illegal request' => '非法請求', - + 'poster' => '貼主', + 'title' => '標題', + 'title color' => '顏色', + 'add post' => '添加帖子', + 'edit post' => '編輯帖子', + 'delete post' => '刪除帖子', + 'post now' => '立即發布', + 'my collection' => '我的收藏', + 'cancel collection' => '取消收藏', + 'all' => '綜合', + 'finished' => '已結', + 'end' => '已結', + 'no finished' => '未結', + 'hot' => '熱貼', + 'top' => '精貼', + 'cancel hoting' => '取消精貼', + 'cancel topping' => '取消置頂', + 'go sign' => '去簽到', + 'more post' => '更多帖子', + 'friendly link' => '友情鏈接', + 'reviewers list' => '回帖熱榜', + 'hot post list' => '本周熱議', + 'links list' => '溫馨通道', + 'statement' => '說明', + 'trends' => '動態', + 'sponsor' => '鉆級贊助商', + 'i want to join' => '我要加入', + 'official products' => '官方產品', + 'no comments' => '暫時還沒有評論', + 'submit comments' => '提交評論', + 'reply' => '回復', + 'replies' => '次回復', + 'accept' => '采納', + 'please input the content' => '請輸入內容', + 'ads area' => '廣告區', + 'enclosure' => '附件', + 'add attachment' => '添加附件', + 'download files' => '下載文件', + 'special column' => '選擇專欄', + 'tags' => '標簽', + 'add tags' => '添加標簽', + //Sign in/up 'username' => '用戶', 'password' => '密碼', + 'username or password error' => '用戶或密碼錯誤', 'new password' => '新密碼', 'reset password' => '重置密碼', 'retrieve password' => '找回密碼', @@ -90,4 +109,20 @@ return [ 'please input the password' => '請輸入密碼', 'please confirm the password' => '請確認密碼', 'please input the captcha' => '請輸入驗證碼', + + //user + 'add friends' => '添加為好友', + 'start a chat' => '開始會話', + 'authentication information' => '認證信息', + 'it is not signed yet' => '懶得還沒有任何簽名', + 'log in to view' => '登錄查看', + 'join' => '加入', + 'recent statements' => '最近發帖', + 'recent answers' => '最近回貼', + 'browses' => '瀏覽', + 'in' => '在', + 'accumulate points' => '積分', + 'my post' => '我的帖子', + + ]; \ No newline at end of file diff --git a/app/listener/UserLogin.php b/app/listener/UserLogin.php new file mode 100644 index 0000000..4572137 --- /dev/null +++ b/app/listener/UserLogin.php @@ -0,0 +1,42 @@ +name; + $ip = $user->ip; + + /* + $url = 'http://ip-api.com/json/'.$ip.'?lang=zh-CN'; + //$url = 'http://ip-api.com/json/?lang=zh-CN'; + $add = Api::urlGet($url); + if($add->status == 'success'){ + $city = $add->city; + } else { + $city ='未知'; + } + */ + + Db::name('user')->where('name',$name)->update( + [ + //'city' => $city, + 'last_login_ip' => $user->ip, + 'last_login_time' => time() + ] + ); + Log::channel('login')->info('login:{user} {ip}',['user'=>$name,'ip'=>$ip]); + + } +}