Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
9e8b0a67
Commit
9e8b0a67
authored
Aug 06, 2018
by
clone
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test'
# Conflicts: # application/index/controller/Login.php
parents
4b7fd8f9
e57426e8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
Login.php
application/index/controller/Login.php
+3
-2
No files found.
application/index/controller/Login.php
View file @
9e8b0a67
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment