Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pull again! #25

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

pull again! #25

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
86e3f8e
修改配置文件，支持websocket
zhangzonglin Nov 9, 2017
e49d0c9
Revert "修改配置文件，支持websocket"
zhangzonglin Nov 9, 2017
e6ebdd8
Revert "Revert "修改配置文件，支持websocket""
zhangzonglin Nov 9, 2017
274c55c
Revert "Revert "Revert "修改配置文件，支持websocket"""
zhangzonglin Nov 9, 2017
d52bf9e
修改配置文件，支持websocket
zhangzonglin Nov 9, 2017
2575402
提交...
zhangzonglin Nov 28, 2017
2f5f573
提交，居然按照排序来......
zhangzonglin Nov 29, 2017
eead1c1
提交，配置文件修改.....
zhangzonglin Nov 30, 2017
7e4a21c
websocket 也加个心跳.....
zhangzonglin Dec 8, 2017
f0efa73
启动方式调整....
zhangzonglin Feb 3, 2018
c616123
集成部署调整代码....
zhangzonglin Feb 4, 2018
c4d32ae
集成部署,调整代码....
zhangzonglin Feb 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
启动方式调整....
  • Loading branch information
@zhangzonglin
zhangzonglin committed Feb 3, 2018
commit f0efa736c61a915d98054fc5ba2773a40f6da39e
2 changes: 1 addition & 1 deletion mpush-boot/src/main/java/com/mpush/bootstrap/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static void main(String[] args) {
Logs.init();
Logs.Console.info("launch mpush server...");
ServerLauncher launcher = new ServerLauncher();
launcher.init();
// launcher.init();
launcher.start();
addHook(launcher);
}
Expand Down
1 change: 1 addition & 0 deletions mpush-boot/src/main/java/com/mpush/bootstrap/ServerLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public void init() {
}

public void start() {
init();
chain.start();
}

Expand Down
2 changes: 1 addition & 1 deletion mpush-test/src/main/java/com/mpush/test/push/PushClientTestMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void testPush() throws Exception {

PushContext context = PushContext.build(msg)
.setAckModel(AckModel.AUTO_ACK)
.setUserId("user-" + i)
.setUserId("20")
.setBroadcast(false)
//.setTags(Sets.newHashSet("test"))
//.setCondition("tags&&tags.indexOf('test')!=-1")
Expand Down