Skip to content

Commit 40b7e05

Browse files
author
ansj
committed
delete old rpc , replace to webscoket
1 parent cd4f52b commit 40b7e05

31 files changed

+447
-2332
lines changed

‎src/main/java/org/nlpcn/jcoder/job/SiteSetup.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,14 @@
22

33
import java.util.Arrays;
44

5-
import javax.servlet.ServletContext;
6-
import javax.websocket.DeploymentException;
7-
import javax.websocket.Endpoint;
85
import javax.websocket.server.ServerEndpoint;
96

10-
import org.eclipse.jetty.server.handler.ContextHandler;
11-
import org.eclipse.jetty.server.handler.ContextHandler.Context;
12-
import org.eclipse.jetty.servlet.ServletContextHandler;
137
import org.eclipse.jetty.webapp.WebAppContext;
148
import org.eclipse.jetty.websocket.jsr356.server.ServerContainer;
159
import org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer;
1610
import org.nlpcn.jcoder.scheduler.TaskException;
1711
import org.nlpcn.jcoder.server.H2Server;
18-
import org.nlpcn.jcoder.server.rpc.server.RpcServer;
12+
import org.nlpcn.jcoder.server.rpc.websocket.WebSocketServer;
1913
import org.nlpcn.jcoder.service.JarService;
2014
import org.nlpcn.jcoder.service.TaskService;
2115
import org.nlpcn.jcoder.util.StaticValue;
@@ -25,16 +19,14 @@
2519
import org.slf4j.Logger;
2620
import org.slf4j.LoggerFactory;
2721

28-
import com.sun.el.stream.Stream;
29-
3022
public class SiteSetup implements Setup {
3123

3224
private static final Logger LOG = LoggerFactory.getLogger(SiteSetup.class);
3325

3426
@Override
3527
public void destroy(NutConfig nc) {
3628
H2Server.stopServer();
37-
RpcServer.stopServer();
29+
WebSocketServer.stopServer();
3830
}
3931

4032
@Override
@@ -88,7 +80,7 @@ public void init(NutConfig nc) {
8880
// 启动rpc服务,默认是当前端口+1 ;
8981
LOG.info("begin start rpc server! on port " + StaticValue.RPCPORT);
9082
try {
91-
RpcServer.startServer(StaticValue.RPCPORT);
83+
WebSocketServer.startServer(StaticValue.RPCPORT);
9284
} catch (NumberFormatException e) {
9385
e.printStackTrace();
9486
LOG.error(StaticValue.PREFIX + "port not set in system property");

‎src/main/java/org/nlpcn/jcoder/server/rpc/server/ChannelManager.java renamed to ‎src/main/java/org/nlpcn/jcoder/server/rpc/ChannelManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package org.nlpcn.jcoder.server.rpc.server;
1+
package org.nlpcn.jcoder.server.rpc;
22

33
import java.util.Collection;
44
import java.util.Date;
55
import java.util.concurrent.ConcurrentHashMap;
66
import java.util.concurrent.locks.ReentrantLock;
77

8+
import org.nlpcn.jcoder.server.rpc.domain.ClientChannel;
89
import org.nlpcn.jcoder.util.DateUtils;
910
import org.slf4j.Logger;
1011
import org.slf4j.LoggerFactory;

‎src/main/java/org/nlpcn/jcoder/server/rpc/client/Rpcs.java renamed to ‎src/main/java/org/nlpcn/jcoder/server/rpc/Rpcs.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
package org.nlpcn.jcoder.server.rpc.client;
1+
package org.nlpcn.jcoder.server.rpc;
2+
3+
import org.nlpcn.jcoder.server.rpc.domain.RpcContext;
4+
import org.nlpcn.jcoder.server.rpc.domain.RpcRequest;
5+
import org.nlpcn.jcoder.server.rpc.domain.RpcResponse;
26

37
/**
48
* 线程池维护 请求的上下文

‎src/main/java/org/nlpcn/jcoder/server/rpc/client/HttpApiClient.java

Lines changed: 0 additions & 213 deletions
This file was deleted.

0 commit comments

Comments
 (0)