Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
SooonerHotel
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
吴贤德
SooonerHotel
Commits
56bc964d
Commit
56bc964d
authored
5 years ago
by
吴贤德
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Monitor接口——redis配置统一提到config下
parent
d867f486
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
9 deletions
+18
-9
config.php
SooonerHotel/App/Conf/config.php
+12
-0
MonitorAction.class.php
SooonerHotel/App/Lib/Action/Api/MonitorAction.class.php
+6
-9
No files found.
SooonerHotel/App/Conf/config.php
View file @
56bc964d
...
...
@@ -6,6 +6,18 @@ return array(
'SYSTEM_INFO'
=>
array
(
'name'
=>
'智慧酒店运营服务平台'
,
'logo'
=>
'logo.png'
,
'favicon'
=>
'favicon.ico'
),
//redis连接配置
'RedisConfig'
=>
array
(
server
=>
array
(
'host'
=>
'192.168.200.134'
,
'port'
=>
6000
,
),
options
=>
array
(
'parameters'
=>
array
(
'password'
=>
'atomicytl'
,
),
)
),
//end
'LOG_RECORD'
=>
false
,
// 开启日志记录
...
...
This diff is collapsed.
Click to expand it.
SooonerHotel/App/Lib/Action/Api/MonitorAction.class.php
View file @
56bc964d
...
...
@@ -14,19 +14,16 @@ class MonitorAction extends Action
public
function
devices
()
{
$this
->
assign
(
'SYSTEM_INFO'
,
C
(
'SYSTEM_INFO'
));
$limitRtimeout
=
30
;
$limitCpu
=
0.9
;
$limitMem
=
0.9
;
$server
=
array
(
'host'
=>
'192.168.200.134'
,
'port'
=>
6000
,
);
$options
=
array
(
'parameters'
=>
array
(
'password'
=>
'atomicytl'
,
),
);
$redisConfig
=
C
(
'RedisConfig'
);
$server
=
$redisConfig
[
"server"
];
$options
=
$redisConfig
[
"options"
];
$sql
=
"SELECT id,code,name,ip"
.
" FROM sh_hotel_device"
...
...
This diff is collapsed.
Click to expand it.
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