From 461db897b2fe4b0ee6988f8dc7a07c6c3b3accbd Mon Sep 17 00:00:00 2001 From: ehlxr Date: Fri, 22 Jan 2021 15:40:02 +0800 Subject: [PATCH] change package --- did-common/pom.xml | 6 ++--- .../github/ehlxr}/did/common/Constants.java | 2 +- .../github/ehlxr}/did/common/NettyUtil.java | 2 +- .../github/ehlxr}/did/common/SdkProto.java | 2 +- did-sdk/pom.xml | 11 ++++----- .../ehlxr}/did/client/AbstractClient.java | 8 +++---- .../github/ehlxr}/did/client/Client.java | 4 ++-- .../ehlxr}/did/client/InvokeCallback.java | 2 +- .../ehlxr}/did/client/ResponseFuture.java | 4 ++-- .../github/ehlxr}/did/client/SdkClient.java | 10 ++++---- .../did/client/handler/SdkClientDecoder.java | 6 ++--- .../did/client/handler/SdkClientEncoder.java | 8 +++---- .../did/client/handler/SdkClientHandler.java | 10 ++++---- .../github/ehlxr}/did/DidSdkPressTest.java | 4 ++-- .../github/ehlxr}/did/DidSdkTest.java | 6 ++--- did-server/pom.xml | 11 ++++----- .../github/ehlxr}/did/ServerStarter.java | 12 +++++----- .../github/ehlxr}/did/core/SnowFlake.java | 2 +- .../github/ehlxr}/did/server/BaseServer.java | 4 ++-- .../github/ehlxr}/did/server/Server.java | 2 +- .../ehlxr}/did/server/http/HttpServer.java | 8 +++---- .../did/server/http/HttpServerHandler.java | 8 +++---- .../ehlxr}/did/server/sdk/SdkServer.java | 8 +++---- .../did/server/sdk/SdkServerDecoder.java | 6 ++--- .../did/server/sdk/SdkServerEncoder.java | 6 ++--- .../did/server/sdk/SdkServerHandler.java | 10 ++++---- docker/build.sh | 24 +++++++++---------- docker/start.sh | 8 +++---- pom.xml | 14 +++++++---- 29 files changed, 106 insertions(+), 102 deletions(-) rename did-common/src/main/java/{cn/ceres => io/github/ehlxr}/did/common/Constants.java (97%) rename did-common/src/main/java/{cn/ceres => io/github/ehlxr}/did/common/NettyUtil.java (97%) rename did-common/src/main/java/{cn/ceres => io/github/ehlxr}/did/common/SdkProto.java (96%) rename did-sdk/src/main/java/{cn/ceres => io/github/ehlxr}/did/client/AbstractClient.java (97%) rename did-sdk/src/main/java/{cn/ceres => io/github/ehlxr}/did/client/Client.java (93%) rename did-sdk/src/main/java/{cn/ceres => io/github/ehlxr}/did/client/InvokeCallback.java (86%) rename did-sdk/src/main/java/{cn/ceres => io/github/ehlxr}/did/client/ResponseFuture.java (97%) rename did-sdk/src/main/java/{cn/ceres => io/github/ehlxr}/did/client/SdkClient.java (90%) rename did-sdk/src/main/java/{cn/ceres => io/github/ehlxr}/did/client/handler/SdkClientDecoder.java (95%) rename did-sdk/src/main/java/{cn/ceres => io/github/ehlxr}/did/client/handler/SdkClientEncoder.java (92%) rename did-sdk/src/main/java/{cn/ceres => io/github/ehlxr}/did/client/handler/SdkClientHandler.java (92%) rename did-sdk/src/test/java/{cn/ceres => io/github/ehlxr}/did/DidSdkPressTest.java (97%) rename did-sdk/src/test/java/{cn/ceres => io/github/ehlxr}/did/DidSdkTest.java (92%) rename did-server/src/main/java/{cn/ceres => io/github/ehlxr}/did/ServerStarter.java (85%) rename did-server/src/main/java/{cn/ceres => io/github/ehlxr}/did/core/SnowFlake.java (99%) rename did-server/src/main/java/{cn/ceres => io/github/ehlxr}/did/server/BaseServer.java (96%) rename did-server/src/main/java/{cn/ceres => io/github/ehlxr}/did/server/Server.java (82%) rename did-server/src/main/java/{cn/ceres => io/github/ehlxr}/did/server/http/HttpServer.java (93%) rename did-server/src/main/java/{cn/ceres => io/github/ehlxr}/did/server/http/HttpServerHandler.java (93%) rename did-server/src/main/java/{cn/ceres => io/github/ehlxr}/did/server/sdk/SdkServer.java (92%) rename did-server/src/main/java/{cn/ceres => io/github/ehlxr}/did/server/sdk/SdkServerDecoder.java (91%) rename did-server/src/main/java/{cn/ceres => io/github/ehlxr}/did/server/sdk/SdkServerEncoder.java (87%) rename did-server/src/main/java/{cn/ceres => io/github/ehlxr}/did/server/sdk/SdkServerHandler.java (90%) diff --git a/did-common/pom.xml b/did-common/pom.xml index ed9a2f9..7bc30f0 100644 --- a/did-common/pom.xml +++ b/did-common/pom.xml @@ -3,9 +3,9 @@ - did - cn.ceres.did - 1.0-SNAPSHOT + did-parent + io.github.ehlxr + 1.0.2-SNAPSHOT 4.0.0 diff --git a/did-common/src/main/java/cn/ceres/did/common/Constants.java b/did-common/src/main/java/io/github/ehlxr/did/common/Constants.java similarity index 97% rename from did-common/src/main/java/cn/ceres/did/common/Constants.java rename to did-common/src/main/java/io/github/ehlxr/did/common/Constants.java index 8ca0c14..4e38063 100644 --- a/did-common/src/main/java/cn/ceres/did/common/Constants.java +++ b/did-common/src/main/java/io/github/ehlxr/did/common/Constants.java @@ -1,4 +1,4 @@ -package cn.ceres.did.common; +package io.github.ehlxr.did.common; import java.util.Map; diff --git a/did-common/src/main/java/cn/ceres/did/common/NettyUtil.java b/did-common/src/main/java/io/github/ehlxr/did/common/NettyUtil.java similarity index 97% rename from did-common/src/main/java/cn/ceres/did/common/NettyUtil.java rename to did-common/src/main/java/io/github/ehlxr/did/common/NettyUtil.java index f716402..284e141 100644 --- a/did-common/src/main/java/cn/ceres/did/common/NettyUtil.java +++ b/did-common/src/main/java/io/github/ehlxr/did/common/NettyUtil.java @@ -1,4 +1,4 @@ -package cn.ceres.did.common; +package io.github.ehlxr.did.common; import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; diff --git a/did-common/src/main/java/cn/ceres/did/common/SdkProto.java b/did-common/src/main/java/io/github/ehlxr/did/common/SdkProto.java similarity index 96% rename from did-common/src/main/java/cn/ceres/did/common/SdkProto.java rename to did-common/src/main/java/io/github/ehlxr/did/common/SdkProto.java index 76f2a96..6e146ad 100644 --- a/did-common/src/main/java/cn/ceres/did/common/SdkProto.java +++ b/did-common/src/main/java/io/github/ehlxr/did/common/SdkProto.java @@ -1,4 +1,4 @@ -package cn.ceres.did.common; +package io.github.ehlxr.did.common; import java.util.concurrent.atomic.AtomicInteger; diff --git a/did-sdk/pom.xml b/did-sdk/pom.xml index 250e899..5d2a5ea 100644 --- a/did-sdk/pom.xml +++ b/did-sdk/pom.xml @@ -3,9 +3,9 @@ - did - cn.ceres.did - 1.0-SNAPSHOT + did-parent + io.github.ehlxr + 1.0.2-SNAPSHOT 4.0.0 @@ -14,9 +14,8 @@ did-sdk - cn.ceres.did + io.github.ehlxr did-common - 1.0-SNAPSHOT junit @@ -34,7 +33,7 @@ true - cn.ceres.did:did-common + io.github.ehlxr.did:did-common diff --git a/did-sdk/src/main/java/cn/ceres/did/client/AbstractClient.java b/did-sdk/src/main/java/io/github/ehlxr/did/client/AbstractClient.java similarity index 97% rename from did-sdk/src/main/java/cn/ceres/did/client/AbstractClient.java rename to did-sdk/src/main/java/io/github/ehlxr/did/client/AbstractClient.java index 3329154..5615601 100644 --- a/did-sdk/src/main/java/cn/ceres/did/client/AbstractClient.java +++ b/did-sdk/src/main/java/io/github/ehlxr/did/client/AbstractClient.java @@ -1,8 +1,8 @@ -package cn.ceres.did.client; +package io.github.ehlxr.did.client; -import cn.ceres.did.common.Constants; -import cn.ceres.did.common.NettyUtil; -import cn.ceres.did.common.SdkProto; +import io.github.ehlxr.did.common.Constants; +import io.github.ehlxr.did.common.NettyUtil; +import io.github.ehlxr.did.common.SdkProto; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; diff --git a/did-sdk/src/main/java/cn/ceres/did/client/Client.java b/did-sdk/src/main/java/io/github/ehlxr/did/client/Client.java similarity index 93% rename from did-sdk/src/main/java/cn/ceres/did/client/Client.java rename to did-sdk/src/main/java/io/github/ehlxr/did/client/Client.java index be12061..5784399 100644 --- a/did-sdk/src/main/java/cn/ceres/did/client/Client.java +++ b/did-sdk/src/main/java/io/github/ehlxr/did/client/Client.java @@ -1,7 +1,7 @@ -package cn.ceres.did.client; +package io.github.ehlxr.did.client; -import cn.ceres.did.common.SdkProto; +import io.github.ehlxr.did.common.SdkProto; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/did-sdk/src/main/java/cn/ceres/did/client/InvokeCallback.java b/did-sdk/src/main/java/io/github/ehlxr/did/client/InvokeCallback.java similarity index 86% rename from did-sdk/src/main/java/cn/ceres/did/client/InvokeCallback.java rename to did-sdk/src/main/java/io/github/ehlxr/did/client/InvokeCallback.java index 3ae0741..a5573a9 100644 --- a/did-sdk/src/main/java/cn/ceres/did/client/InvokeCallback.java +++ b/did-sdk/src/main/java/io/github/ehlxr/did/client/InvokeCallback.java @@ -1,4 +1,4 @@ -package cn.ceres.did.client; +package io.github.ehlxr.did.client; /** * @author ehlxr diff --git a/did-sdk/src/main/java/cn/ceres/did/client/ResponseFuture.java b/did-sdk/src/main/java/io/github/ehlxr/did/client/ResponseFuture.java similarity index 97% rename from did-sdk/src/main/java/cn/ceres/did/client/ResponseFuture.java rename to did-sdk/src/main/java/io/github/ehlxr/did/client/ResponseFuture.java index e2a419e..a955bce 100644 --- a/did-sdk/src/main/java/cn/ceres/did/client/ResponseFuture.java +++ b/did-sdk/src/main/java/io/github/ehlxr/did/client/ResponseFuture.java @@ -1,6 +1,6 @@ -package cn.ceres.did.client; +package io.github.ehlxr.did.client; -import cn.ceres.did.common.SdkProto; +import io.github.ehlxr.did.common.SdkProto; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; diff --git a/did-sdk/src/main/java/cn/ceres/did/client/SdkClient.java b/did-sdk/src/main/java/io/github/ehlxr/did/client/SdkClient.java similarity index 90% rename from did-sdk/src/main/java/cn/ceres/did/client/SdkClient.java rename to did-sdk/src/main/java/io/github/ehlxr/did/client/SdkClient.java index 50c05b4..77f042d 100644 --- a/did-sdk/src/main/java/cn/ceres/did/client/SdkClient.java +++ b/did-sdk/src/main/java/io/github/ehlxr/did/client/SdkClient.java @@ -1,9 +1,9 @@ -package cn.ceres.did.client; +package io.github.ehlxr.did.client; -import cn.ceres.did.client.handler.SdkClientDecoder; -import cn.ceres.did.client.handler.SdkClientEncoder; -import cn.ceres.did.client.handler.SdkClientHandler; -import cn.ceres.did.common.Constants; +import io.github.ehlxr.did.client.handler.SdkClientDecoder; +import io.github.ehlxr.did.client.handler.SdkClientEncoder; +import io.github.ehlxr.did.client.handler.SdkClientHandler; +import io.github.ehlxr.did.common.Constants; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelOption; diff --git a/did-sdk/src/main/java/cn/ceres/did/client/handler/SdkClientDecoder.java b/did-sdk/src/main/java/io/github/ehlxr/did/client/handler/SdkClientDecoder.java similarity index 95% rename from did-sdk/src/main/java/cn/ceres/did/client/handler/SdkClientDecoder.java rename to did-sdk/src/main/java/io/github/ehlxr/did/client/handler/SdkClientDecoder.java index d6be472..f96e3f1 100644 --- a/did-sdk/src/main/java/cn/ceres/did/client/handler/SdkClientDecoder.java +++ b/did-sdk/src/main/java/io/github/ehlxr/did/client/handler/SdkClientDecoder.java @@ -22,10 +22,10 @@ * THE SOFTWARE. */ -package cn.ceres.did.client.handler; +package io.github.ehlxr.did.client.handler; -import cn.ceres.did.common.NettyUtil; -import cn.ceres.did.common.SdkProto; +import io.github.ehlxr.did.common.NettyUtil; +import io.github.ehlxr.did.common.SdkProto; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/did-sdk/src/main/java/cn/ceres/did/client/handler/SdkClientEncoder.java b/did-sdk/src/main/java/io/github/ehlxr/did/client/handler/SdkClientEncoder.java similarity index 92% rename from did-sdk/src/main/java/cn/ceres/did/client/handler/SdkClientEncoder.java rename to did-sdk/src/main/java/io/github/ehlxr/did/client/handler/SdkClientEncoder.java index 487a9e4..393fa06 100644 --- a/did-sdk/src/main/java/cn/ceres/did/client/handler/SdkClientEncoder.java +++ b/did-sdk/src/main/java/io/github/ehlxr/did/client/handler/SdkClientEncoder.java @@ -22,11 +22,11 @@ * THE SOFTWARE. */ -package cn.ceres.did.client.handler; +package io.github.ehlxr.did.client.handler; -import cn.ceres.did.client.SdkClient; -import cn.ceres.did.common.NettyUtil; -import cn.ceres.did.common.SdkProto; +import io.github.ehlxr.did.client.SdkClient; +import io.github.ehlxr.did.common.NettyUtil; +import io.github.ehlxr.did.common.SdkProto; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/did-sdk/src/main/java/cn/ceres/did/client/handler/SdkClientHandler.java b/did-sdk/src/main/java/io/github/ehlxr/did/client/handler/SdkClientHandler.java similarity index 92% rename from did-sdk/src/main/java/cn/ceres/did/client/handler/SdkClientHandler.java rename to did-sdk/src/main/java/io/github/ehlxr/did/client/handler/SdkClientHandler.java index 9960b6a..2e8ed26 100644 --- a/did-sdk/src/main/java/cn/ceres/did/client/handler/SdkClientHandler.java +++ b/did-sdk/src/main/java/io/github/ehlxr/did/client/handler/SdkClientHandler.java @@ -22,12 +22,12 @@ * THE SOFTWARE. */ -package cn.ceres.did.client.handler; +package io.github.ehlxr.did.client.handler; -import cn.ceres.did.client.Client; -import cn.ceres.did.client.ResponseFuture; -import cn.ceres.did.common.NettyUtil; -import cn.ceres.did.common.SdkProto; +import io.github.ehlxr.did.client.Client; +import io.github.ehlxr.did.client.ResponseFuture; +import io.github.ehlxr.did.common.NettyUtil; +import io.github.ehlxr.did.common.SdkProto; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import org.slf4j.Logger; diff --git a/did-sdk/src/test/java/cn/ceres/did/DidSdkPressTest.java b/did-sdk/src/test/java/io/github/ehlxr/did/DidSdkPressTest.java similarity index 97% rename from did-sdk/src/test/java/cn/ceres/did/DidSdkPressTest.java rename to did-sdk/src/test/java/io/github/ehlxr/did/DidSdkPressTest.java index 7868446..f420661 100644 --- a/did-sdk/src/test/java/cn/ceres/did/DidSdkPressTest.java +++ b/did-sdk/src/test/java/io/github/ehlxr/did/DidSdkPressTest.java @@ -1,6 +1,6 @@ -package cn.ceres.did; +package io.github.ehlxr.did; -import cn.ceres.did.client.SdkClient; +import io.github.ehlxr.did.client.SdkClient; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/did-sdk/src/test/java/cn/ceres/did/DidSdkTest.java b/did-sdk/src/test/java/io/github/ehlxr/did/DidSdkTest.java similarity index 92% rename from did-sdk/src/test/java/cn/ceres/did/DidSdkTest.java rename to did-sdk/src/test/java/io/github/ehlxr/did/DidSdkTest.java index ef42d0a..831b1dd 100644 --- a/did-sdk/src/test/java/cn/ceres/did/DidSdkTest.java +++ b/did-sdk/src/test/java/io/github/ehlxr/did/DidSdkTest.java @@ -1,7 +1,7 @@ -package cn.ceres.did; +package io.github.ehlxr.did; -import cn.ceres.did.client.SdkClient; -import cn.ceres.did.common.SdkProto; +import io.github.ehlxr.did.client.SdkClient; +import io.github.ehlxr.did.common.SdkProto; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/did-server/pom.xml b/did-server/pom.xml index cd3eb8a..fcbcfd6 100644 --- a/did-server/pom.xml +++ b/did-server/pom.xml @@ -3,9 +3,9 @@ - did - cn.ceres.did - 1.0-SNAPSHOT + did-parent + io.github.ehlxr + 1.0.2-SNAPSHOT 4.0.0 @@ -15,9 +15,8 @@ - cn.ceres.did + io.github.ehlxr did-common - 1.0-SNAPSHOT @@ -32,7 +31,7 @@ - cn.ceres.did.ServerStarter + io.github.ehlxr.did.ServerStarter diff --git a/did-server/src/main/java/cn/ceres/did/ServerStarter.java b/did-server/src/main/java/io/github/ehlxr/did/ServerStarter.java similarity index 85% rename from did-server/src/main/java/cn/ceres/did/ServerStarter.java rename to did-server/src/main/java/io/github/ehlxr/did/ServerStarter.java index 367fe3d..1582f9f 100644 --- a/did-server/src/main/java/cn/ceres/did/ServerStarter.java +++ b/did-server/src/main/java/io/github/ehlxr/did/ServerStarter.java @@ -1,10 +1,10 @@ -package cn.ceres.did; +package io.github.ehlxr.did; -import cn.ceres.did.common.Constants; -import cn.ceres.did.core.SnowFlake; -import cn.ceres.did.server.Server; -import cn.ceres.did.server.http.HttpServer; -import cn.ceres.did.server.sdk.SdkServer; +import io.github.ehlxr.did.common.Constants; +import io.github.ehlxr.did.core.SnowFlake; +import io.github.ehlxr.did.server.Server; +import io.github.ehlxr.did.server.http.HttpServer; +import io.github.ehlxr.did.server.sdk.SdkServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/did-server/src/main/java/cn/ceres/did/core/SnowFlake.java b/did-server/src/main/java/io/github/ehlxr/did/core/SnowFlake.java similarity index 99% rename from did-server/src/main/java/cn/ceres/did/core/SnowFlake.java rename to did-server/src/main/java/io/github/ehlxr/did/core/SnowFlake.java index 356979b..7be549b 100644 --- a/did-server/src/main/java/cn/ceres/did/core/SnowFlake.java +++ b/did-server/src/main/java/io/github/ehlxr/did/core/SnowFlake.java @@ -1,4 +1,4 @@ -package cn.ceres.did.core; +package io.github.ehlxr.did.core; /** * twitter 的 snowflake 算法 -- java 实现 diff --git a/did-server/src/main/java/cn/ceres/did/server/BaseServer.java b/did-server/src/main/java/io/github/ehlxr/did/server/BaseServer.java similarity index 96% rename from did-server/src/main/java/cn/ceres/did/server/BaseServer.java rename to did-server/src/main/java/io/github/ehlxr/did/server/BaseServer.java index 7711f89..66bb756 100644 --- a/did-server/src/main/java/cn/ceres/did/server/BaseServer.java +++ b/did-server/src/main/java/io/github/ehlxr/did/server/BaseServer.java @@ -1,6 +1,6 @@ -package cn.ceres.did.server; +package io.github.ehlxr.did.server; -import cn.ceres.did.core.SnowFlake; +import io.github.ehlxr.did.core.SnowFlake; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.DefaultEventLoopGroup; diff --git a/did-server/src/main/java/cn/ceres/did/server/Server.java b/did-server/src/main/java/io/github/ehlxr/did/server/Server.java similarity index 82% rename from did-server/src/main/java/cn/ceres/did/server/Server.java rename to did-server/src/main/java/io/github/ehlxr/did/server/Server.java index 5c92289..1704687 100644 --- a/did-server/src/main/java/cn/ceres/did/server/Server.java +++ b/did-server/src/main/java/io/github/ehlxr/did/server/Server.java @@ -1,4 +1,4 @@ -package cn.ceres.did.server; +package io.github.ehlxr.did.server; /** * @author ehlxr diff --git a/did-server/src/main/java/cn/ceres/did/server/http/HttpServer.java b/did-server/src/main/java/io/github/ehlxr/did/server/http/HttpServer.java similarity index 93% rename from did-server/src/main/java/cn/ceres/did/server/http/HttpServer.java rename to did-server/src/main/java/io/github/ehlxr/did/server/http/HttpServer.java index ab0f466..d941023 100644 --- a/did-server/src/main/java/cn/ceres/did/server/http/HttpServer.java +++ b/did-server/src/main/java/io/github/ehlxr/did/server/http/HttpServer.java @@ -1,8 +1,8 @@ -package cn.ceres.did.server.http; +package io.github.ehlxr.did.server.http; -import cn.ceres.did.common.Constants; -import cn.ceres.did.core.SnowFlake; -import cn.ceres.did.server.BaseServer; +import io.github.ehlxr.did.common.Constants; +import io.github.ehlxr.did.core.SnowFlake; +import io.github.ehlxr.did.server.BaseServer; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelOption; import io.netty.channel.socket.SocketChannel; diff --git a/did-server/src/main/java/cn/ceres/did/server/http/HttpServerHandler.java b/did-server/src/main/java/io/github/ehlxr/did/server/http/HttpServerHandler.java similarity index 93% rename from did-server/src/main/java/cn/ceres/did/server/http/HttpServerHandler.java rename to did-server/src/main/java/io/github/ehlxr/did/server/http/HttpServerHandler.java index eb512d6..d6956ff 100644 --- a/did-server/src/main/java/cn/ceres/did/server/http/HttpServerHandler.java +++ b/did-server/src/main/java/io/github/ehlxr/did/server/http/HttpServerHandler.java @@ -1,8 +1,8 @@ -package cn.ceres.did.server.http; +package io.github.ehlxr.did.server.http; -import cn.ceres.did.common.Constants; -import cn.ceres.did.common.NettyUtil; -import cn.ceres.did.core.SnowFlake; +import io.github.ehlxr.did.common.Constants; +import io.github.ehlxr.did.common.NettyUtil; +import io.github.ehlxr.did.core.SnowFlake; import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; diff --git a/did-server/src/main/java/cn/ceres/did/server/sdk/SdkServer.java b/did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServer.java similarity index 92% rename from did-server/src/main/java/cn/ceres/did/server/sdk/SdkServer.java rename to did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServer.java index 85b17bc..03c0b9f 100644 --- a/did-server/src/main/java/cn/ceres/did/server/sdk/SdkServer.java +++ b/did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServer.java @@ -1,8 +1,8 @@ -package cn.ceres.did.server.sdk; +package io.github.ehlxr.did.server.sdk; -import cn.ceres.did.common.Constants; -import cn.ceres.did.core.SnowFlake; -import cn.ceres.did.server.BaseServer; +import io.github.ehlxr.did.common.Constants; +import io.github.ehlxr.did.core.SnowFlake; +import io.github.ehlxr.did.server.BaseServer; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelOption; import io.netty.channel.socket.SocketChannel; diff --git a/did-server/src/main/java/cn/ceres/did/server/sdk/SdkServerDecoder.java b/did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServerDecoder.java similarity index 91% rename from did-server/src/main/java/cn/ceres/did/server/sdk/SdkServerDecoder.java rename to did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServerDecoder.java index 0764144..95a589c 100644 --- a/did-server/src/main/java/cn/ceres/did/server/sdk/SdkServerDecoder.java +++ b/did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServerDecoder.java @@ -1,7 +1,7 @@ -package cn.ceres.did.server.sdk; +package io.github.ehlxr.did.server.sdk; -import cn.ceres.did.common.NettyUtil; -import cn.ceres.did.common.SdkProto; +import io.github.ehlxr.did.common.NettyUtil; +import io.github.ehlxr.did.common.SdkProto; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/did-server/src/main/java/cn/ceres/did/server/sdk/SdkServerEncoder.java b/did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServerEncoder.java similarity index 87% rename from did-server/src/main/java/cn/ceres/did/server/sdk/SdkServerEncoder.java rename to did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServerEncoder.java index 1c1c112..b6692fa 100644 --- a/did-server/src/main/java/cn/ceres/did/server/sdk/SdkServerEncoder.java +++ b/did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServerEncoder.java @@ -1,7 +1,7 @@ -package cn.ceres.did.server.sdk; +package io.github.ehlxr.did.server.sdk; -import cn.ceres.did.common.NettyUtil; -import cn.ceres.did.common.SdkProto; +import io.github.ehlxr.did.common.NettyUtil; +import io.github.ehlxr.did.common.SdkProto; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/did-server/src/main/java/cn/ceres/did/server/sdk/SdkServerHandler.java b/did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServerHandler.java similarity index 90% rename from did-server/src/main/java/cn/ceres/did/server/sdk/SdkServerHandler.java rename to did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServerHandler.java index c29fa11..c783c3e 100644 --- a/did-server/src/main/java/cn/ceres/did/server/sdk/SdkServerHandler.java +++ b/did-server/src/main/java/io/github/ehlxr/did/server/sdk/SdkServerHandler.java @@ -1,9 +1,9 @@ -package cn.ceres.did.server.sdk; +package io.github.ehlxr.did.server.sdk; -import cn.ceres.did.common.Constants; -import cn.ceres.did.common.NettyUtil; -import cn.ceres.did.common.SdkProto; -import cn.ceres.did.core.SnowFlake; +import io.github.ehlxr.did.common.Constants; +import io.github.ehlxr.did.common.NettyUtil; +import io.github.ehlxr.did.common.SdkProto; +import io.github.ehlxr.did.core.SnowFlake; import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; diff --git a/docker/build.sh b/docker/build.sh index 572eeb2..58b474e 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -3,7 +3,7 @@ set -e echo "############## start ##############" -BUILD_DATE=`date +%Y-%m-%d:%H:%M:%S` +BUILD_DATE=$(date +%Y-%m-%d:%H:%M:%S) #CURR_DIR=`basename $PWD` #if [[ ${CURR_DIR} != "docker" ]]; then @@ -18,21 +18,21 @@ SERVER_NAME=${MODULE_PARMS} SERVER_JAR=$PWD/${MODULE_PARMS}/target/${SERVER_NAME}*.jar #if [ ! -n "ls ${SERVER_JAR} >/dev/null 2>&1" ]; then -if [[ "`echo ${SERVER_JAR}`" != "${SERVER_JAR}" ]]; then - echo exist ${SERVER_JAR} skip maven build. +if [[ "$(echo ${SERVER_JAR})" != "${SERVER_JAR}" ]]; then + echo exist ${SERVER_JAR} skip maven build. else - mvn clean install -DskipTests + mvn clean install -DskipTests fi cp ${SERVER_JAR} ./docker #cd docker -if [[ ${DOCKER_IMAGE_TAG} ]];then - image_tag=${DOCKER_IMAGE_TAG} +if [[ ${DOCKER_IMAGE_TAG} ]]; then + image_tag=${DOCKER_IMAGE_TAG} else - echo "############## DOCKER_IMAGE_TAG is null ! ##############" - # image_tag=$(git symbolic-ref --short -q HEAD) - image_tag=`date "+%Y%m%d_%H%M%S"` + echo "############## DOCKER_IMAGE_TAG is null ! ##############" + # image_tag=$(git symbolic-ref --short -q HEAD) + image_tag=$(date "+%Y%m%d_%H%M%S") fi echo "############## image_tag is: ${image_tag} ##############" @@ -50,6 +50,6 @@ echo "############## build & push finish: ${BUILD_DATE} ##############" err=$? if [[ "$err" -ne "0" ]]; then - echo "############## build error ! ##############" - exit 1 -fi \ No newline at end of file + echo "############## build error ! ##############" + exit 1 +fi diff --git a/docker/start.sh b/docker/start.sh index 093f96c..9ec16b9 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -7,14 +7,14 @@ LOGS_DIR="/data/logs" GC_LOGS_DIR="/data/gc" if [[ ! -d ${LOGS_DIR} ]]; then - mkdir -p ${LOGS_DIR} + mkdir -p ${LOGS_DIR} fi if [[ ! -d ${GC_LOGS_DIR} ]]; then - mkdir -p ${GC_LOGS_DIR} + mkdir -p ${GC_LOGS_DIR} fi STDOUT_FILE=${LOGS_DIR}/${SERVER_NAME}.log -CURRENT=`date "+%Y%m%d%H%M%S"` +CURRENT=$(date "+%Y%m%d%H%M%S") #JAVA_OPTS=" -Duser.timezone=\"Asia/Shanghai\" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF8" @@ -30,4 +30,4 @@ JAVA_MEM_OPTS=" -server -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:${GC_ echo "Starting the ${SERVER_NAME} ...\c" chmod -R 755 ./${SERVER_NAME}*.jar #java -jar ${JAVA_OPTS} ${JAVA_MEM_OPTS} ./${SERVER_NAME}*.jar > ${STDOUT_FILE} 2>&1 -java -jar ${JAVA_MEM_OPTS} ./${SERVER_NAME}*.jar | tee -a ${STDOUT_FILE} 2>&1 \ No newline at end of file +java -jar ${JAVA_MEM_OPTS} ./${SERVER_NAME}*.jar | tee -a ${STDOUT_FILE} 2>&1 diff --git a/pom.xml b/pom.xml index 40db6b8..c74c6e6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,17 +4,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cn.ceres.did - did + io.github.ehlxr + did-parent pom - 1.0-SNAPSHOT + 1.0.2-SNAPSHOT did-server did-sdk did-common - did + did-parent UTF-8 @@ -22,6 +22,7 @@ 1.8 1.8 + 1.0.2-SNAPSHOT 4.1.58.Final 1.1.7 @@ -46,6 +47,11 @@ ${junit.version} test + + io.github.ehlxr + did-common + ${did.version} +