ehlxr/did
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Optimized code

Browse Source
This commit is contained in:
ehlxr
2021-01-19 14:45:49 +08:00
parent 2cc021a74f
commit d34eddd492
11 changed files with 76 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
did-server/pom.xml
View File

@@ -23,10 +23,6 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>

15
did-server/src/main/java/cn/ceres/did/ServerStarter.java
View File

@@ -1,9 +1,9 @@
package cn.ceres.did;
import cn.ceres.did.common.Constants;
import cn.ceres.did.core.SnowFlake;
import cn.ceres.did.server.http.HttpServer;
import cn.ceres.did.server.sdk.SdkServer;
import cn.ceres.did.common.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,13 +40,10 @@ public class ServerStarter {
sdkServer.init();
sdkServer.start();
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
httpServer.shutdown();
sdkServer.shutdown();
System.exit(0);
}
});
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
httpServer.shutdown();
sdkServer.shutdown();
System.exit(0);
}));
}
}

4
did-server/src/main/java/cn/ceres/did/server/sdk/SdkServer.java
View File

@@ -1,8 +1,8 @@
package cn.ceres.did.server.sdk;
import cn.ceres.did.common.Constants;
import cn.ceres.did.server.BaseServer;
import cn.ceres.did.core.SnowFlake;
import cn.ceres.did.server.BaseServer;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelOption;
import io.netty.channel.socket.SocketChannel;
@@ -18,7 +18,7 @@ public class SdkServer extends BaseServer {
public SdkServer(SnowFlake snowFlake) {
this.snowFlake = snowFlake;
this.port = "".equals(Constants.getEnv("SDKS_PORT")) ? Constants.SDKS_PORT : Integer.valueOf(Constants.getEnv("SDKS_PORT"));
this.port = "".equals(Constants.getEnv("SDKS_PORT")) ? Constants.SDKS_PORT : Integer.parseInt(Constants.getEnv("SDKS_PORT"));
}
@Override

12
did-server/src/main/java/cn/ceres/did/server/sdk/SdkServerHandler.java
View File

@@ -3,7 +3,10 @@ package cn.ceres.did.server.sdk;
import cn.ceres.did.common.Constants;
import cn.ceres.did.common.NettyUtil;
import cn.ceres.did.core.SnowFlake;
import io.netty.channel.*;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,12 +37,7 @@ public class SdkServerHandler extends SimpleChannelInboundHandler<SdkProto> {
if (semaphore.tryAcquire(Constants.ACQUIRE_TIMEOUTMILLIS, TimeUnit.MILLISECONDS)) {
try {
sdkProto.setDid(snowFlake.nextId());
ctx.channel().writeAndFlush(sdkProto).addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture channelFuture) {
semaphore.release();
}
});
ctx.channel().writeAndFlush(sdkProto).addListener((ChannelFutureListener) channelFuture -> semaphore.release());
} catch (Exception e) {
semaphore.release();
logger.error("SdkServerhandler error", e);