Commit 9e8b0a67 authored by clone's avatar clone

Merge branch 'test'

# Conflicts: # application/index/controller/Login.php
parents 4b7fd8f9 e57426e8
...@@ -80,13 +80,14 @@ class Login extends Basic ...@@ -80,13 +80,14 @@ class Login extends Basic
} }
$last_login_ip = ip2long($this->request->ip()); $last_login_ip = ip2long($this->request->ip());
/* if ($user_data['id'] != 1) {
if ($user_data['id'] != 1) {
//判断设备id是否存在 //判断设备id是否存在
$is_login = $this->brokerService->judgeBand($last_login_ip, $user_data['id'], $model, 0,$only_id , 1); $is_login = $this->brokerService->judgeBand($last_login_ip, $user_data['id'], $model, 0,$only_id , 1);
if (!$is_login) { if (!$is_login) {
return $this->response("102", "该账号没有绑定该设备的浏览器,请致电财务徐伟洋进行绑定。"); return $this->response("102", "该账号没有绑定该设备的浏览器,请致电财务徐伟洋进行绑定。");
} }
}*/ }
$where_rule['status'] = 0; $where_rule['status'] = 0;
if ($user_data['id'] == 1) { if ($user_data['id'] == 1) {
......
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