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
cb104148
Commit
cb104148
authored
Dec 21, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
542a498a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
4 deletions
+13
-4
BrokerService.php
application/api_broker/service/BrokerService.php
+2
-1
ImageDepot.php
application/index/controller/ImageDepot.php
+9
-2
Login.php
application/index/controller/Login.php
+1
-0
ChatRelation.php
application/model/ChatRelation.php
+1
-1
No files found.
application/api_broker/service/BrokerService.php
View file @
cb104148
...
...
@@ -37,7 +37,6 @@ class BrokerService
{
$params
[
"agent_id"
]
=
$agent_id
;
$params
[
"is_pc"
]
=
$is_pc
;
$result
=
$this
->
aBD
->
getDeviceByAgentId
(
$params
);
if
(
count
(
$result
)
<=
0
)
{
//新增设备绑定关系 默认直接登陆
...
...
@@ -61,6 +60,8 @@ class BrokerService
if
(
$item
[
"is_forbidden"
]
==
0
)
{
return
true
;
}
elseif
(
$item
[
"is_forbidden"
]
==
1
)
{
//已存在申请关系
big_log
(
'已存在申请关系:'
.
$device_id
);
$is_exits
=
true
;
}
}
...
...
application/index/controller/ImageDepot.php
View file @
cb104148
...
...
@@ -178,8 +178,15 @@ class ImageDepot extends Basic
}
public
function
ceshi
(){
$content
=
'99888888'
;
big_log
(
$content
);
$time
=
time
();
$begin_date
=
date
(
"Y-m-d H:i:s"
,
$time
-
1800
);
$end_date
=
date
(
"Y-m-d H:i:s"
,
$time
);
echo
$time
.
'</br>'
;
echo
$begin_date
.
'</br>'
;
echo
$end_date
.
'</br>'
;
}
}
...
...
application/index/controller/Login.php
View file @
cb104148
...
...
@@ -97,6 +97,7 @@ class Login extends Basic
if
(
$mac_address
){
$is_pc
=
2
;
//客户端
$last_login_ip
=
$mac_address
;
//device_id存MAC地址
$model
=
$mac_address
;
//存MAC地址
}
else
{
$is_pc
=
1
;
//浏览器
}
...
...
application/model/ChatRelation.php
View file @
cb104148
...
...
@@ -138,7 +138,7 @@ class ChatRelation extends Model
->
where
(
$params
)
->
count
();
}
// big_log($this->getLastSql());
// dump($this->getLastSql($return));
return
$return
;
}
...
...
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