From 4346e9fc1fff854d2deb50a322d8801fc884eb3f Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 31 Jul 2024 17:14:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=8E=B7=E5=8F=96=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/pom.xml | 15 --------------- .../src/test/java/rpc/MessageDecode.java | 1 + .../src/test/java/rpc/MessageEncode.java | 1 + jsowell-common/pom.xml | 9 +++++++++ .../common/util/bean}/SerializationUtil.java | 2 +- pom.xml | 13 +++++++++++++ 6 files changed, 25 insertions(+), 16 deletions(-) rename {jsowell-admin/src/test/java/rpc => jsowell-common/src/main/java/com/jsowell/common/util/bean}/SerializationUtil.java (97%) diff --git a/jsowell-admin/pom.xml b/jsowell-admin/pom.xml index 858c2d94b..052d409ea 100644 --- a/jsowell-admin/pom.xml +++ b/jsowell-admin/pom.xml @@ -113,21 +113,6 @@ test - - io.protostuff - protostuff-core - 1.8.0 - test - - - - io.protostuff - protostuff-runtime - 1.8.0 - test - - - diff --git a/jsowell-admin/src/test/java/rpc/MessageDecode.java b/jsowell-admin/src/test/java/rpc/MessageDecode.java index 029a74178..083f43166 100644 --- a/jsowell-admin/src/test/java/rpc/MessageDecode.java +++ b/jsowell-admin/src/test/java/rpc/MessageDecode.java @@ -1,5 +1,6 @@ package rpc; +import com.jsowell.common.util.bean.SerializationUtil; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; diff --git a/jsowell-admin/src/test/java/rpc/MessageEncode.java b/jsowell-admin/src/test/java/rpc/MessageEncode.java index 1e1610dc7..338a74ac3 100644 --- a/jsowell-admin/src/test/java/rpc/MessageEncode.java +++ b/jsowell-admin/src/test/java/rpc/MessageEncode.java @@ -1,5 +1,6 @@ package rpc; +import com.jsowell.common.util.bean.SerializationUtil; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; diff --git a/jsowell-common/pom.xml b/jsowell-common/pom.xml index 00aa07bd2..4be94b3de 100644 --- a/jsowell-common/pom.xml +++ b/jsowell-common/pom.xml @@ -213,6 +213,15 @@ 1.77 + + io.protostuff + protostuff-core + + + + io.protostuff + protostuff-runtime + diff --git a/jsowell-admin/src/test/java/rpc/SerializationUtil.java b/jsowell-common/src/main/java/com/jsowell/common/util/bean/SerializationUtil.java similarity index 97% rename from jsowell-admin/src/test/java/rpc/SerializationUtil.java rename to jsowell-common/src/main/java/com/jsowell/common/util/bean/SerializationUtil.java index a658b59a5..3906245d8 100644 --- a/jsowell-admin/src/test/java/rpc/SerializationUtil.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/bean/SerializationUtil.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.common.util.bean; import io.protostuff.LinkedBuffer; import io.protostuff.ProtostuffIOUtil; diff --git a/pom.xml b/pom.xml index 6773e0f75..44a95cca9 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,7 @@ 4.39.79.ALL 2.2.3 3.1.87 + 1.8.0 @@ -323,6 +324,18 @@ ${huifu.version} + + io.protostuff + protostuff-core + ${protostuff.version} + + + + io.protostuff + protostuff-runtime + ${protostuff.version} + +