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
29edddfa
Commit
29edddfa
authored
Sep 28, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
bffc63bf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
Message.php
application/controllers/Message.php
+1
-0
Member.php
application/models/DAO/Member.php
+5
-3
No files found.
application/controllers/Message.php
View file @
29edddfa
...
@@ -132,6 +132,7 @@ class MessageController extends \Our\Controller_AbstractApi {
...
@@ -132,6 +132,7 @@ class MessageController extends \Our\Controller_AbstractApi {
$pushSet
[
'canPush'
]
=
$this
->
req
[
'data'
][
'canPush'
];
$pushSet
[
'canPush'
]
=
$this
->
req
[
'data'
][
'canPush'
];
$pushSet
[
'sound'
]
=
$this
->
req
[
'data'
][
'sound'
];
$pushSet
[
'sound'
]
=
$this
->
req
[
'data'
][
'sound'
];
$pushSet
[
'vibrate'
]
=
$this
->
req
[
'data'
][
'vibrate'
];
$pushSet
[
'vibrate'
]
=
$this
->
req
[
'data'
][
'vibrate'
];
$pushSet
[
'timeDiff'
]
=
$this
->
req
[
'data'
][
'timeDiff'
];
if
(
isset
(
$pushSet
[
'canPush'
])
&&
isset
(
$pushSet
[
'sound'
])
&&
isset
(
$pushSet
[
'vibrate'
])
){
if
(
isset
(
$pushSet
[
'canPush'
])
&&
isset
(
$pushSet
[
'sound'
])
&&
isset
(
$pushSet
[
'vibrate'
])
){
$res
=
$messageService
->
set
(
$this
->
memberId
,
$pushSet
);
$res
=
$messageService
->
set
(
$this
->
memberId
,
$pushSet
);
if
(
$res
){
if
(
$res
){
...
...
application/models/DAO/Member.php
View file @
29edddfa
...
@@ -583,9 +583,11 @@ class MemberModel extends \DAO\AbstractModel
...
@@ -583,9 +583,11 @@ class MemberModel extends \DAO\AbstractModel
$this
->
changeNum
(
$memberId
,
$toState
,
null
,
1
);
$this
->
changeNum
(
$memberId
,
$toState
,
null
,
1
);
}
}
public
function
setIsWxsend
(
$memberId
,
$pushData
){
public
function
setIsWxsend
(
$memberId
,
$pushData
){
foreach
(
$pushData
as
$val
){
foreach
(
$pushData
as
$key
=>
$val
){
if
(
!
in_array
(
$val
,
array
(
ApiConst
::
closeMessage
,
ApiConst
::
openMessae
))){
if
(
$key
!=
'timeDiff'
){
ErrorModel
::
throwException
(
CodeConfigModel
::
paramsError
);
if
(
!
in_array
(
$val
,
array
(
ApiConst
::
closeMessage
,
ApiConst
::
openMessae
))){
ErrorModel
::
throwException
(
CodeConfigModel
::
paramsError
);
}
}
}
}
}
$data
[
'push_set'
]
=
serialize
(
$pushData
);
$data
[
'push_set'
]
=
serialize
(
$pushData
);
...
...
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