Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
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
chenchuanwen
my-yaf-project
Commits
a92c8f61
Commit
a92c8f61
authored
Dec 11, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
master
parent
5d4a4142
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
MessageService.php
application/models/Business/Message/MessageService.php
+4
-2
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+2
-0
No files found.
application/models/Business/Message/MessageService.php
View file @
a92c8f61
...
@@ -445,7 +445,7 @@ class MessageServiceModel extends \Business\AbstractModel
...
@@ -445,7 +445,7 @@ class MessageServiceModel extends \Business\AbstractModel
}
}
}
}
public
function
addMessageCenterToDb
()
public
function
addMessageCenterToDb
(
$pushPushCenter
=
true
)
{
{
$conf
=
\Yaf\Registry
::
get
(
'config'
)
->
get
(
'redis.database.params'
);
$conf
=
\Yaf\Registry
::
get
(
'config'
)
->
get
(
'redis.database.params'
);
$this
->
baseRedis
=
new
\Redis
();
$this
->
baseRedis
=
new
\Redis
();
...
@@ -454,7 +454,9 @@ class MessageServiceModel extends \Business\AbstractModel
...
@@ -454,7 +454,9 @@ class MessageServiceModel extends \Business\AbstractModel
$this
->
baseRedis
->
auth
(
$conf
[
'password'
]);
$this
->
baseRedis
->
auth
(
$conf
[
'password'
]);
}
}
while
(
$center
=
$this
->
baseRedis
->
lPop
(
'message_center'
))
{
while
(
$center
=
$this
->
baseRedis
->
lPop
(
'message_center'
))
{
$this
->
baseRedis
->
rPush
(
'push_center'
,
$center
);
if
(
$pushPushCenter
){
$this
->
baseRedis
->
rPush
(
'push_center'
,
$center
);
}
$addData
=
unserialize
(
$center
);
$addData
=
unserialize
(
$center
);
$addData
[
'message'
]
=
unserialize
(
$addData
[
'message'
]);
$addData
[
'message'
]
=
unserialize
(
$addData
[
'message'
]);
$this
->
addMessage
(
$addData
[
'fromId'
],
$addData
[
'fromUserId'
],
$addData
[
'fromUserName'
],
$addData
[
'fromType'
],
$addData
[
'message'
],
$addData
[
'toId'
],
$addData
[
'toUserId'
],
$addData
[
'toUserName'
],
$addData
[
'toType'
],
$addData
[
'id'
]);
$this
->
addMessage
(
$addData
[
'fromId'
],
$addData
[
'fromUserId'
],
$addData
[
'fromUserName'
],
$addData
[
'fromType'
],
$addData
[
'message'
],
$addData
[
'toId'
],
$addData
[
'toUserId'
],
$addData
[
'toUserName'
],
$addData
[
'toType'
],
$addData
[
'id'
]);
...
...
application/models/Business/Store/ShopkeeperService.php
View file @
a92c8f61
...
@@ -276,6 +276,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
...
@@ -276,6 +276,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
'orderId'
=>
$order
[
'order_id'
]));
'orderId'
=>
$order
[
'order_id'
]));
$push
->
addOneToClient
(
$pushData
);
$push
->
addOneToClient
(
$pushData
);
$push
->
sendTcpMessage
();
$push
->
sendTcpMessage
();
$messageService
=
\Business\Message\MessageServiceModel
::
getInstance
();
$messageService
->
addMessageCenterToDb
(
false
);
// $push->addOneToClient();
// $push->addOneToClient();
// \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
// \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
//\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
//\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
...
...
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