diff --git a/neutrino-proxy-client/pom.xml b/neutrino-proxy-client/pom.xml index c0bd0b06..348399f9 100644 --- a/neutrino-proxy-client/pom.xml +++ b/neutrino-proxy-client/pom.xml @@ -38,7 +38,7 @@ - + @@ -70,7 +70,7 @@ - fun.asgc.neutrino.proxy.client.ProxyClient + org.dromara.neutrinoproxy.client.ProxyClient diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/ProxyClient.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java similarity index 92% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/ProxyClient.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java index d5d99f79..c47f7a61 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/ProxyClient.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java @@ -1,8 +1,7 @@ -package fun.asgc.neutrino.proxy.client; +package org.dromara.neutrinoproxy.client; import cn.hutool.core.util.StrUtil; import org.noear.solon.Solon; -import org.noear.solon.SolonApp; import org.noear.solon.annotation.SolonMain; /** diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/CustomConfig.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/CustomConfig.java similarity index 96% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/CustomConfig.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/CustomConfig.java index 4741d305..6f8de075 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/CustomConfig.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/CustomConfig.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.client.config; +package org.dromara.neutrinoproxy.client.config; import lombok.Data; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfig.java similarity index 95% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfig.java index 7d30a0b9..20f48a18 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfig.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfig.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.client.config; +package org.dromara.neutrinoproxy.client.config; import lombok.Data; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfiguration.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java similarity index 75% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfiguration.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java index f42f1536..ebc761ef 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/config/ProxyConfiguration.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java @@ -1,13 +1,12 @@ -package fun.asgc.neutrino.proxy.client.config; +package org.dromara.neutrinoproxy.client.config; -import fun.asgc.neutrino.proxy.core.ProxyDataTypeEnum; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.ProxyMessageHandler; -import fun.asgc.neutrino.proxy.core.dispatcher.DefaultDispatcher; -import fun.asgc.neutrino.proxy.core.dispatcher.Dispatcher; +import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.ProxyMessageHandler; +import org.dromara.neutrinoproxy.core.dispatcher.DefaultDispatcher; +import org.dromara.neutrinoproxy.core.dispatcher.Dispatcher; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.nio.NioEventLoopGroup; import org.noear.solon.Solon; import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Configuration; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ClientChannelHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ClientChannelHandler.java similarity index 91% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ClientChannelHandler.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ClientChannelHandler.java index e2e19c49..c0646c1a 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ClientChannelHandler.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ClientChannelHandler.java @@ -1,9 +1,9 @@ -package fun.asgc.neutrino.proxy.client.core; +package org.dromara.neutrinoproxy.client.core; -import fun.asgc.neutrino.proxy.client.util.ProxyUtil; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.dispatcher.Dispatcher; +import org.dromara.neutrinoproxy.client.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.dispatcher.Dispatcher; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOption; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/CustomThreadFactory.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CustomThreadFactory.java similarity index 97% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/CustomThreadFactory.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CustomThreadFactory.java index ead98c15..b6a3e191 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/CustomThreadFactory.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/CustomThreadFactory.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.client.core; +package org.dromara.neutrinoproxy.client.core; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyChannelBorrowListener.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyChannelBorrowListener.java similarity index 96% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyChannelBorrowListener.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyChannelBorrowListener.java index d6c83f83..21e014fa 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyChannelBorrowListener.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyChannelBorrowListener.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.client.core; +package org.dromara.neutrinoproxy.client.core; import io.netty.channel.Channel; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java similarity index 94% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java index 0e28496c..53930c35 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientService.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java @@ -1,12 +1,12 @@ -package fun.asgc.neutrino.proxy.client.core; +package org.dromara.neutrinoproxy.client.core; import cn.hutool.core.util.StrUtil; -import fun.asgc.neutrino.proxy.client.config.ProxyConfig; -import fun.asgc.neutrino.proxy.client.util.ProxyUtil; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.ProxyMessageDecoder; -import fun.asgc.neutrino.proxy.core.ProxyMessageEncoder; -import fun.asgc.neutrino.proxy.core.util.FileUtil; +import org.dromara.neutrinoproxy.client.config.ProxyConfig; +import org.dromara.neutrinoproxy.client.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.ProxyMessageDecoder; +import org.dromara.neutrinoproxy.core.ProxyMessageEncoder; +import org.dromara.neutrinoproxy.core.util.FileUtil; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/RealServerChannelHandler.java old mode 100755 new mode 100644 similarity index 94% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/RealServerChannelHandler.java index 056a52c0..0506217b --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/RealServerChannelHandler.java @@ -20,11 +20,11 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.client.core; +package org.dromara.neutrinoproxy.client.core; -import fun.asgc.neutrino.proxy.client.util.ProxyUtil; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.client.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.core.ProxyMessage; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageAuthHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageAuthHandler.java similarity index 70% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageAuthHandler.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageAuthHandler.java index a15151a3..3972f55e 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageAuthHandler.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageAuthHandler.java @@ -1,10 +1,10 @@ -package fun.asgc.neutrino.proxy.client.handler; +package org.dromara.neutrinoproxy.client.handler; import com.alibaba.fastjson.JSONObject; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.ProxyMessageHandler; -import fun.asgc.neutrino.proxy.core.dispatcher.Match; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.ProxyMessageHandler; +import org.dromara.neutrinoproxy.core.dispatcher.Match; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageConnectHandler.java similarity index 82% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageConnectHandler.java index bdcdf4dc..9d77e8d3 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageConnectHandler.java @@ -1,13 +1,13 @@ -package fun.asgc.neutrino.proxy.client.handler; +package org.dromara.neutrinoproxy.client.handler; -import fun.asgc.neutrino.proxy.client.config.ProxyConfig; -import fun.asgc.neutrino.proxy.client.core.ProxyChannelBorrowListener; -import fun.asgc.neutrino.proxy.client.util.ProxyUtil; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.core.ProxyDataTypeEnum; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.ProxyMessageHandler; -import fun.asgc.neutrino.proxy.core.dispatcher.Match; +import org.dromara.neutrinoproxy.client.config.ProxyConfig; +import org.dromara.neutrinoproxy.client.core.ProxyChannelBorrowListener; +import org.dromara.neutrinoproxy.client.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.ProxyMessageHandler; +import org.dromara.neutrinoproxy.core.dispatcher.Match; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageDisconnectHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageDisconnectHandler.java similarity index 71% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageDisconnectHandler.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageDisconnectHandler.java index b01158d9..c492ad62 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageDisconnectHandler.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageDisconnectHandler.java @@ -1,11 +1,11 @@ -package fun.asgc.neutrino.proxy.client.handler; +package org.dromara.neutrinoproxy.client.handler; -import fun.asgc.neutrino.proxy.client.util.ProxyUtil; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.core.ProxyDataTypeEnum; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.ProxyMessageHandler; -import fun.asgc.neutrino.proxy.core.dispatcher.Match; +import org.dromara.neutrinoproxy.client.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.ProxyMessageHandler; +import org.dromara.neutrinoproxy.core.dispatcher.Match; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageErrorHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageErrorHandler.java similarity index 81% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageErrorHandler.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageErrorHandler.java index f250c854..906be0f3 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageErrorHandler.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageErrorHandler.java @@ -1,8 +1,9 @@ -package fun.asgc.neutrino.proxy.client.handler; +package org.dromara.neutrinoproxy.client.handler; import com.alibaba.fastjson.JSONObject; -import fun.asgc.neutrino.proxy.core.*; -import fun.asgc.neutrino.proxy.core.dispatcher.Match; +import org.dromara.neutrinoproxy.core.*; +import org.dromara.neutrinoproxy.core.*; +import org.dromara.neutrinoproxy.core.dispatcher.Match; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageTransferHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageTransferHandler.java similarity index 71% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageTransferHandler.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageTransferHandler.java index 57de01e9..06a24f2b 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageTransferHandler.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageTransferHandler.java @@ -1,10 +1,10 @@ -package fun.asgc.neutrino.proxy.client.handler; +package org.dromara.neutrinoproxy.client.handler; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.core.ProxyDataTypeEnum; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.ProxyMessageHandler; -import fun.asgc.neutrino.proxy.core.dispatcher.Match; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.ProxyMessageHandler; +import org.dromara.neutrinoproxy.core.dispatcher.Match; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/util/ProxyUtil.java similarity index 94% rename from neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java rename to neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/util/ProxyUtil.java index facf60d6..1bbb711d 100644 --- a/neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/util/ProxyUtil.java @@ -19,15 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.client.util; +package org.dromara.neutrinoproxy.client.util; -import fun.asgc.neutrino.proxy.client.config.ProxyConfig; -import fun.asgc.neutrino.proxy.client.core.ProxyChannelBorrowListener; -import fun.asgc.neutrino.proxy.core.Constants; +import org.dromara.neutrinoproxy.client.core.ProxyChannelBorrowListener; +import org.dromara.neutrinoproxy.core.Constants; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelOption; import io.netty.util.AttributeKey; diff --git a/neutrino-proxy-client/src/main/resources/app.yml b/neutrino-proxy-client/src/main/resources/app.yml index d4eec9a5..6d609de1 100644 --- a/neutrino-proxy-client/src/main/resources/app.yml +++ b/neutrino-proxy-client/src/main/resources/app.yml @@ -20,4 +20,4 @@ neutrino: server-port: 9002 ssl-enable: true obtain-license-interval: 5 - license-key: + license-key: b0a907332b474b25897c4dcb31fc7eb6 diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ChannelAttribute.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ChannelAttribute.java similarity index 94% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ChannelAttribute.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ChannelAttribute.java index 8216cca0..c938cf54 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ChannelAttribute.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ChannelAttribute.java @@ -19,10 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core; - -import io.netty.channel.Channel; -import io.netty.util.AttributeKey; +package org.dromara.neutrinoproxy.core; import java.util.HashMap; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/Constants.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/Constants.java similarity index 97% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/Constants.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/Constants.java index 84633c08..c6d04a16 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/Constants.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/Constants.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core; +package org.dromara.neutrinoproxy.core; import io.netty.channel.Channel; import io.netty.util.AttributeKey; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ExceptionEnum.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ExceptionEnum.java similarity index 97% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ExceptionEnum.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ExceptionEnum.java index 23434bb7..d3315d7a 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ExceptionEnum.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ExceptionEnum.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core; +package org.dromara.neutrinoproxy.core; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/IdleCheckHandler.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/IdleCheckHandler.java similarity index 98% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/IdleCheckHandler.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/IdleCheckHandler.java index f9bd1527..114f8d6a 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/IdleCheckHandler.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/IdleCheckHandler.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core; +package org.dromara.neutrinoproxy.core; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.timeout.IdleStateEvent; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyClientConfig.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyClientConfig.java similarity index 97% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyClientConfig.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyClientConfig.java index df05809c..c1dfb524 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyClientConfig.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyClientConfig.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core; +package org.dromara.neutrinoproxy.core; import lombok.Data; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyDataTypeEnum.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyDataTypeEnum.java similarity index 98% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyDataTypeEnum.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyDataTypeEnum.java index 059aedb7..a8bc4081 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyDataTypeEnum.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyDataTypeEnum.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core; +package org.dromara.neutrinoproxy.core; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessage.java similarity index 99% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessage.java index d2a2338e..b4b0e299 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessage.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessage.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core; +package org.dromara.neutrinoproxy.core; import com.alibaba.fastjson.JSONObject; import lombok.Data; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessageDecoder.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessageDecoder.java similarity index 97% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessageDecoder.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessageDecoder.java index 52347ef5..2729967a 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessageDecoder.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessageDecoder.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core; +package org.dromara.neutrinoproxy.core; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; -import static fun.asgc.neutrino.proxy.core.Constants.*; +import static org.dromara.neutrinoproxy.core.Constants.*; /** * diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessageEncoder.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessageEncoder.java similarity index 96% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessageEncoder.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessageEncoder.java index fc920e19..447d2432 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessageEncoder.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessageEncoder.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core; +package org.dromara.neutrinoproxy.core; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; -import static fun.asgc.neutrino.proxy.core.Constants.*; +import static org.dromara.neutrinoproxy.core.Constants.*; /** * diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessageHandler.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessageHandler.java similarity index 67% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessageHandler.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessageHandler.java index 9dd38dfd..b3604905 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/ProxyMessageHandler.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/ProxyMessageHandler.java @@ -1,6 +1,6 @@ -package fun.asgc.neutrino.proxy.core; +package org.dromara.neutrinoproxy.core; -import fun.asgc.neutrino.proxy.core.dispatcher.Handler; +import org.dromara.neutrinoproxy.core.dispatcher.Handler; import io.netty.channel.ChannelHandlerContext; /** diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/base/CodeBlock.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/base/CodeBlock.java similarity index 96% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/base/CodeBlock.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/base/CodeBlock.java index 4d9056d5..e367dbd9 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/base/CodeBlock.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/base/CodeBlock.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core.base; +package org.dromara.neutrinoproxy.core.base; /** * diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/base/InternalException.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/base/InternalException.java similarity index 85% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/base/InternalException.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/base/InternalException.java index f5a8dce0..1fbb8f37 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/base/InternalException.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/base/InternalException.java @@ -1,6 +1,6 @@ -package fun.asgc.neutrino.proxy.core.base; +package org.dromara.neutrinoproxy.core.base; /** * diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/base/MetaDataConstant.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/base/MetaDataConstant.java similarity index 99% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/base/MetaDataConstant.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/base/MetaDataConstant.java index 6a2c25ab..5a1cb2db 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/base/MetaDataConstant.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/base/MetaDataConstant.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.core.base; +package org.dromara.neutrinoproxy.core.base; /** * diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/DefaultDispatcher.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/DefaultDispatcher.java similarity index 95% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/DefaultDispatcher.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/DefaultDispatcher.java index f45845b8..efc6959a 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/DefaultDispatcher.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/DefaultDispatcher.java @@ -1,10 +1,10 @@ -package fun.asgc.neutrino.proxy.core.dispatcher; +package org.dromara.neutrinoproxy.core.dispatcher; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; -import fun.asgc.neutrino.proxy.core.util.TypeUtil; +import org.dromara.neutrinoproxy.core.util.TypeUtil; import lombok.extern.slf4j.Slf4j; import java.util.HashMap; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/Dispatcher.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/Dispatcher.java similarity index 96% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/Dispatcher.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/Dispatcher.java index fe9d8828..2c2fb764 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/Dispatcher.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/Dispatcher.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core.dispatcher; +package org.dromara.neutrinoproxy.core.dispatcher; /** * diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/Handler.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/Handler.java similarity index 96% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/Handler.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/Handler.java index df64769d..f1a835c6 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/Handler.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/Handler.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core.dispatcher; +package org.dromara.neutrinoproxy.core.dispatcher; /** * diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/Match.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/Match.java similarity index 96% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/Match.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/Match.java index e92949b6..2963ab80 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/dispatcher/Match.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/dispatcher/Match.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.core.dispatcher; +package org.dromara.neutrinoproxy.core.dispatcher; import java.lang.annotation.*; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/AbstractMatcherGroup.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/AbstractMatcherGroup.java similarity index 95% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/AbstractMatcherGroup.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/AbstractMatcherGroup.java index 481f714d..81b67e77 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/AbstractMatcherGroup.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/AbstractMatcherGroup.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.core.type; +package org.dromara.neutrinoproxy.core.type; import java.util.ArrayList; import java.util.List; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/DefaultTypeMatcherGroup.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/DefaultTypeMatcherGroup.java similarity index 97% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/DefaultTypeMatcherGroup.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/DefaultTypeMatcherGroup.java index e8d2c849..79a7aa23 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/DefaultTypeMatcherGroup.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/DefaultTypeMatcherGroup.java @@ -1,6 +1,6 @@ -package fun.asgc.neutrino.proxy.core.type; +package org.dromara.neutrinoproxy.core.type; -import fun.asgc.neutrino.proxy.core.util.TypeUtil; +import org.dromara.neutrinoproxy.core.util.TypeUtil; /** * 默认的类型匹配器组 diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeConverter.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeConverter.java similarity index 85% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeConverter.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeConverter.java index c163ce24..58b20001 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeConverter.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeConverter.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.core.type; +package org.dromara.neutrinoproxy.core.type; /** * 类型转换器 diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatchInfo.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatchInfo.java similarity index 95% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatchInfo.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatchInfo.java index 6e144d1a..a3cb20a8 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatchInfo.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatchInfo.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.core.type; +package org.dromara.neutrinoproxy.core.type; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatchLevel.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatchLevel.java similarity index 97% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatchLevel.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatchLevel.java index 282ab99c..da0a50dc 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatchLevel.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatchLevel.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.core.type; +package org.dromara.neutrinoproxy.core.type; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatcher.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatcher.java similarity index 85% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatcher.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatcher.java index 1232253c..fda2c4ae 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatcher.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatcher.java @@ -1,5 +1,5 @@ -package fun.asgc.neutrino.proxy.core.type; +package org.dromara.neutrinoproxy.core.type; /** * 值类型匹配器 diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatcherGroup.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatcherGroup.java similarity index 88% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatcherGroup.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatcherGroup.java index b88d6ed6..b7649282 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatcherGroup.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatcherGroup.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.core.type; +package org.dromara.neutrinoproxy.core.type; import java.util.List; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatchers.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatchers.java similarity index 85% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatchers.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatchers.java index d2f8ec08..56c8b1ab 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/TypeMatchers.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/TypeMatchers.java @@ -1,29 +1,9 @@ -/** - * Copyright (c) 2022 aoshiguchen - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -package fun.asgc.neutrino.proxy.core.type; +package org.dromara.neutrinoproxy.core.type; import cn.hutool.core.collection.CollectionUtil; -import fun.asgc.neutrino.proxy.core.type.extension.*; -import fun.asgc.neutrino.proxy.core.util.Assert; +import org.dromara.neutrinoproxy.core.type.extension.*; +import org.dromara.neutrinoproxy.core.util.Assert; +import org.dromara.neutrinoproxy.core.type.extension.*; import java.util.ArrayList; import java.util.Comparator; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/ArrayMatcherGroup.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/ArrayMatcherGroup.java similarity index 83% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/ArrayMatcherGroup.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/ArrayMatcherGroup.java index 908147ff..30f425f0 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/ArrayMatcherGroup.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/ArrayMatcherGroup.java @@ -1,8 +1,8 @@ -package fun.asgc.neutrino.proxy.core.type.extension; +package org.dromara.neutrinoproxy.core.type.extension; -import fun.asgc.neutrino.proxy.core.type.AbstractMatcherGroup; -import fun.asgc.neutrino.proxy.core.type.TypeMatchInfo; -import fun.asgc.neutrino.proxy.core.type.TypeMatcher; +import org.dromara.neutrinoproxy.core.type.AbstractMatcherGroup; +import org.dromara.neutrinoproxy.core.type.TypeMatchInfo; +import org.dromara.neutrinoproxy.core.type.TypeMatcher; import java.util.List; import java.util.Set; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/BooleanMatcherGroup.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/BooleanMatcherGroup.java similarity index 71% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/BooleanMatcherGroup.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/BooleanMatcherGroup.java index 3f61aa4d..13558e5a 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/BooleanMatcherGroup.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/BooleanMatcherGroup.java @@ -1,9 +1,9 @@ -package fun.asgc.neutrino.proxy.core.type.extension; +package org.dromara.neutrinoproxy.core.type.extension; -import fun.asgc.neutrino.proxy.core.type.AbstractMatcherGroup; -import fun.asgc.neutrino.proxy.core.type.TypeMatchInfo; -import fun.asgc.neutrino.proxy.core.type.TypeMatcher; -import fun.asgc.neutrino.proxy.core.util.TypeUtil; +import org.dromara.neutrinoproxy.core.type.AbstractMatcherGroup; +import org.dromara.neutrinoproxy.core.type.TypeMatchInfo; +import org.dromara.neutrinoproxy.core.type.TypeMatcher; +import org.dromara.neutrinoproxy.core.util.TypeUtil; /** * 布尔值匹配器组 diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/DateMatcherGroup.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/DateMatcherGroup.java similarity index 84% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/DateMatcherGroup.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/DateMatcherGroup.java index 89ee33f4..2181bd02 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/DateMatcherGroup.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/DateMatcherGroup.java @@ -1,9 +1,9 @@ -package fun.asgc.neutrino.proxy.core.type.extension; +package org.dromara.neutrinoproxy.core.type.extension; -import fun.asgc.neutrino.proxy.core.type.AbstractMatcherGroup; -import fun.asgc.neutrino.proxy.core.type.TypeMatchInfo; -import fun.asgc.neutrino.proxy.core.type.TypeMatcher; -import fun.asgc.neutrino.proxy.core.util.TypeUtil; +import org.dromara.neutrinoproxy.core.type.AbstractMatcherGroup; +import org.dromara.neutrinoproxy.core.type.TypeMatchInfo; +import org.dromara.neutrinoproxy.core.type.TypeMatcher; +import org.dromara.neutrinoproxy.core.util.TypeUtil; import java.time.Instant; import java.time.LocalDateTime; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/ListMatcherGroup.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/ListMatcherGroup.java similarity index 77% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/ListMatcherGroup.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/ListMatcherGroup.java index 6c44f629..b0f7b9a7 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/ListMatcherGroup.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/ListMatcherGroup.java @@ -1,8 +1,8 @@ -package fun.asgc.neutrino.proxy.core.type.extension; +package org.dromara.neutrinoproxy.core.type.extension; -import fun.asgc.neutrino.proxy.core.type.AbstractMatcherGroup; -import fun.asgc.neutrino.proxy.core.type.TypeMatchInfo; -import fun.asgc.neutrino.proxy.core.type.TypeMatcher; +import org.dromara.neutrinoproxy.core.type.AbstractMatcherGroup; +import org.dromara.neutrinoproxy.core.type.TypeMatchInfo; +import org.dromara.neutrinoproxy.core.type.TypeMatcher; import java.util.List; import java.util.stream.Collectors; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/MapMatcherGroup.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/MapMatcherGroup.java similarity index 69% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/MapMatcherGroup.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/MapMatcherGroup.java index b0d737ce..6076d8e1 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/MapMatcherGroup.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/MapMatcherGroup.java @@ -1,6 +1,6 @@ -package fun.asgc.neutrino.proxy.core.type.extension; +package org.dromara.neutrinoproxy.core.type.extension; -import fun.asgc.neutrino.proxy.core.type.AbstractMatcherGroup; +import org.dromara.neutrinoproxy.core.type.AbstractMatcherGroup; /** * Map匹配器组 diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/NumberMatcherGroup.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/NumberMatcherGroup.java similarity index 94% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/NumberMatcherGroup.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/NumberMatcherGroup.java index 4e8cfea4..8f97aa08 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/NumberMatcherGroup.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/NumberMatcherGroup.java @@ -1,9 +1,9 @@ -package fun.asgc.neutrino.proxy.core.type.extension; +package org.dromara.neutrinoproxy.core.type.extension; -import fun.asgc.neutrino.proxy.core.type.AbstractMatcherGroup; -import fun.asgc.neutrino.proxy.core.type.TypeMatchInfo; -import fun.asgc.neutrino.proxy.core.type.TypeMatcher; -import fun.asgc.neutrino.proxy.core.util.TypeUtil; +import org.dromara.neutrinoproxy.core.type.AbstractMatcherGroup; +import org.dromara.neutrinoproxy.core.type.TypeMatchInfo; +import org.dromara.neutrinoproxy.core.type.TypeMatcher; +import org.dromara.neutrinoproxy.core.util.TypeUtil; /** * 字符串匹配器组 diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/SetMatcherGroup.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/SetMatcherGroup.java similarity index 84% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/SetMatcherGroup.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/SetMatcherGroup.java index 8596b876..eb40b272 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/SetMatcherGroup.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/SetMatcherGroup.java @@ -1,8 +1,8 @@ -package fun.asgc.neutrino.proxy.core.type.extension; +package org.dromara.neutrinoproxy.core.type.extension; -import fun.asgc.neutrino.proxy.core.type.AbstractMatcherGroup; -import fun.asgc.neutrino.proxy.core.type.TypeMatchInfo; -import fun.asgc.neutrino.proxy.core.type.TypeMatcher; +import org.dromara.neutrinoproxy.core.type.AbstractMatcherGroup; +import org.dromara.neutrinoproxy.core.type.TypeMatchInfo; +import org.dromara.neutrinoproxy.core.type.TypeMatcher; import java.util.Collection; import java.util.Set; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/StringMatcherGroup.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/StringMatcherGroup.java similarity index 80% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/StringMatcherGroup.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/StringMatcherGroup.java index f67fb76c..c7a8cb91 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/type/extension/StringMatcherGroup.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/type/extension/StringMatcherGroup.java @@ -1,9 +1,9 @@ -package fun.asgc.neutrino.proxy.core.type.extension; +package org.dromara.neutrinoproxy.core.type.extension; -import fun.asgc.neutrino.proxy.core.type.AbstractMatcherGroup; -import fun.asgc.neutrino.proxy.core.type.TypeMatchInfo; -import fun.asgc.neutrino.proxy.core.type.TypeMatcher; -import fun.asgc.neutrino.proxy.core.util.TypeUtil; +import org.dromara.neutrinoproxy.core.type.AbstractMatcherGroup; +import org.dromara.neutrinoproxy.core.type.TypeMatchInfo; +import org.dromara.neutrinoproxy.core.type.TypeMatcher; +import org.dromara.neutrinoproxy.core.util.TypeUtil; /** * 字符串匹配器组 diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/Assert.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/Assert.java similarity index 99% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/Assert.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/Assert.java index 19f78a87..a0b1de44 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/Assert.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/Assert.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.core.util; +package org.dromara.neutrinoproxy.core.util; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/DateUtil.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/DateUtil.java similarity index 99% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/DateUtil.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/DateUtil.java index 2eaf32b2..88e0398d 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/DateUtil.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/DateUtil.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.core.util; +package org.dromara.neutrinoproxy.core.util; import org.apache.commons.lang3.StringUtils; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/FileUtil.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/FileUtil.java similarity index 96% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/FileUtil.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/FileUtil.java index dd8f5bcb..b7214dd8 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/FileUtil.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/FileUtil.java @@ -1,7 +1,7 @@ -package fun.asgc.neutrino.proxy.core.util; +package org.dromara.neutrinoproxy.core.util; -import fun.asgc.neutrino.proxy.core.base.InternalException; -import fun.asgc.neutrino.proxy.core.base.MetaDataConstant; +import org.dromara.neutrinoproxy.core.base.InternalException; +import org.dromara.neutrinoproxy.core.base.MetaDataConstant; import org.apache.commons.lang3.StringUtils; import java.io.*; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/LockUtil.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/LockUtil.java similarity index 93% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/LockUtil.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/LockUtil.java index 80ba09a4..7f925e91 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/LockUtil.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/LockUtil.java @@ -1,6 +1,6 @@ -package fun.asgc.neutrino.proxy.core.util; +package org.dromara.neutrinoproxy.core.util; -import fun.asgc.neutrino.proxy.core.base.CodeBlock; +import org.dromara.neutrinoproxy.core.base.CodeBlock; import java.util.function.BooleanSupplier; import java.util.function.Supplier; diff --git a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/TypeUtil.java b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/TypeUtil.java similarity index 98% rename from neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/TypeUtil.java rename to neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/TypeUtil.java index 1e2c53b3..65834437 100644 --- a/neutrino-proxy-core/src/main/java/fun/asgc/neutrino/proxy/core/util/TypeUtil.java +++ b/neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/TypeUtil.java @@ -1,11 +1,11 @@ -package fun.asgc.neutrino.proxy.core.util; +package org.dromara.neutrinoproxy.core.util; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Pair; import com.google.common.collect.Lists; -import fun.asgc.neutrino.proxy.core.type.TypeMatchInfo; -import fun.asgc.neutrino.proxy.core.type.TypeMatchers; +import org.dromara.neutrinoproxy.core.type.TypeMatchInfo; +import org.dromara.neutrinoproxy.core.type.TypeMatchers; import java.lang.reflect.Field; import java.util.*; diff --git a/neutrino-proxy-server/pom.xml b/neutrino-proxy-server/pom.xml index 553b9651..a3591f21 100644 --- a/neutrino-proxy-server/pom.xml +++ b/neutrino-proxy-server/pom.xml @@ -69,7 +69,7 @@ - + @@ -103,7 +103,7 @@ - fun.asgc.neutrino.proxy.server.ProxyServer + org.dromara.neutrinoproxy.server.ProxyServer diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupCreateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupCreateRes.java deleted file mode 100644 index 4d3aa353..00000000 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupCreateRes.java +++ /dev/null @@ -1,4 +0,0 @@ -package fun.asgc.neutrino.proxy.server.controller.res.system; - -public class PortGroupCreateRes { -} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateGroupRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateGroupRes.java deleted file mode 100644 index 5033e443..00000000 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateGroupRes.java +++ /dev/null @@ -1,4 +0,0 @@ -package fun.asgc.neutrino.proxy.server.controller.res.system; - -public class PortPoolUpdateGroupRes { -} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java similarity index 92% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java index 806b460a..5ec01b9b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server; +package org.dromara.neutrinoproxy.server; import fun.asgc.solon.extend.job.annotation.EnableJob; import org.noear.solon.Solon; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java similarity index 94% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java index 02255a48..ea8823e9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java @@ -19,15 +19,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.base.db; +package org.dromara.neutrinoproxy.server.base.db; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.google.common.collect.Lists; import com.jfinal.plugin.activerecord.Db; -import fun.asgc.neutrino.proxy.core.util.Assert; -import fun.asgc.neutrino.proxy.core.util.FileUtil; -import fun.asgc.neutrino.proxy.server.constant.DbTypeEnum; +import org.dromara.neutrinoproxy.core.util.Assert; +import org.dromara.neutrinoproxy.core.util.FileUtil; +import org.dromara.neutrinoproxy.server.constant.DbTypeEnum; import lombok.extern.slf4j.Slf4j; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Init; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DbConfig.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DbConfig.java similarity index 94% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DbConfig.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DbConfig.java index 8480fdd7..25dc652f 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DbConfig.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DbConfig.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.base.db; +package org.dromara.neutrinoproxy.server.base.db; -import fun.asgc.neutrino.proxy.server.constant.DbTypeEnum; +import org.dromara.neutrinoproxy.server.constant.DbTypeEnum; import lombok.Data; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DbConfiguration.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DbConfiguration.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DbConfiguration.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DbConfiguration.java index 014094be..90461392 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DbConfiguration.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DbConfiguration.java @@ -1,11 +1,11 @@ -package fun.asgc.neutrino.proxy.server.base.db; +package org.dromara.neutrinoproxy.server.base.db; import com.baomidou.mybatisplus.core.MybatisConfiguration; import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.zaxxer.hikari.HikariDataSource; -import fun.asgc.neutrino.proxy.server.constant.DbTypeEnum; +import org.dromara.neutrinoproxy.server.constant.DbTypeEnum; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Configuration; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/MetaObjectHandlerImpl.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/MetaObjectHandlerImpl.java similarity index 88% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/MetaObjectHandlerImpl.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/MetaObjectHandlerImpl.java index b3001eeb..b1977ccf 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/MetaObjectHandlerImpl.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/MetaObjectHandlerImpl.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.base.db; +package org.dromara.neutrinoproxy.server.base.db; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/MybatisSqlSessionFactoryBuilderImpl.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/MybatisSqlSessionFactoryBuilderImpl.java similarity index 81% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/MybatisSqlSessionFactoryBuilderImpl.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/MybatisSqlSessionFactoryBuilderImpl.java index 9da683f1..48e238f0 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/MybatisSqlSessionFactoryBuilderImpl.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/MybatisSqlSessionFactoryBuilderImpl.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.base.db; +package org.dromara.neutrinoproxy.server.base.db; import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/page/PageInfo.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/page/PageInfo.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/page/PageInfo.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/page/PageInfo.java index 66dc940b..02caeb76 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/page/PageInfo.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/page/PageInfo.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.base.page; +package org.dromara.neutrinoproxy.server.base.page; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/page/PageQuery.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/page/PageQuery.java similarity index 83% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/page/PageQuery.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/page/PageQuery.java index 34ea6b52..68f1149d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/page/PageQuery.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/page/PageQuery.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.base.page; +package org.dromara.neutrinoproxy.server.base.page; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfig.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfig.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfig.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfig.java index cc336c4b..d396ca42 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfig.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfig.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.base.proxy; +package org.dromara.neutrinoproxy.server.base.proxy; import lombok.Data; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfiguration.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java similarity index 78% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfiguration.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java index 30e9977a..41eeebc5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/proxy/ProxyConfiguration.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java @@ -1,17 +1,16 @@ -package fun.asgc.neutrino.proxy.server.base.proxy; +package org.dromara.neutrinoproxy.server.base.proxy; -import fun.asgc.neutrino.proxy.core.ProxyDataTypeEnum; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.ProxyMessageHandler; -import fun.asgc.neutrino.proxy.core.dispatcher.DefaultDispatcher; -import fun.asgc.neutrino.proxy.core.dispatcher.Dispatcher; +import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.ProxyMessageHandler; +import org.dromara.neutrinoproxy.core.dispatcher.DefaultDispatcher; +import org.dromara.neutrinoproxy.core.dispatcher.Dispatcher; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.nio.NioEventLoopGroup; import org.noear.solon.Solon; import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Configuration; import org.noear.solon.annotation.Inject; -import org.noear.solon.core.AopContext; import org.noear.solon.core.bean.LifecycleBean; import java.util.List; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/Authorization.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/Authorization.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/Authorization.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/Authorization.java index 8325dffe..fa89940c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/Authorization.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/Authorization.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.base.rest; +package org.dromara.neutrinoproxy.server.base.rest; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/ResponseBody.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/ResponseBody.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/ResponseBody.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/ResponseBody.java index 30d9f8d0..2dfaa3d0 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/ResponseBody.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/ResponseBody.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.base.rest; +package org.dromara.neutrinoproxy.server.base.rest; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/ServiceException.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/ServiceException.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/ServiceException.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/ServiceException.java index e673db52..f04351f8 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/ServiceException.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/ServiceException.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.base.rest; +package org.dromara.neutrinoproxy.server.base.rest; -import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; +import org.dromara.neutrinoproxy.server.constant.ExceptionConstant; import lombok.Getter; import org.apache.commons.lang3.StringUtils; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/SystemContext.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/SystemContext.java similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/SystemContext.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/SystemContext.java index 28644888..78f6266b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/SystemContext.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/SystemContext.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.base.rest; +package org.dromara.neutrinoproxy.server.base.rest; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; import lombok.Data; import lombok.experimental.Accessors; import org.noear.solon.core.handle.Action; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/SystemContextHolder.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/SystemContextHolder.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/SystemContextHolder.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/SystemContextHolder.java index 936d5bfb..52a0271c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/SystemContextHolder.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/SystemContextHolder.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.base.rest; +package org.dromara.neutrinoproxy.server.base.rest; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; /** * 系统上下文持有者 diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/BaseAuthInterceptor.java similarity index 88% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/BaseAuthInterceptor.java index 88bd09a0..ab93f554 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/BaseAuthInterceptor.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/BaseAuthInterceptor.java @@ -1,13 +1,14 @@ -package fun.asgc.neutrino.proxy.server.base.rest.interceptor; +package org.dromara.neutrinoproxy.server.base.rest.interceptor; import cn.hutool.core.util.StrUtil; -import fun.asgc.neutrino.proxy.server.base.rest.*; -import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; -import fun.asgc.neutrino.proxy.server.service.UserService; +import org.dromara.neutrinoproxy.server.base.rest.*; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.ExceptionConstant; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.service.UserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; +import org.dromara.neutrinoproxy.server.base.rest.*; import org.noear.solon.Solon; import org.noear.solon.annotation.Component; import org.noear.solon.core.handle.Action; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/GlobalExceptionFilter.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/GlobalExceptionFilter.java similarity index 82% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/GlobalExceptionFilter.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/GlobalExceptionFilter.java index 0893fa4a..c2f559bf 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/GlobalExceptionFilter.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/GlobalExceptionFilter.java @@ -1,8 +1,8 @@ -package fun.asgc.neutrino.proxy.server.base.rest.interceptor; +package org.dromara.neutrinoproxy.server.base.rest.interceptor; -import fun.asgc.neutrino.proxy.server.base.rest.ResponseBody; -import fun.asgc.neutrino.proxy.server.base.rest.ServiceException; -import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; +import org.dromara.neutrinoproxy.server.base.rest.ResponseBody; +import org.dromara.neutrinoproxy.server.base.rest.ServiceException; +import org.dromara.neutrinoproxy.server.constant.ExceptionConstant; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/VisitLogInterceptor.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/VisitLogInterceptor.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/VisitLogInterceptor.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/VisitLogInterceptor.java index 887c6e29..97d46072 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/interceptor/VisitLogInterceptor.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/VisitLogInterceptor.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.base.rest.interceptor; +package org.dromara.neutrinoproxy.server.base.rest.interceptor; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/AlarmStatusEnum.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/AlarmStatusEnum.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/AlarmStatusEnum.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/AlarmStatusEnum.java index e2fdb3e5..c573fb3e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/AlarmStatusEnum.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/AlarmStatusEnum.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.constant; +package org.dromara.neutrinoproxy.server.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ClientConnectTypeEnum.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/ClientConnectTypeEnum.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ClientConnectTypeEnum.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/ClientConnectTypeEnum.java index 8f2851cb..3b27dd48 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ClientConnectTypeEnum.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/ClientConnectTypeEnum.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.constant; +package org.dromara.neutrinoproxy.server.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ConnectTypeEnum.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/ConnectTypeEnum.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ConnectTypeEnum.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/ConnectTypeEnum.java index 19288170..2af05348 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ConnectTypeEnum.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/ConnectTypeEnum.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.constant; +package org.dromara.neutrinoproxy.server.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/Constants.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/Constants.java similarity index 83% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/Constants.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/Constants.java index 9cadb054..5479fe00 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/Constants.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/Constants.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.constant; +package org.dromara.neutrinoproxy.server.constant; /** * @author: aoshiguchen diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/DbTypeEnum.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/DbTypeEnum.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/DbTypeEnum.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/DbTypeEnum.java index 0fa3a4dd..f61ccdab 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/DbTypeEnum.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/DbTypeEnum.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.constant; +package org.dromara.neutrinoproxy.server.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/EnableStatusEnum.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/EnableStatusEnum.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/EnableStatusEnum.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/EnableStatusEnum.java index 1052739c..de6bfb09 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/EnableStatusEnum.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/EnableStatusEnum.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.constant; +package org.dromara.neutrinoproxy.server.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/ExceptionConstant.java similarity index 98% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/ExceptionConstant.java index 8019c8e0..77ea5016 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/ExceptionConstant.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.constant; +package org.dromara.neutrinoproxy.server.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/OnlineStatusEnum.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/OnlineStatusEnum.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/OnlineStatusEnum.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/OnlineStatusEnum.java index ed7383ba..1470dc0d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/OnlineStatusEnum.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/OnlineStatusEnum.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.constant; +package org.dromara.neutrinoproxy.server.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/PoolGroupEnum.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/PoolGroupEnum.java similarity index 86% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/PoolGroupEnum.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/PoolGroupEnum.java index 3c1b723b..c2f87073 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/PoolGroupEnum.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/PoolGroupEnum.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.constant; +package org.dromara.neutrinoproxy.server.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/SuccessCodeEnum.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/SuccessCodeEnum.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/SuccessCodeEnum.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/SuccessCodeEnum.java index 2c0a6e12..a80188d6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/SuccessCodeEnum.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/SuccessCodeEnum.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.constant; +package org.dromara.neutrinoproxy.server.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ClientConnectRecordController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/ClientConnectRecordController.java similarity index 79% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ClientConnectRecordController.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/ClientConnectRecordController.java index 8e75d29d..72117d61 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ClientConnectRecordController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/ClientConnectRecordController.java @@ -19,14 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller; +package org.dromara.neutrinoproxy.server.controller; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.log.ClientConnectRecordListReq; -import fun.asgc.neutrino.proxy.server.controller.res.log.ClientConnectRecordListRes; -import fun.asgc.neutrino.proxy.server.service.ClientConnectRecordService; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.controller.req.log.ClientConnectRecordListReq; +import org.dromara.neutrinoproxy.server.controller.res.log.ClientConnectRecordListRes; +import org.dromara.neutrinoproxy.server.service.ClientConnectRecordService; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import lombok.extern.slf4j.Slf4j; import org.noear.solon.annotation.Controller; import org.noear.solon.annotation.Get; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/IndexController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/IndexController.java similarity index 82% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/IndexController.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/IndexController.java index a9e510d1..6cdd3bda 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/IndexController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/IndexController.java @@ -19,13 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller; +package org.dromara.neutrinoproxy.server.controller; -import fun.asgc.neutrino.proxy.server.base.rest.Authorization; -import fun.asgc.neutrino.proxy.server.controller.req.system.LoginReq; -import fun.asgc.neutrino.proxy.server.controller.res.system.LoginRes; -import fun.asgc.neutrino.proxy.server.service.UserService; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.rest.Authorization; +import org.dromara.neutrinoproxy.server.controller.req.system.LoginReq; +import org.dromara.neutrinoproxy.server.controller.res.system.LoginRes; +import org.dromara.neutrinoproxy.server.service.UserService; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import org.noear.solon.annotation.*; import org.noear.solon.core.handle.Context; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/JobInfoController.java similarity index 70% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/JobInfoController.java index 27e39853..59b82b27 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/JobInfoController.java @@ -19,22 +19,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller; +package org.dromara.neutrinoproxy.server.controller; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.base.rest.Authorization; -import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoExecuteReq; -import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoListReq; -import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoUpdateEnableStatusReq; -import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoUpdateReq; -import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoExecuteRes; -import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoListRes; -import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoUpdateEnableStatusRes; -import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoUpdateRes; -import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO; -import fun.asgc.neutrino.proxy.server.service.JobInfoService; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.base.rest.Authorization; +import org.dromara.neutrinoproxy.server.controller.req.system.JobInfoExecuteReq; +import org.dromara.neutrinoproxy.server.controller.req.system.JobInfoListReq; +import org.dromara.neutrinoproxy.server.controller.req.system.JobInfoUpdateEnableStatusReq; +import org.dromara.neutrinoproxy.server.controller.req.system.JobInfoUpdateReq; +import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoExecuteRes; +import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoListRes; +import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoUpdateEnableStatusRes; +import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoUpdateRes; +import org.dromara.neutrinoproxy.server.dal.entity.JobInfoDO; +import org.dromara.neutrinoproxy.server.service.JobInfoService; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import lombok.extern.slf4j.Slf4j; import org.noear.solon.annotation.*; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobLogController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/JobLogController.java similarity index 79% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobLogController.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/JobLogController.java index e9e73340..e065c78b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobLogController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/JobLogController.java @@ -19,14 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller; +package org.dromara.neutrinoproxy.server.controller; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.log.JobLogListReq; -import fun.asgc.neutrino.proxy.server.controller.res.log.JobLogListRes; -import fun.asgc.neutrino.proxy.server.service.JobLogService; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.controller.req.log.JobLogListReq; +import org.dromara.neutrinoproxy.server.controller.res.log.JobLogListRes; +import org.dromara.neutrinoproxy.server.service.JobLogService; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import lombok.extern.slf4j.Slf4j; import org.noear.solon.annotation.Controller; import org.noear.solon.annotation.Get; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/LicenseController.java similarity index 85% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/LicenseController.java index 5b9ea803..8018b0c5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/LicenseController.java @@ -19,15 +19,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller; +package org.dromara.neutrinoproxy.server.controller; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.base.rest.Authorization; -import fun.asgc.neutrino.proxy.server.controller.req.proxy.*; -import fun.asgc.neutrino.proxy.server.controller.res.proxy.*; -import fun.asgc.neutrino.proxy.server.service.LicenseService; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.base.rest.Authorization; +import org.dromara.neutrinoproxy.server.controller.req.proxy.*; +import org.dromara.neutrinoproxy.server.controller.res.proxy.*; +import org.dromara.neutrinoproxy.server.controller.req.proxy.*; +import org.dromara.neutrinoproxy.server.controller.res.proxy.*; +import org.dromara.neutrinoproxy.server.service.LicenseService; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import org.noear.solon.annotation.*; import java.util.List; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortGroupController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortGroupController.java similarity index 63% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortGroupController.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortGroupController.java index ac40b956..52b3943d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortGroupController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortGroupController.java @@ -1,17 +1,17 @@ -package fun.asgc.neutrino.proxy.server.controller; +package org.dromara.neutrinoproxy.server.controller; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.base.rest.Authorization; -import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupCreateReq; -import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupDeleteReq; -import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupListReq; -import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupUpdateEnableStatusReq; -import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupCreateRes; -import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupListRes; -import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupUpdateEnableStatusRes; -import fun.asgc.neutrino.proxy.server.service.PortGroupService; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.base.rest.Authorization; +import org.dromara.neutrinoproxy.server.controller.req.system.PortGroupCreateReq; +import org.dromara.neutrinoproxy.server.controller.req.system.PortGroupDeleteReq; +import org.dromara.neutrinoproxy.server.controller.req.system.PortGroupListReq; +import org.dromara.neutrinoproxy.server.controller.req.system.PortGroupUpdateEnableStatusReq; +import org.dromara.neutrinoproxy.server.controller.res.system.PortGroupCreateRes; +import org.dromara.neutrinoproxy.server.controller.res.system.PortGroupListRes; +import org.dromara.neutrinoproxy.server.controller.res.system.PortGroupUpdateEnableStatusRes; +import org.dromara.neutrinoproxy.server.service.PortGroupService; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import org.noear.solon.annotation.*; import java.util.List; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortMappingController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortMappingController.java similarity index 78% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortMappingController.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortMappingController.java index fca42576..edfc2ba9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortMappingController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortMappingController.java @@ -1,11 +1,13 @@ -package fun.asgc.neutrino.proxy.server.controller; +package org.dromara.neutrinoproxy.server.controller; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.proxy.*; -import fun.asgc.neutrino.proxy.server.controller.res.proxy.*; -import fun.asgc.neutrino.proxy.server.service.PortMappingService; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.controller.req.proxy.*; +import org.dromara.neutrinoproxy.server.controller.res.proxy.*; +import org.dromara.neutrinoproxy.server.controller.req.proxy.*; +import org.dromara.neutrinoproxy.server.controller.res.proxy.*; +import org.dromara.neutrinoproxy.server.service.PortMappingService; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import org.apache.commons.lang3.StringUtils; import org.noear.solon.annotation.*; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortPoolController.java similarity index 85% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortPoolController.java index 26db07de..da3d91f6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortPoolController.java @@ -19,15 +19,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller; +package org.dromara.neutrinoproxy.server.controller; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.base.rest.Authorization; -import fun.asgc.neutrino.proxy.server.controller.req.system.*; -import fun.asgc.neutrino.proxy.server.controller.res.system.*; -import fun.asgc.neutrino.proxy.server.service.PortPoolService; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.base.rest.Authorization; +import org.dromara.neutrinoproxy.server.controller.req.system.*; +import org.dromara.neutrinoproxy.server.controller.res.system.*; +import org.dromara.neutrinoproxy.server.service.PortPoolService; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.controller.req.system.*; +import org.dromara.neutrinoproxy.server.controller.res.system.*; import org.noear.solon.annotation.*; import java.util.List; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/ReportController.java similarity index 74% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/ReportController.java index 6d67e612..6f868b4b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/ReportController.java @@ -1,14 +1,15 @@ -package fun.asgc.neutrino.proxy.server.controller; +package org.dromara.neutrinoproxy.server.controller; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.report.LicenseFlowMonthReportReq; -import fun.asgc.neutrino.proxy.server.controller.req.report.LicenseFlowReportReq; -import fun.asgc.neutrino.proxy.server.controller.req.report.UserFlowMonthReportReq; -import fun.asgc.neutrino.proxy.server.controller.req.report.UserFlowReportReq; -import fun.asgc.neutrino.proxy.server.controller.res.report.*; -import fun.asgc.neutrino.proxy.server.service.ReportService; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.controller.req.report.LicenseFlowMonthReportReq; +import org.dromara.neutrinoproxy.server.controller.req.report.LicenseFlowReportReq; +import org.dromara.neutrinoproxy.server.controller.req.report.UserFlowMonthReportReq; +import org.dromara.neutrinoproxy.server.controller.req.report.UserFlowReportReq; +import org.dromara.neutrinoproxy.server.controller.res.report.*; +import org.dromara.neutrinoproxy.server.controller.res.report.*; +import org.dromara.neutrinoproxy.server.service.ReportService; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import org.noear.solon.annotation.Controller; import org.noear.solon.annotation.Get; import org.noear.solon.annotation.Inject; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/UserController.java similarity index 82% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/UserController.java index 7e2283bf..d256b98e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/UserController.java @@ -19,20 +19,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller; +package org.dromara.neutrinoproxy.server.controller; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.base.rest.Authorization; -import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; -import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.controller.req.system.*; -import fun.asgc.neutrino.proxy.server.controller.res.system.*; -import fun.asgc.neutrino.proxy.server.dal.UserMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; -import fun.asgc.neutrino.proxy.server.service.UserService; -import fun.asgc.neutrino.proxy.server.util.Md5Util; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.base.rest.Authorization; +import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder; +import org.dromara.neutrinoproxy.server.constant.ExceptionConstant; +import org.dromara.neutrinoproxy.server.controller.req.system.*; +import org.dromara.neutrinoproxy.server.controller.res.system.*; +import org.dromara.neutrinoproxy.server.controller.res.system.*; +import org.dromara.neutrinoproxy.server.dal.UserMapper; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.service.UserService; +import org.dromara.neutrinoproxy.server.util.Md5Util; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.controller.req.system.*; import org.noear.solon.annotation.*; import java.util.List; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/UserLoginRecordController.java similarity index 78% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/UserLoginRecordController.java index 048a05ec..63332144 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/UserLoginRecordController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/UserLoginRecordController.java @@ -19,14 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller; +package org.dromara.neutrinoproxy.server.controller; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.log.UserLoginRecordListReq; -import fun.asgc.neutrino.proxy.server.controller.res.log.UserLoginRecordListRes; -import fun.asgc.neutrino.proxy.server.service.UserLoginRecordService; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.controller.req.log.UserLoginRecordListReq; +import org.dromara.neutrinoproxy.server.controller.res.log.UserLoginRecordListRes; +import org.dromara.neutrinoproxy.server.service.UserLoginRecordService; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import org.noear.solon.annotation.Controller; import org.noear.solon.annotation.Get; import org.noear.solon.annotation.Inject; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/ClientConnectRecordListReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/log/ClientConnectRecordListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/ClientConnectRecordListReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/log/ClientConnectRecordListReq.java index 5848511e..c70eaa22 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/ClientConnectRecordListReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/log/ClientConnectRecordListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.log; +package org.dromara.neutrinoproxy.server.controller.req.log; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/JobLogListReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/log/JobLogListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/JobLogListReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/log/JobLogListReq.java index 5da3eb17..99f81789 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/JobLogListReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/log/JobLogListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.log; +package org.dromara.neutrinoproxy.server.controller.req.log; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/UserLoginRecordListReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/log/UserLoginRecordListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/UserLoginRecordListReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/log/UserLoginRecordListReq.java index 432be281..c4c2b1c6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/log/UserLoginRecordListReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/log/UserLoginRecordListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.log; +package org.dromara.neutrinoproxy.server.controller.req.log; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseCreateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseCreateReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseCreateReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseCreateReq.java index 126c7ce8..06524b93 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseCreateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseCreateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDeleteReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseDeleteReq.java similarity index 71% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDeleteReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseDeleteReq.java index 29dfd58b..9091d3b8 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDeleteReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseDeleteReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDetailReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseDetailReq.java similarity index 68% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDetailReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseDetailReq.java index 8ba9ea4f..a3f1f800 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseDetailReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseDetailReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseListReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseListReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseListReq.java index 622c5731..f41f60b9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseListReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseResetReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseResetReq.java similarity index 68% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseResetReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseResetReq.java index 8b604911..b2cfaafe 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseResetReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseResetReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseUpdateEnableStatusReq.java similarity index 89% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseUpdateEnableStatusReq.java index d3fe5f4d..54c3641e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseUpdateEnableStatusReq.java @@ -19,9 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; /** * 更新启用状态请求 @@ -36,7 +37,7 @@ public class LicenseUpdateEnableStatusReq { private Integer id; /** * 启用状态 - * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} + * {@link EnableStatusEnum} */ private Integer enable; } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseUpdateReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseUpdateReq.java index 3dc3066d..0f91131f 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/LicenseUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseUpdateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingCreateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingCreateReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingCreateReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingCreateReq.java index 10a9c1e1..3fddf54d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingCreateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingCreateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDeleteReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingDeleteReq.java similarity index 69% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDeleteReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingDeleteReq.java index 561fdd0a..773b4e7c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDeleteReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingDeleteReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDetailReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingDetailReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDetailReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingDetailReq.java index 032c563b..7363d17e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingDetailReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingDetailReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingListReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingListReq.java similarity index 87% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingListReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingListReq.java index 4e9f7bb9..d323fe56 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingListReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingListReq.java @@ -19,9 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; import lombok.Data; /** @@ -51,7 +52,7 @@ public class PortMappingListReq { private Integer isOnline; /** * 启用状态 - * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} + * {@link EnableStatusEnum} */ private Integer enable; } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingUpdateEnableStatusReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingUpdateEnableStatusReq.java index 110d1a1a..0c832fb1 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingUpdateEnableStatusReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingUpdateReq.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingUpdateReq.java index b5f6a8c1..eb64f71c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/proxy/PortMappingUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingUpdateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.proxy; +package org.dromara.neutrinoproxy.server.controller.req.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowMonthReportReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/LicenseFlowMonthReportReq.java similarity index 74% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowMonthReportReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/LicenseFlowMonthReportReq.java index 0c3b5e1c..59805fd9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowMonthReportReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/LicenseFlowMonthReportReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.report; +package org.dromara.neutrinoproxy.server.controller.req.report; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowReportReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/LicenseFlowReportReq.java similarity index 73% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowReportReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/LicenseFlowReportReq.java index 2a5622d9..946fc3c2 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/LicenseFlowReportReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/LicenseFlowReportReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.report; +package org.dromara.neutrinoproxy.server.controller.req.report; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowMonthReportReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/UserFlowMonthReportReq.java similarity index 73% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowMonthReportReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/UserFlowMonthReportReq.java index 230bb365..458556bb 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowMonthReportReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/UserFlowMonthReportReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.report; +package org.dromara.neutrinoproxy.server.controller.req.report; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowReportReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/UserFlowReportReq.java similarity index 73% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowReportReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/UserFlowReportReq.java index a8949527..562f38d5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/report/UserFlowReportReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/report/UserFlowReportReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.report; +package org.dromara.neutrinoproxy.server.controller.req.report; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/AvailablePortListReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/AvailablePortListReq.java similarity index 72% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/AvailablePortListReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/AvailablePortListReq.java index 1b45c938..81526756 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/AvailablePortListReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/AvailablePortListReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoExecuteReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoExecuteReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoExecuteReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoExecuteReq.java index 8c080b27..458351a6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoExecuteReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoExecuteReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoListReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoListReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoListReq.java index d0b84347..7eea461b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoListReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoUpdateEnableStatusReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoUpdateEnableStatusReq.java index c9a99075..24ddd20b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoUpdateEnableStatusReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoUpdateReq.java similarity index 91% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoUpdateReq.java index fa627d7c..42f3d43a 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/JobInfoUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/JobInfoUpdateReq.java @@ -19,9 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; import java.util.Date; @@ -59,7 +60,7 @@ public class JobInfoUpdateReq { private String alarmDing; /** * 启用状态 - * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} + * {@link EnableStatusEnum} */ private Integer enable; /** diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LoginReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/LoginReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LoginReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/LoginReq.java index 52e02ab6..61f12ca3 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LoginReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/LoginReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LogoutReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/LogoutReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LogoutReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/LogoutReq.java index 4417d6f8..30d3bec2 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/LogoutReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/LogoutReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupCreateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupCreateReq.java similarity index 86% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupCreateReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupCreateReq.java index 0d15a8e8..77f632ea 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupCreateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupCreateReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupDeleteReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupDeleteReq.java similarity index 65% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupDeleteReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupDeleteReq.java index 9ec3b4f3..38f3cb8c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupDeleteReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupDeleteReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupListReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupListReq.java similarity index 86% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupListReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupListReq.java index 4ab17ce4..065fa10a 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupListReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupListReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupUpdateEnableStatusReq.java similarity index 72% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupUpdateEnableStatusReq.java index 96fdaa92..4c485049 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortGroupUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortGroupUpdateEnableStatusReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolCreateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolCreateReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolCreateReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolCreateReq.java index 4654b0bd..86ed8fac 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolCreateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolCreateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolDeleteReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolDeleteReq.java similarity index 68% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolDeleteReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolDeleteReq.java index c4ad3b06..480f3120 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolDeleteReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolDeleteReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolListReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolListReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolListReq.java index 7eb49191..ff819b5c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolListReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolUpdateEnableStatusReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolUpdateEnableStatusReq.java index efb919a5..01ec3bfd 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolUpdateEnableStatusReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateGroupReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolUpdateGroupReq.java similarity index 76% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateGroupReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolUpdateGroupReq.java index 677790f8..c12d7e08 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateGroupReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolUpdateGroupReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolUpdateReq.java similarity index 72% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolUpdateReq.java index 5ac1ac6f..77543e20 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/PortPoolUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/PortPoolUpdateReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserCreateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserCreateReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserCreateReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserCreateReq.java index bc665d34..e40a2e95 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserCreateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserCreateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserDeleteReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserDeleteReq.java similarity index 67% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserDeleteReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserDeleteReq.java index 39bcb0ca..d220a9d3 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserDeleteReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserDeleteReq.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserInfoReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserInfoReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserInfoReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserInfoReq.java index c3c34696..c506a5bc 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserInfoReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserInfoReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserListReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserListReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserListReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserListReq.java index cd1ce1b9..6ce2a93c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserListReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserListReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; /** * 用户列表请求 diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserUpdateEnableStatusReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateEnableStatusReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserUpdateEnableStatusReq.java index d1394dfc..fa36eff6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateEnableStatusReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserUpdateEnableStatusReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdatePasswordReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserUpdatePasswordReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdatePasswordReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserUpdatePasswordReq.java index 62ada017..88bdea14 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdatePasswordReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserUpdatePasswordReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateReq.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserUpdateReq.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateReq.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserUpdateReq.java index f082156d..1f3467f6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/system/UserUpdateReq.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/UserUpdateReq.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.req.system; +package org.dromara.neutrinoproxy.server.controller.req.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/ClientConnectRecordListRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/log/ClientConnectRecordListRes.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/ClientConnectRecordListRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/log/ClientConnectRecordListRes.java index 298be764..80898966 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/ClientConnectRecordListRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/log/ClientConnectRecordListRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.log; +package org.dromara.neutrinoproxy.server.controller.res.log; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/JobLogListRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/log/JobLogListRes.java similarity index 91% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/JobLogListRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/log/JobLogListRes.java index 916ac4c7..7277bc5d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/JobLogListRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/log/JobLogListRes.java @@ -19,9 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.log; +package org.dromara.neutrinoproxy.server.controller.res.log; import lombok.Data; +import org.dromara.neutrinoproxy.server.constant.AlarmStatusEnum; import java.util.Date; @@ -55,7 +56,7 @@ public class JobLogListRes { private String msg; /** * 报警状态 - * {@link fun.asgc.neutrino.proxy.server.constant.AlarmStatusEnum} + * {@link AlarmStatusEnum} */ private Integer alarmStatus; /** diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/UserLoginRecordListRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/log/UserLoginRecordListRes.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/UserLoginRecordListRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/log/UserLoginRecordListRes.java index c06eb7db..2f7ce296 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/log/UserLoginRecordListRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/log/UserLoginRecordListRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.log; +package org.dromara.neutrinoproxy.server.controller.res.log; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseCreateRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseCreateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseCreateRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseCreateRes.java index e59e11b5..05e490f5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseCreateRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseCreateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.proxy; +package org.dromara.neutrinoproxy.server.controller.res.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseDetailRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseDetailRes.java similarity index 88% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseDetailRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseDetailRes.java index 64427088..12172bc0 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseDetailRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseDetailRes.java @@ -19,9 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.proxy; +package org.dromara.neutrinoproxy.server.controller.res.proxy; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; import lombok.Data; import lombok.experimental.Accessors; @@ -59,7 +60,7 @@ public class LicenseDetailRes { private Integer isOnline; /** * 启用状态 - * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} + * {@link EnableStatusEnum} */ private Integer enable; /** diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseListRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseListRes.java similarity index 74% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseListRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseListRes.java index 6751e00d..8c25cfab 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseListRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseListRes.java @@ -1,6 +1,7 @@ -package fun.asgc.neutrino.proxy.server.controller.res.proxy; +package org.dromara.neutrinoproxy.server.controller.res.proxy; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; import lombok.Data; import lombok.experimental.Accessors; @@ -38,7 +39,7 @@ public class LicenseListRes { private Integer isOnline; /** * 启用状态 - * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} + * {@link EnableStatusEnum} */ private Integer enable; /** diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseUpdateEnableStatusRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseUpdateEnableStatusRes.java index 2203968d..e3535a23 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseUpdateEnableStatusRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.proxy; +package org.dromara.neutrinoproxy.server.controller.res.proxy; /** * 更新启用状态响应 diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseUpdateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseUpdateRes.java index a749666c..31f8cd67 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/LicenseUpdateRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseUpdateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.proxy; +package org.dromara.neutrinoproxy.server.controller.res.proxy; /** * diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingCreateRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingCreateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingCreateRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingCreateRes.java index aa470671..aa62d38e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingCreateRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingCreateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.proxy; +package org.dromara.neutrinoproxy.server.controller.res.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingDetailRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingDetailRes.java similarity index 79% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingDetailRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingDetailRes.java index c66e9bbf..f378ede2 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingDetailRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingDetailRes.java @@ -1,6 +1,7 @@ -package fun.asgc.neutrino.proxy.server.controller.res.proxy; +package org.dromara.neutrinoproxy.server.controller.res.proxy; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; import lombok.Data; import lombok.experimental.Accessors; @@ -50,7 +51,7 @@ public class PortMappingDetailRes { private Integer isOnline; /** * 启用状态 - * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} + * {@link EnableStatusEnum} */ private Integer enable; /** diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingListRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingListRes.java similarity index 89% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingListRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingListRes.java index 41f8ff28..55d7db5b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingListRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingListRes.java @@ -19,9 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.proxy; +package org.dromara.neutrinoproxy.server.controller.res.proxy; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; import lombok.Data; import java.util.Date; @@ -73,7 +74,7 @@ public class PortMappingListRes { private Integer isOnline; /** * 启用状态 - * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} + * {@link EnableStatusEnum} */ private Integer enable; /** diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingUpdateEnableStatusRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingUpdateEnableStatusRes.java index ac17e3b6..7caf15c5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingUpdateEnableStatusRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.proxy; +package org.dromara.neutrinoproxy.server.controller.res.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingUpdateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingUpdateRes.java index 81f47c6c..d4cc4e05 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/proxy/PortMappingUpdateRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingUpdateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.proxy; +package org.dromara.neutrinoproxy.server.controller.res.proxy; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/HomeDataView.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/HomeDataView.java similarity index 98% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/HomeDataView.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/HomeDataView.java index 432afa14..c81bd0cb 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/HomeDataView.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/HomeDataView.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res.report; +package org.dromara.neutrinoproxy.server.controller.res.report; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowMonthReportRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/LicenseFlowMonthReportRes.java similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowMonthReportRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/LicenseFlowMonthReportRes.java index 06ce9131..0d8b9e36 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowMonthReportRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/LicenseFlowMonthReportRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res.report; +package org.dromara.neutrinoproxy.server.controller.res.report; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowReportRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/LicenseFlowReportRes.java similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowReportRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/LicenseFlowReportRes.java index eba67257..e5ad053a 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/LicenseFlowReportRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/LicenseFlowReportRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res.report; +package org.dromara.neutrinoproxy.server.controller.res.report; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowMonthReportRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/UserFlowMonthReportRes.java similarity index 92% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowMonthReportRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/UserFlowMonthReportRes.java index 88a4bcdc..86bdd352 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowMonthReportRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/UserFlowMonthReportRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res.report; +package org.dromara.neutrinoproxy.server.controller.res.report; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowReportRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/UserFlowReportRes.java similarity index 92% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowReportRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/UserFlowReportRes.java index e15249f1..a2045fc9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/report/UserFlowReportRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/report/UserFlowReportRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res.report; +package org.dromara.neutrinoproxy.server.controller.res.report; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/AvailablePortListRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/AvailablePortListRes.java similarity index 50% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/AvailablePortListRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/AvailablePortListRes.java index 2bb5dc91..8ac164b9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/AvailablePortListRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/AvailablePortListRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoExecuteRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoExecuteRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoExecuteRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoExecuteRes.java index dcea4952..b9ff3c19 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoExecuteRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoExecuteRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoListRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoListRes.java similarity index 91% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoListRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoListRes.java index 29a8bd3c..bcbe9f90 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoListRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoListRes.java @@ -19,9 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; + import java.util.Date; /** @@ -58,7 +60,7 @@ public class JobInfoListRes { private String alarmDing; /** * 启用状态 - * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} + * {@link EnableStatusEnum} */ private Integer enable; /** diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoUpdateEnableStatusRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoUpdateEnableStatusRes.java index f85fd040..12b1bb8b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoUpdateEnableStatusRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoUpdateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoUpdateRes.java index 1fca9230..07803acc 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/JobInfoUpdateRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/JobInfoUpdateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LoginRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/LoginRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LoginRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/LoginRes.java index dddcfdac..59975908 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LoginRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/LoginRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LogoutRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/LogoutRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LogoutRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/LogoutRes.java index 4a06ad9d..22d4cf51 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/LogoutRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/LogoutRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortGroupCreateRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortGroupCreateRes.java new file mode 100644 index 00000000..3a25ef75 --- /dev/null +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortGroupCreateRes.java @@ -0,0 +1,4 @@ +package org.dromara.neutrinoproxy.server.controller.res.system; + +public class PortGroupCreateRes { +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupListRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortGroupListRes.java similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupListRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortGroupListRes.java index ba8c0bf4..66406c40 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupListRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortGroupListRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortGroupUpdateEnableStatusRes.java similarity index 54% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortGroupUpdateEnableStatusRes.java index f4e671dd..44fc80b5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortGroupUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortGroupUpdateEnableStatusRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolCreateRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolCreateRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolCreateRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolCreateRes.java index b0609c04..c7519b4a 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolCreateRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolCreateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolListRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolListRes.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolListRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolListRes.java index c1abccfe..bd605af9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolListRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolListRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolUpdateEnableStatusRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolUpdateEnableStatusRes.java index ff1b86ab..663616c9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolUpdateEnableStatusRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolUpdateGroupRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolUpdateGroupRes.java new file mode 100644 index 00000000..f2084f5c --- /dev/null +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolUpdateGroupRes.java @@ -0,0 +1,4 @@ +package org.dromara.neutrinoproxy.server.controller.res.system; + +public class PortPoolUpdateGroupRes { +} diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolUpdateRes.java similarity index 64% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolUpdateRes.java index 7c84a322..a82dc9e9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/PortPoolUpdateRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/PortPoolUpdateRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserCreateRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserCreateRes.java similarity index 94% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserCreateRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserCreateRes.java index cda1bbf5..29a2759f 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserCreateRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserCreateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; /** * diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserInfoRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserInfoRes.java similarity index 87% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserInfoRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserInfoRes.java index bb7a7ed0..f1c82639 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserInfoRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserInfoRes.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserListRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserListRes.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserListRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserListRes.java index 03fe8452..caf12dc5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserListRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserListRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserUpdateEnableStatusRes.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateEnableStatusRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserUpdateEnableStatusRes.java index fd48cd5e..fab9b364 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateEnableStatusRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserUpdateEnableStatusRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdatePasswordRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserUpdatePasswordRes.java similarity index 94% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdatePasswordRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserUpdatePasswordRes.java index 2c8e7791..a9df9e9e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdatePasswordRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserUpdatePasswordRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; /** * diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateRes.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserUpdateRes.java similarity index 94% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateRes.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserUpdateRes.java index a90eb90f..2691b04d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/system/UserUpdateRes.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/UserUpdateRes.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.controller.res.system; +package org.dromara.neutrinoproxy.server.controller.res.system; /** * diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/ClientConnectRecordMapper.java similarity index 81% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/ClientConnectRecordMapper.java index 18e66852..bc129098 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/ClientConnectRecordMapper.java @@ -1,8 +1,8 @@ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.ClientConnectRecordDO; +import org.dromara.neutrinoproxy.server.dal.entity.ClientConnectRecordDO; import org.apache.ibatis.annotations.Mapper; import java.util.Date; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportDayMapper.java similarity index 94% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportDayMapper.java index 0b014810..1950602d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportDayMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportDayMapper.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportDayDO; +import org.dromara.neutrinoproxy.server.dal.entity.FlowReportDayDO; import org.apache.ibatis.annotations.Mapper; import java.util.Date; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportHourMapper.java similarity index 94% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportHourMapper.java index 2499462e..a00cdeee 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportHourMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportHourMapper.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportHourDO; +import org.dromara.neutrinoproxy.server.dal.entity.FlowReportHourDO; import org.apache.ibatis.annotations.Mapper; import java.util.Date; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportMinuteMapper.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportMinuteMapper.java index 06f367e1..95b308ac 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMinuteMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportMinuteMapper.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO; +import org.dromara.neutrinoproxy.server.dal.entity.FlowReportMinuteDO; import org.apache.ibatis.annotations.Mapper; import java.util.Date; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMonthMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportMonthMapper.java similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMonthMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportMonthMapper.java index 51bb84b2..07a20e0e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/FlowReportMonthMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportMonthMapper.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMonthDO; +import org.dromara.neutrinoproxy.server.dal.entity.FlowReportMonthDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/JobInfoMapper.java similarity index 94% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/JobInfoMapper.java index 3296a9a8..c7e6a7b3 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/JobInfoMapper.java @@ -19,12 +19,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO; +import org.dromara.neutrinoproxy.server.dal.entity.JobInfoDO; import org.apache.ibatis.annotations.Mapper; import java.util.Date; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/JobLogMapper.java similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/JobLogMapper.java index b9c7503d..89322604 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/JobLogMapper.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.JobLogDO; +import org.dromara.neutrinoproxy.server.dal.entity.JobLogDO; import org.apache.ibatis.annotations.Mapper; import java.util.Date; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/LicenseMapper.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/LicenseMapper.java index 99d10df9..0ceb8a46 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/LicenseMapper.java @@ -19,12 +19,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; +import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO; import org.apache.ibatis.annotations.Mapper; import java.util.Date; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortGroupMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/PortGroupMapper.java similarity index 71% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortGroupMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/PortGroupMapper.java index 83c735bb..e5faf189 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortGroupMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/PortGroupMapper.java @@ -1,10 +1,10 @@ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupListReq; -import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupListRes; -import fun.asgc.neutrino.proxy.server.dal.entity.PortGroupDO; +import org.dromara.neutrinoproxy.server.controller.req.system.PortGroupListReq; +import org.dromara.neutrinoproxy.server.controller.res.system.PortGroupListRes; +import org.dromara.neutrinoproxy.server.dal.entity.PortGroupDO; import org.apache.ibatis.annotations.Mapper; import java.util.Date; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/PortMappingMapper.java similarity index 91% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/PortMappingMapper.java index 84a9d2b9..77c9bb24 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/PortMappingMapper.java @@ -1,12 +1,12 @@ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.controller.req.proxy.PortMappingListReq; -import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingListReq; +import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/PortPoolMapper.java similarity index 90% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/PortPoolMapper.java index 7263f063..7c045a98 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/PortPoolMapper.java @@ -19,14 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.controller.req.system.PortPoolListReq; -import fun.asgc.neutrino.proxy.server.controller.res.system.PortPoolListRes; -import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO; +import org.dromara.neutrinoproxy.server.controller.req.system.PortPoolListReq; +import org.dromara.neutrinoproxy.server.controller.res.system.PortPoolListRes; +import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ReportMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/ReportMapper.java similarity index 80% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ReportMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/ReportMapper.java index ff9ff593..00ce80b4 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ReportMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/ReportMapper.java @@ -1,8 +1,12 @@ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; -import fun.asgc.neutrino.proxy.server.controller.res.report.*; -import fun.asgc.neutrino.proxy.server.service.bo.FlowBO; -import fun.asgc.neutrino.proxy.server.service.bo.SingleDayFlowBO; +import org.dromara.neutrinoproxy.server.controller.res.report.*; +import org.dromara.neutrinoproxy.server.controller.res.report.LicenseFlowMonthReportRes; +import org.dromara.neutrinoproxy.server.controller.res.report.LicenseFlowReportRes; +import org.dromara.neutrinoproxy.server.controller.res.report.UserFlowMonthReportRes; +import org.dromara.neutrinoproxy.server.controller.res.report.UserFlowReportRes; +import org.dromara.neutrinoproxy.server.service.bo.FlowBO; +import org.dromara.neutrinoproxy.server.service.bo.SingleDayFlowBO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/UserLoginRecordMapper.java similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/UserLoginRecordMapper.java index 0893612b..617e585b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/UserLoginRecordMapper.java @@ -19,11 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserLoginRecordDO; import org.apache.ibatis.annotations.Mapper; import java.util.Date; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/UserMapper.java similarity index 94% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/UserMapper.java index 2db58a0d..b125324c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/UserMapper.java @@ -1,9 +1,9 @@ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/UserTokenMapper.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/UserTokenMapper.java index 388e97de..c92de3e3 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/UserTokenMapper.java @@ -19,12 +19,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal; +package org.dromara.neutrinoproxy.server.dal; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.UserTokenDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserTokenDO; import org.apache.ibatis.annotations.Mapper; import java.util.Date; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/ClientConnectRecordDO.java similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/ClientConnectRecordDO.java index fd79a98e..04dc06f3 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/ClientConnectRecordDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/ClientConnectRecordDO.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportDayDO.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportDayDO.java index 1f80420d..05ab0e95 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportDayDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportDayDO.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportHourDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportHourDO.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportHourDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportHourDO.java index a11e2c1c..4d342c8e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportHourDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportHourDO.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportMinuteDO.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportMinuteDO.java index b0dec8e9..c2ba3ef3 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMinuteDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportMinuteDO.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMonthDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportMonthDO.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMonthDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportMonthDO.java index 0baa86c3..f251c22c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/FlowReportMonthDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/FlowReportMonthDO.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/JobInfoDO.java similarity index 92% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/JobInfoDO.java index 0baabbc5..6c7b6444 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobInfoDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/JobInfoDO.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.ToString; import lombok.experimental.Accessors; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; import java.util.Date; @@ -52,7 +53,7 @@ public class JobInfoDO { private String param; /** * 启用状态 - * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} + * {@link EnableStatusEnum} */ private Integer enable; /** diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLogDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/JobLogDO.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLogDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/JobLogDO.java index a983b54b..aae9dd12 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLogDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/JobLogDO.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/LicenseDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/LicenseDO.java similarity index 90% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/LicenseDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/LicenseDO.java index e2e88531..0b80c95b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/LicenseDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/LicenseDO.java @@ -19,13 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; import lombok.Data; import lombok.ToString; import lombok.experimental.Accessors; @@ -64,7 +65,7 @@ public class LicenseDO { private Integer isOnline; /** * 启用状态 - * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} + * {@link EnableStatusEnum} */ private Integer enable; /** diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortGroupDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/PortGroupDO.java similarity index 95% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortGroupDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/PortGroupDO.java index 62b6ecc8..61a05a2e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortGroupDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/PortGroupDO.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortMappingDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/PortMappingDO.java similarity index 90% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortMappingDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/PortMappingDO.java index ed93a209..db1d3d1a 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortMappingDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/PortMappingDO.java @@ -19,12 +19,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; import lombok.Data; import lombok.ToString; import lombok.experimental.Accessors; @@ -66,7 +67,7 @@ public class PortMappingDO { private Integer isOnline; /** * 启用状态 - * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum} + * {@link EnableStatusEnum} */ private Integer enable; /** diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortPoolDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/PortPoolDO.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortPoolDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/PortPoolDO.java index 2d74dcad..1086abc6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortPoolDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/PortPoolDO.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/UserDO.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/UserDO.java index 7e3b0ed8..bec67963 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/UserDO.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserLoginRecordDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/UserLoginRecordDO.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserLoginRecordDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/UserLoginRecordDO.java index 6bdac0ec..3d72b449 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserLoginRecordDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/UserLoginRecordDO.java @@ -10,7 +10,7 @@ * in accordance with the terms of the contract agreement * you entered into with Zeyi inc. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserTokenDO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/UserTokenDO.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserTokenDO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/UserTokenDO.java index 249be15e..d4d8fcb4 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/UserTokenDO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/UserTokenDO.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.dal.entity; +package org.dromara.neutrinoproxy.server.dal.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DataCleanJob.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DataCleanJob.java index a64c0e3d..e917525e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DataCleanJob.java @@ -1,8 +1,8 @@ -package fun.asgc.neutrino.proxy.server.job; +package org.dromara.neutrinoproxy.server.job; import com.alibaba.fastjson.JSONObject; -import fun.asgc.neutrino.proxy.core.util.DateUtil; -import fun.asgc.neutrino.proxy.server.dal.*; +import org.dromara.neutrinoproxy.core.util.DateUtil; +import org.dromara.neutrinoproxy.server.dal.*; import fun.asgc.solon.extend.job.IJobHandler; import fun.asgc.solon.extend.job.annotation.JobHandler; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DemoJob.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DemoJob.java similarity index 91% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DemoJob.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DemoJob.java index aaac4d2e..58567546 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DemoJob.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/DemoJob.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.job; +package org.dromara.neutrinoproxy.server.job; import fun.asgc.solon.extend.job.IJobHandler; import fun.asgc.solon.extend.job.annotation.JobHandler; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForDayJob.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForDayJob.java similarity index 88% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForDayJob.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForDayJob.java index e68cb826..3346dedf 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForDayJob.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForDayJob.java @@ -19,17 +19,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.job; +package org.dromara.neutrinoproxy.server.job; import cn.hutool.core.collection.CollectionUtil; -import fun.asgc.neutrino.proxy.core.util.DateUtil; -import fun.asgc.neutrino.proxy.server.dal.FlowReportDayMapper; -import fun.asgc.neutrino.proxy.server.dal.FlowReportHourMapper; -import fun.asgc.neutrino.proxy.server.dal.FlowReportMinuteMapper; -import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportDayDO; -import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportHourDO; -import fun.asgc.neutrino.proxy.server.service.FlowReportService; +import org.dromara.neutrinoproxy.core.util.DateUtil; +import org.dromara.neutrinoproxy.server.dal.FlowReportDayMapper; +import org.dromara.neutrinoproxy.server.dal.FlowReportHourMapper; +import org.dromara.neutrinoproxy.server.dal.FlowReportMinuteMapper; +import org.dromara.neutrinoproxy.server.dal.LicenseMapper; +import org.dromara.neutrinoproxy.server.dal.entity.FlowReportDayDO; +import org.dromara.neutrinoproxy.server.dal.entity.FlowReportHourDO; +import org.dromara.neutrinoproxy.server.service.FlowReportService; import fun.asgc.solon.extend.job.IJobHandler; import fun.asgc.solon.extend.job.annotation.JobHandler; import lombok.extern.slf4j.Slf4j; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForHourJob.java similarity index 86% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForHourJob.java index ede9b3da..57cb5666 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForHourJob.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForHourJob.java @@ -1,13 +1,13 @@ -package fun.asgc.neutrino.proxy.server.job; +package org.dromara.neutrinoproxy.server.job; import cn.hutool.core.collection.CollectionUtil; -import fun.asgc.neutrino.proxy.core.util.DateUtil; -import fun.asgc.neutrino.proxy.server.dal.FlowReportHourMapper; -import fun.asgc.neutrino.proxy.server.dal.FlowReportMinuteMapper; -import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportHourDO; -import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO; -import fun.asgc.neutrino.proxy.server.service.FlowReportService; +import org.dromara.neutrinoproxy.core.util.DateUtil; +import org.dromara.neutrinoproxy.server.dal.FlowReportHourMapper; +import org.dromara.neutrinoproxy.server.dal.FlowReportMinuteMapper; +import org.dromara.neutrinoproxy.server.dal.LicenseMapper; +import org.dromara.neutrinoproxy.server.dal.entity.FlowReportHourDO; +import org.dromara.neutrinoproxy.server.dal.entity.FlowReportMinuteDO; +import org.dromara.neutrinoproxy.server.service.FlowReportService; import fun.asgc.solon.extend.job.IJobHandler; import fun.asgc.solon.extend.job.annotation.JobHandler; import lombok.extern.slf4j.Slf4j; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForMinuteJob.java similarity index 85% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForMinuteJob.java index 3b9b521a..8ae002c9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMinuteJob.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForMinuteJob.java @@ -1,12 +1,12 @@ -package fun.asgc.neutrino.proxy.server.job; +package org.dromara.neutrinoproxy.server.job; import cn.hutool.core.collection.CollectionUtil; -import fun.asgc.neutrino.proxy.core.util.DateUtil; -import fun.asgc.neutrino.proxy.server.dal.FlowReportMinuteMapper; -import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMinuteDO; -import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; -import fun.asgc.neutrino.proxy.server.service.FlowReportService; +import org.dromara.neutrinoproxy.core.util.DateUtil; +import org.dromara.neutrinoproxy.server.dal.FlowReportMinuteMapper; +import org.dromara.neutrinoproxy.server.dal.LicenseMapper; +import org.dromara.neutrinoproxy.server.dal.entity.FlowReportMinuteDO; +import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO; +import org.dromara.neutrinoproxy.server.service.FlowReportService; import fun.asgc.solon.extend.job.IJobHandler; import fun.asgc.solon.extend.job.annotation.JobHandler; import lombok.extern.slf4j.Slf4j; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForMonthJob.java similarity index 90% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForMonthJob.java index 4b8f2c4c..d2ede262 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/FlowReportForMonthJob.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/job/FlowReportForMonthJob.java @@ -1,11 +1,11 @@ -package fun.asgc.neutrino.proxy.server.job; +package org.dromara.neutrinoproxy.server.job; import cn.hutool.core.collection.CollectionUtil; -import fun.asgc.neutrino.proxy.core.util.DateUtil; -import fun.asgc.neutrino.proxy.server.dal.*; -import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportDayDO; -import fun.asgc.neutrino.proxy.server.dal.entity.FlowReportMonthDO; -import fun.asgc.neutrino.proxy.server.service.FlowReportService; +import org.dromara.neutrinoproxy.core.util.DateUtil; +import org.dromara.neutrinoproxy.server.dal.*; +import org.dromara.neutrinoproxy.server.dal.entity.FlowReportDayDO; +import org.dromara.neutrinoproxy.server.dal.entity.FlowReportMonthDO; +import org.dromara.neutrinoproxy.server.service.FlowReportService; import fun.asgc.solon.extend.job.IJobHandler; import fun.asgc.solon.extend.job.annotation.JobHandler; import lombok.extern.slf4j.Slf4j; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/BytesMetricsHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/BytesMetricsHandler.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/BytesMetricsHandler.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/BytesMetricsHandler.java index d157376c..ac649fde 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/BytesMetricsHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/BytesMetricsHandler.java @@ -20,9 +20,9 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.proxy.core; +package org.dromara.neutrinoproxy.server.proxy.core; -import fun.asgc.neutrino.proxy.server.proxy.domain.MetricsCollector; +import org.dromara.neutrinoproxy.server.proxy.domain.MetricsCollector; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ProxyServerRunner.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyServerRunner.java similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ProxyServerRunner.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyServerRunner.java index 44414277..670fc753 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ProxyServerRunner.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ProxyServerRunner.java @@ -1,9 +1,9 @@ -package fun.asgc.neutrino.proxy.server.proxy.core; +package org.dromara.neutrinoproxy.server.proxy.core; -import fun.asgc.neutrino.proxy.core.ProxyMessageDecoder; -import fun.asgc.neutrino.proxy.core.ProxyMessageEncoder; -import fun.asgc.neutrino.proxy.core.util.FileUtil; -import fun.asgc.neutrino.proxy.server.base.proxy.ProxyConfig; +import org.dromara.neutrinoproxy.core.ProxyMessageDecoder; +import org.dromara.neutrinoproxy.core.ProxyMessageEncoder; +import org.dromara.neutrinoproxy.core.util.FileUtil; +import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelInitializer; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ServerChannelHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ServerChannelHandler.java similarity index 87% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ServerChannelHandler.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ServerChannelHandler.java index 37bf2024..dd2fdec3 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/ServerChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/ServerChannelHandler.java @@ -20,18 +20,18 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.proxy.core; +package org.dromara.neutrinoproxy.server.proxy.core; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.dispatcher.Dispatcher; -import fun.asgc.neutrino.proxy.server.constant.ClientConnectTypeEnum; -import fun.asgc.neutrino.proxy.server.constant.SuccessCodeEnum; -import fun.asgc.neutrino.proxy.server.dal.entity.ClientConnectRecordDO; -import fun.asgc.neutrino.proxy.server.proxy.domain.CmdChannelAttachInfo; -import fun.asgc.neutrino.proxy.server.service.ClientConnectRecordService; -import fun.asgc.neutrino.proxy.server.service.ProxyMutualService; -import fun.asgc.neutrino.proxy.server.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.dispatcher.Dispatcher; +import org.dromara.neutrinoproxy.server.constant.ClientConnectTypeEnum; +import org.dromara.neutrinoproxy.server.constant.SuccessCodeEnum; +import org.dromara.neutrinoproxy.server.dal.entity.ClientConnectRecordDO; +import org.dromara.neutrinoproxy.server.proxy.domain.CmdChannelAttachInfo; +import org.dromara.neutrinoproxy.server.service.ClientConnectRecordService; +import org.dromara.neutrinoproxy.server.service.ProxyMutualService; +import org.dromara.neutrinoproxy.server.util.ProxyUtil; import io.netty.buffer.Unpooled; import io.netty.channel.*; import io.netty.handler.timeout.IdleStateEvent; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/VisitorChannelHandler.java old mode 100755 new mode 100644 similarity index 93% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/VisitorChannelHandler.java index bff65358..4f5d12f5 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/core/VisitorChannelHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/VisitorChannelHandler.java @@ -1,11 +1,11 @@ -package fun.asgc.neutrino.proxy.server.proxy.core; +package org.dromara.neutrinoproxy.server.proxy.core; import cn.hutool.core.util.StrUtil; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.server.proxy.domain.VisitorChannelAttachInfo; -import fun.asgc.neutrino.proxy.server.service.FlowReportService; -import fun.asgc.neutrino.proxy.server.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.server.proxy.domain.VisitorChannelAttachInfo; +import org.dromara.neutrinoproxy.server.service.FlowReportService; +import org.dromara.neutrinoproxy.server.util.ProxyUtil; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/CmdChannelAttachInfo.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/CmdChannelAttachInfo.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/CmdChannelAttachInfo.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/CmdChannelAttachInfo.java index 7b711ecf..e5189f5c 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/CmdChannelAttachInfo.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/CmdChannelAttachInfo.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.proxy.domain; +package org.dromara.neutrinoproxy.server.proxy.domain; import io.netty.channel.Channel; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/Metrics.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/Metrics.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/Metrics.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/Metrics.java index 7f2e47d4..feb87e8d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/Metrics.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/Metrics.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.proxy.domain; +package org.dromara.neutrinoproxy.server.proxy.domain; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/MetricsCollector.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/MetricsCollector.java similarity index 98% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/MetricsCollector.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/MetricsCollector.java index 6b5c8c76..61f462b1 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/MetricsCollector.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/MetricsCollector.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.proxy.domain; +package org.dromara.neutrinoproxy.server.proxy.domain; import java.util.ArrayList; import java.util.Iterator; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/ProxyMapping.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/ProxyMapping.java similarity index 88% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/ProxyMapping.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/ProxyMapping.java index 99c61fa0..f535fb35 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/ProxyMapping.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/ProxyMapping.java @@ -1,7 +1,7 @@ -package fun.asgc.neutrino.proxy.server.proxy.domain; +package org.dromara.neutrinoproxy.server.proxy.domain; import cn.hutool.core.collection.CollectionUtil; -import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO; +import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/VisitorChannelAttachInfo.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/VisitorChannelAttachInfo.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/VisitorChannelAttachInfo.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/VisitorChannelAttachInfo.java index 65c195ae..a0db9875 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/domain/VisitorChannelAttachInfo.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/domain/VisitorChannelAttachInfo.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.proxy.domain; +package org.dromara.neutrinoproxy.server.proxy.domain; import lombok.Data; import lombok.experimental.Accessors; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageAuthHandler.java similarity index 86% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageAuthHandler.java index 0e52daf1..a43584da 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageAuthHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageAuthHandler.java @@ -20,22 +20,23 @@ * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.proxy.handler; +package org.dromara.neutrinoproxy.server.proxy.handler; import cn.hutool.core.util.StrUtil; -import fun.asgc.neutrino.proxy.core.*; -import fun.asgc.neutrino.proxy.core.dispatcher.Match; -import fun.asgc.neutrino.proxy.server.base.proxy.ProxyConfig; -import fun.asgc.neutrino.proxy.server.constant.ClientConnectTypeEnum; -import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; -import fun.asgc.neutrino.proxy.server.constant.SuccessCodeEnum; -import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.ClientConnectRecordDO; -import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; -import fun.asgc.neutrino.proxy.server.service.*; -import fun.asgc.neutrino.proxy.server.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.*; +import org.dromara.neutrinoproxy.core.*; +import org.dromara.neutrinoproxy.core.dispatcher.Match; +import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig; +import org.dromara.neutrinoproxy.server.constant.ClientConnectTypeEnum; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.constant.SuccessCodeEnum; +import org.dromara.neutrinoproxy.server.dal.LicenseMapper; +import org.dromara.neutrinoproxy.server.dal.entity.ClientConnectRecordDO; +import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.service.*; +import org.dromara.neutrinoproxy.server.util.ProxyUtil; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageConnectHandler.java similarity index 83% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageConnectHandler.java index f166bb76..3882960a 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageConnectHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageConnectHandler.java @@ -1,14 +1,15 @@ -package fun.asgc.neutrino.proxy.server.proxy.handler; +package org.dromara.neutrinoproxy.server.proxy.handler; import cn.hutool.core.util.StrUtil; -import fun.asgc.neutrino.proxy.core.*; -import fun.asgc.neutrino.proxy.core.dispatcher.Match; -import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; -import fun.asgc.neutrino.proxy.server.service.LicenseService; -import fun.asgc.neutrino.proxy.server.service.UserService; -import fun.asgc.neutrino.proxy.server.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.*; +import org.dromara.neutrinoproxy.core.*; +import org.dromara.neutrinoproxy.core.dispatcher.Match; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.service.LicenseService; +import org.dromara.neutrinoproxy.server.service.UserService; +import org.dromara.neutrinoproxy.server.util.ProxyUtil; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOption; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageDisconnectHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageDisconnectHandler.java similarity index 75% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageDisconnectHandler.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageDisconnectHandler.java index 248faaf0..636ef5c5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageDisconnectHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageDisconnectHandler.java @@ -1,11 +1,11 @@ -package fun.asgc.neutrino.proxy.server.proxy.handler; +package org.dromara.neutrinoproxy.server.proxy.handler; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.core.ProxyDataTypeEnum; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.ProxyMessageHandler; -import fun.asgc.neutrino.proxy.core.dispatcher.Match; -import fun.asgc.neutrino.proxy.server.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.ProxyMessageHandler; +import org.dromara.neutrinoproxy.core.dispatcher.Match; +import org.dromara.neutrinoproxy.server.util.ProxyUtil; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageHeartbeatHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageHeartbeatHandler.java similarity index 62% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageHeartbeatHandler.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageHeartbeatHandler.java index 22a9a101..dea21dbb 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageHeartbeatHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageHeartbeatHandler.java @@ -1,10 +1,10 @@ -package fun.asgc.neutrino.proxy.server.proxy.handler; +package org.dromara.neutrinoproxy.server.proxy.handler; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.core.ProxyDataTypeEnum; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.ProxyMessageHandler; -import fun.asgc.neutrino.proxy.core.dispatcher.Match; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.ProxyMessageHandler; +import org.dromara.neutrinoproxy.core.dispatcher.Match; import io.netty.channel.ChannelHandlerContext; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageTransferHandler.java similarity index 67% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageTransferHandler.java index d3f3663d..fdefbba1 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/proxy/handler/ProxyMessageTransferHandler.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageTransferHandler.java @@ -1,13 +1,13 @@ -package fun.asgc.neutrino.proxy.server.proxy.handler; +package org.dromara.neutrinoproxy.server.proxy.handler; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.core.ProxyDataTypeEnum; -import fun.asgc.neutrino.proxy.core.ProxyMessage; -import fun.asgc.neutrino.proxy.core.ProxyMessageHandler; -import fun.asgc.neutrino.proxy.core.dispatcher.Match; -import fun.asgc.neutrino.proxy.server.proxy.domain.VisitorChannelAttachInfo; -import fun.asgc.neutrino.proxy.server.service.FlowReportService; -import fun.asgc.neutrino.proxy.server.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum; +import org.dromara.neutrinoproxy.core.ProxyMessage; +import org.dromara.neutrinoproxy.core.ProxyMessageHandler; +import org.dromara.neutrinoproxy.core.dispatcher.Match; +import org.dromara.neutrinoproxy.server.proxy.domain.VisitorChannelAttachInfo; +import org.dromara.neutrinoproxy.server.service.FlowReportService; +import org.dromara.neutrinoproxy.server.util.ProxyUtil; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ClientConnectRecordService.java similarity index 81% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ClientConnectRecordService.java index 41799f78..da0a2ceb 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ClientConnectRecordService.java @@ -1,21 +1,21 @@ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; -import fun.asgc.neutrino.proxy.server.controller.req.log.ClientConnectRecordListReq; -import fun.asgc.neutrino.proxy.server.controller.res.log.ClientConnectRecordListRes; -import fun.asgc.neutrino.proxy.server.dal.ClientConnectRecordMapper; -import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; -import fun.asgc.neutrino.proxy.server.dal.UserMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.ClientConnectRecordDO; -import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder; +import org.dromara.neutrinoproxy.server.controller.req.log.ClientConnectRecordListReq; +import org.dromara.neutrinoproxy.server.controller.res.log.ClientConnectRecordListRes; +import org.dromara.neutrinoproxy.server.dal.ClientConnectRecordMapper; +import org.dromara.neutrinoproxy.server.dal.LicenseMapper; +import org.dromara.neutrinoproxy.server.dal.UserMapper; +import org.dromara.neutrinoproxy.server.dal.entity.ClientConnectRecordDO; +import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; import lombok.extern.slf4j.Slf4j; import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/FlowReportService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/FlowReportService.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/FlowReportService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/FlowReportService.java index 7cfb0b01..af67e225 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/FlowReportService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/FlowReportService.java @@ -19,9 +19,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; -import fun.asgc.neutrino.proxy.core.util.LockUtil; +import org.dromara.neutrinoproxy.core.util.LockUtil; import lombok.extern.slf4j.Slf4j; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobInfoService.java similarity index 78% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobInfoService.java index 42f65919..7e043841 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobInfoService.java @@ -1,25 +1,25 @@ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.google.common.collect.Lists; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoExecuteReq; -import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoListReq; -import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoUpdateEnableStatusReq; -import fun.asgc.neutrino.proxy.server.controller.req.system.JobInfoUpdateReq; -import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoExecuteRes; -import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoListRes; -import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoUpdateEnableStatusRes; -import fun.asgc.neutrino.proxy.server.controller.res.system.JobInfoUpdateRes; -import fun.asgc.neutrino.proxy.server.dal.JobInfoMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.ExceptionConstant; +import org.dromara.neutrinoproxy.server.controller.req.system.JobInfoExecuteReq; +import org.dromara.neutrinoproxy.server.controller.req.system.JobInfoListReq; +import org.dromara.neutrinoproxy.server.controller.req.system.JobInfoUpdateEnableStatusReq; +import org.dromara.neutrinoproxy.server.controller.req.system.JobInfoUpdateReq; +import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoExecuteRes; +import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoListRes; +import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoUpdateEnableStatusRes; +import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoUpdateRes; +import org.dromara.neutrinoproxy.server.dal.JobInfoMapper; +import org.dromara.neutrinoproxy.server.dal.entity.JobInfoDO; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import fun.asgc.solon.extend.job.IJobSource; import fun.asgc.solon.extend.job.JobInfo; import fun.asgc.solon.extend.job.impl.JobExecutor; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java similarity index 87% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java index 63c61b76..08f6baf5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java @@ -19,17 +19,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.log.JobLogListReq; -import fun.asgc.neutrino.proxy.server.controller.res.log.JobLogListRes; -import fun.asgc.neutrino.proxy.server.dal.JobLogMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.JobLogDO; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.controller.req.log.JobLogListReq; +import org.dromara.neutrinoproxy.server.controller.res.log.JobLogListRes; +import org.dromara.neutrinoproxy.server.dal.JobLogMapper; +import org.dromara.neutrinoproxy.server.dal.entity.JobLogDO; import fun.asgc.solon.extend.job.IJobCallback; import fun.asgc.solon.extend.job.JobInfo; import lombok.extern.slf4j.Slf4j; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java similarity index 86% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java index f6316680..f1b3830f 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -6,24 +6,25 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.google.common.collect.Sets; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; -import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; -import fun.asgc.neutrino.proxy.server.controller.req.proxy.LicenseCreateReq; -import fun.asgc.neutrino.proxy.server.controller.req.proxy.LicenseListReq; -import fun.asgc.neutrino.proxy.server.controller.req.proxy.LicenseUpdateEnableStatusReq; -import fun.asgc.neutrino.proxy.server.controller.req.proxy.LicenseUpdateReq; -import fun.asgc.neutrino.proxy.server.controller.res.proxy.*; -import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; -import fun.asgc.neutrino.proxy.server.dal.UserMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.ExceptionConstant; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.controller.req.proxy.LicenseCreateReq; +import org.dromara.neutrinoproxy.server.controller.req.proxy.LicenseListReq; +import org.dromara.neutrinoproxy.server.controller.req.proxy.LicenseUpdateEnableStatusReq; +import org.dromara.neutrinoproxy.server.controller.req.proxy.LicenseUpdateReq; +import org.dromara.neutrinoproxy.server.controller.res.proxy.*; +import org.dromara.neutrinoproxy.server.dal.LicenseMapper; +import org.dromara.neutrinoproxy.server.dal.UserMapper; +import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; +import org.dromara.neutrinoproxy.server.controller.res.proxy.*; import org.jetbrains.annotations.Nullable; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortGroupService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortGroupService.java similarity index 71% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortGroupService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortGroupService.java index a1b14162..85a2ba44 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortGroupService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortGroupService.java @@ -1,26 +1,26 @@ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.base.rest.ServiceException; -import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; -import fun.asgc.neutrino.proxy.server.constant.Constants; -import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupCreateReq; -import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupListReq; -import fun.asgc.neutrino.proxy.server.controller.req.system.PortGroupUpdateEnableStatusReq; -import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupCreateRes; -import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupListRes; -import fun.asgc.neutrino.proxy.server.controller.res.system.PortGroupUpdateEnableStatusRes; -import fun.asgc.neutrino.proxy.server.dal.PortGroupMapper; -import fun.asgc.neutrino.proxy.server.dal.PortPoolMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.PortGroupDO; -import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.base.rest.ServiceException; +import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder; +import org.dromara.neutrinoproxy.server.constant.Constants; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.ExceptionConstant; +import org.dromara.neutrinoproxy.server.controller.req.system.PortGroupCreateReq; +import org.dromara.neutrinoproxy.server.controller.req.system.PortGroupListReq; +import org.dromara.neutrinoproxy.server.controller.req.system.PortGroupUpdateEnableStatusReq; +import org.dromara.neutrinoproxy.server.controller.res.system.PortGroupCreateRes; +import org.dromara.neutrinoproxy.server.controller.res.system.PortGroupListRes; +import org.dromara.neutrinoproxy.server.controller.res.system.PortGroupUpdateEnableStatusRes; +import org.dromara.neutrinoproxy.server.dal.PortGroupMapper; +import org.dromara.neutrinoproxy.server.dal.PortPoolMapper; +import org.dromara.neutrinoproxy.server.dal.entity.PortGroupDO; +import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java similarity index 86% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java index 48bd2a41..8af550f6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java @@ -1,32 +1,33 @@ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.google.common.collect.Sets; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; -import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; -import fun.asgc.neutrino.proxy.server.controller.req.proxy.PortMappingCreateReq; -import fun.asgc.neutrino.proxy.server.controller.req.proxy.PortMappingListReq; -import fun.asgc.neutrino.proxy.server.controller.req.proxy.PortMappingUpdateEnableStatusReq; -import fun.asgc.neutrino.proxy.server.controller.req.proxy.PortMappingUpdateReq; -import fun.asgc.neutrino.proxy.server.controller.res.proxy.*; -import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; -import fun.asgc.neutrino.proxy.server.dal.PortMappingMapper; -import fun.asgc.neutrino.proxy.server.dal.PortPoolMapper; -import fun.asgc.neutrino.proxy.server.dal.UserMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; -import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO; -import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.ExceptionConstant; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingCreateReq; +import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingListReq; +import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingUpdateEnableStatusReq; +import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingUpdateReq; +import org.dromara.neutrinoproxy.server.controller.res.proxy.*; +import org.dromara.neutrinoproxy.server.dal.LicenseMapper; +import org.dromara.neutrinoproxy.server.dal.PortMappingMapper; +import org.dromara.neutrinoproxy.server.dal.PortPoolMapper; +import org.dromara.neutrinoproxy.server.dal.UserMapper; +import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO; +import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO; +import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; +import org.dromara.neutrinoproxy.server.controller.res.proxy.*; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; import org.noear.solon.core.Lifecycle; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortPoolService.java similarity index 83% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortPoolService.java index 037dba9c..a99826f2 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortPoolService.java @@ -1,27 +1,33 @@ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.base.rest.ServiceException; -import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.controller.req.system.*; -import fun.asgc.neutrino.proxy.server.controller.res.system.*; -import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; -import fun.asgc.neutrino.proxy.server.dal.PortGroupMapper; -import fun.asgc.neutrino.proxy.server.dal.PortMappingMapper; -import fun.asgc.neutrino.proxy.server.dal.PortPoolMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.*; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.base.rest.ServiceException; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.ExceptionConstant; +import org.dromara.neutrinoproxy.server.controller.req.system.*; +import org.dromara.neutrinoproxy.server.controller.res.system.*; +import org.dromara.neutrinoproxy.server.dal.LicenseMapper; +import org.dromara.neutrinoproxy.server.dal.PortGroupMapper; +import org.dromara.neutrinoproxy.server.dal.PortMappingMapper; +import org.dromara.neutrinoproxy.server.dal.PortPoolMapper; +import org.dromara.neutrinoproxy.server.dal.entity.*; +import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO; +import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO; +import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import lombok.extern.slf4j.Slf4j; import ma.glasnost.orika.MapperFacade; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.solon.annotation.Db; +import org.dromara.neutrinoproxy.server.controller.req.system.*; +import org.dromara.neutrinoproxy.server.controller.res.system.*; +import org.dromara.neutrinoproxy.server.dal.entity.PortGroupDO; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; @@ -31,7 +37,7 @@ import java.util.Objects; import java.util.function.Consumer; import java.util.stream.Collectors; -import static fun.asgc.neutrino.proxy.server.constant.ExceptionConstant.*; +import static org.dromara.neutrinoproxy.server.constant.ExceptionConstant.*; /** * diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ProxyMutualService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ProxyMutualService.java similarity index 88% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ProxyMutualService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ProxyMutualService.java index 5a063d47..c2fd3c63 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ProxyMutualService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ProxyMutualService.java @@ -19,12 +19,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; -import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; -import fun.asgc.neutrino.proxy.server.dal.PortMappingMapper; -import fun.asgc.neutrino.proxy.server.proxy.domain.CmdChannelAttachInfo; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.dal.LicenseMapper; +import org.dromara.neutrinoproxy.server.dal.PortMappingMapper; +import org.dromara.neutrinoproxy.server.proxy.domain.CmdChannelAttachInfo; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ReportService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ReportService.java similarity index 92% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ReportService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ReportService.java index c0da1708..324d3633 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ReportService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ReportService.java @@ -1,29 +1,29 @@ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.google.common.collect.Lists; -import fun.asgc.neutrino.proxy.core.util.DateUtil; -import fun.asgc.neutrino.proxy.server.base.db.DbConfig; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.constant.Constants; -import fun.asgc.neutrino.proxy.server.constant.OnlineStatusEnum; -import fun.asgc.neutrino.proxy.server.controller.req.report.LicenseFlowMonthReportReq; -import fun.asgc.neutrino.proxy.server.controller.req.report.LicenseFlowReportReq; -import fun.asgc.neutrino.proxy.server.controller.req.report.UserFlowMonthReportReq; -import fun.asgc.neutrino.proxy.server.controller.req.report.UserFlowReportReq; -import fun.asgc.neutrino.proxy.server.controller.res.report.*; -import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; -import fun.asgc.neutrino.proxy.server.dal.PortMappingMapper; -import fun.asgc.neutrino.proxy.server.dal.ReportMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; -import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO; -import fun.asgc.neutrino.proxy.server.service.bo.FlowBO; -import fun.asgc.neutrino.proxy.server.service.bo.SingleDayFlowBO; -import fun.asgc.neutrino.proxy.server.util.FormatUtil; +import org.dromara.neutrinoproxy.core.util.DateUtil; +import org.dromara.neutrinoproxy.server.base.db.DbConfig; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.constant.Constants; +import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum; +import org.dromara.neutrinoproxy.server.controller.req.report.LicenseFlowMonthReportReq; +import org.dromara.neutrinoproxy.server.controller.req.report.LicenseFlowReportReq; +import org.dromara.neutrinoproxy.server.controller.req.report.UserFlowMonthReportReq; +import org.dromara.neutrinoproxy.server.controller.req.report.UserFlowReportReq; +import org.dromara.neutrinoproxy.server.controller.res.report.*; +import org.dromara.neutrinoproxy.server.dal.LicenseMapper; +import org.dromara.neutrinoproxy.server.dal.PortMappingMapper; +import org.dromara.neutrinoproxy.server.dal.ReportMapper; +import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO; +import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO; +import org.dromara.neutrinoproxy.server.service.bo.FlowBO; +import org.dromara.neutrinoproxy.server.service.bo.SingleDayFlowBO; +import org.dromara.neutrinoproxy.server.util.FormatUtil; import lombok.extern.slf4j.Slf4j; import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/UserLoginRecordService.java similarity index 80% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/UserLoginRecordService.java index 173faccb..dd0f040d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/UserLoginRecordService.java @@ -1,18 +1,18 @@ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.controller.req.log.UserLoginRecordListReq; -import fun.asgc.neutrino.proxy.server.controller.res.log.UserLoginRecordListRes; -import fun.asgc.neutrino.proxy.server.dal.UserLoginRecordMapper; -import fun.asgc.neutrino.proxy.server.dal.UserMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; -import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.controller.req.log.UserLoginRecordListReq; +import org.dromara.neutrinoproxy.server.controller.res.log.UserLoginRecordListRes; +import org.dromara.neutrinoproxy.server.dal.UserLoginRecordMapper; +import org.dromara.neutrinoproxy.server.dal.UserMapper; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserLoginRecordDO; import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/UserService.java similarity index 84% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/UserService.java index 5f173e7c..fa89d4ac 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/UserService.java @@ -1,26 +1,26 @@ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; -import fun.asgc.neutrino.proxy.core.util.DateUtil; -import fun.asgc.neutrino.proxy.server.base.page.PageInfo; -import fun.asgc.neutrino.proxy.server.base.page.PageQuery; -import fun.asgc.neutrino.proxy.server.base.rest.ServiceException; -import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; -import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.controller.req.system.*; -import fun.asgc.neutrino.proxy.server.controller.res.system.*; -import fun.asgc.neutrino.proxy.server.dal.UserLoginRecordMapper; -import fun.asgc.neutrino.proxy.server.dal.UserMapper; -import fun.asgc.neutrino.proxy.server.dal.UserTokenMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; -import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO; -import fun.asgc.neutrino.proxy.server.dal.entity.UserTokenDO; -import fun.asgc.neutrino.proxy.server.util.Md5Util; -import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; +import org.dromara.neutrinoproxy.core.util.DateUtil; +import org.dromara.neutrinoproxy.server.base.page.PageInfo; +import org.dromara.neutrinoproxy.server.base.page.PageQuery; +import org.dromara.neutrinoproxy.server.base.rest.ServiceException; +import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.constant.ExceptionConstant; +import org.dromara.neutrinoproxy.server.controller.req.system.*; +import org.dromara.neutrinoproxy.server.controller.res.system.*; +import org.dromara.neutrinoproxy.server.dal.UserLoginRecordMapper; +import org.dromara.neutrinoproxy.server.dal.UserMapper; +import org.dromara.neutrinoproxy.server.dal.UserTokenMapper; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserLoginRecordDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserTokenDO; +import org.dromara.neutrinoproxy.server.util.Md5Util; +import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/VisitorChannelService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/VisitorChannelService.java similarity index 90% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/VisitorChannelService.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/VisitorChannelService.java index 7c3ab7c5..07324151 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/VisitorChannelService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/VisitorChannelService.java @@ -1,23 +1,23 @@ -package fun.asgc.neutrino.proxy.server.service; +package org.dromara.neutrinoproxy.server.service; import cn.hutool.core.collection.CollectionUtil; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fun.asgc.neutrino.proxy.core.Constants; -import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum; -import fun.asgc.neutrino.proxy.server.dal.LicenseMapper; -import fun.asgc.neutrino.proxy.server.dal.PortMappingMapper; -import fun.asgc.neutrino.proxy.server.dal.PortPoolMapper; -import fun.asgc.neutrino.proxy.server.dal.UserMapper; -import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; -import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO; -import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO; -import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; -import fun.asgc.neutrino.proxy.server.proxy.core.BytesMetricsHandler; -import fun.asgc.neutrino.proxy.server.proxy.core.VisitorChannelHandler; -import fun.asgc.neutrino.proxy.server.proxy.domain.CmdChannelAttachInfo; -import fun.asgc.neutrino.proxy.server.proxy.domain.ProxyMapping; -import fun.asgc.neutrino.proxy.server.util.ProxyUtil; +import org.dromara.neutrinoproxy.core.Constants; +import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum; +import org.dromara.neutrinoproxy.server.dal.LicenseMapper; +import org.dromara.neutrinoproxy.server.dal.PortMappingMapper; +import org.dromara.neutrinoproxy.server.dal.PortPoolMapper; +import org.dromara.neutrinoproxy.server.dal.UserMapper; +import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO; +import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO; +import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO; +import org.dromara.neutrinoproxy.server.dal.entity.UserDO; +import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler; +import org.dromara.neutrinoproxy.server.proxy.core.VisitorChannelHandler; +import org.dromara.neutrinoproxy.server.proxy.domain.CmdChannelAttachInfo; +import org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping; +import org.dromara.neutrinoproxy.server.util.ProxyUtil; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/bo/FlowBO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/bo/FlowBO.java similarity index 82% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/bo/FlowBO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/bo/FlowBO.java index 903b60ae..970a78b8 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/bo/FlowBO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/bo/FlowBO.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.service.bo; +package org.dromara.neutrinoproxy.server.service.bo; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/bo/SingleDayFlowBO.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/bo/SingleDayFlowBO.java similarity index 87% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/bo/SingleDayFlowBO.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/bo/SingleDayFlowBO.java index 9d6391fd..cff17909 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/bo/SingleDayFlowBO.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/bo/SingleDayFlowBO.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.service.bo; +package org.dromara.neutrinoproxy.server.service.bo; import lombok.Data; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/FormatUtil.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/FormatUtil.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/FormatUtil.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/FormatUtil.java index 6678298e..21770a70 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/FormatUtil.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/FormatUtil.java @@ -1,4 +1,4 @@ -package fun.asgc.neutrino.proxy.server.util; +package org.dromara.neutrinoproxy.server.util; /** * @author: aoshiguchen diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/Md5Util.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/Md5Util.java similarity index 97% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/Md5Util.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/Md5Util.java index 020dddc4..923bd4b6 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/Md5Util.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/Md5Util.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package fun.asgc.neutrino.proxy.server.util; +package org.dromara.neutrinoproxy.server.util; import java.math.BigInteger; import java.security.MessageDigest; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/ParamCheckUtil.java similarity index 92% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/ParamCheckUtil.java index dfab7e77..c921d34e 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/ParamCheckUtil.java @@ -1,8 +1,8 @@ -package fun.asgc.neutrino.proxy.server.util; +package org.dromara.neutrinoproxy.server.util; import cn.hutool.core.util.StrUtil; -import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant; -import fun.asgc.neutrino.proxy.server.base.rest.ServiceException; +import org.dromara.neutrinoproxy.server.constant.ExceptionConstant; +import org.dromara.neutrinoproxy.server.base.rest.ServiceException; import java.util.Collection; import java.util.Map; diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/ProxyUtil.java similarity index 96% rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java rename to neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/ProxyUtil.java index 88ab1f3e..85679290 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ProxyUtil.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/ProxyUtil.java @@ -1,11 +1,11 @@ -package fun.asgc.neutrino.proxy.server.util; +package org.dromara.neutrinoproxy.server.util; import cn.hutool.core.collection.CollectionUtil; import com.google.common.collect.Sets; -import fun.asgc.neutrino.proxy.core.ChannelAttribute; -import fun.asgc.neutrino.proxy.server.proxy.domain.CmdChannelAttachInfo; -import fun.asgc.neutrino.proxy.server.proxy.domain.ProxyMapping; -import fun.asgc.neutrino.proxy.server.proxy.domain.VisitorChannelAttachInfo; +import org.dromara.neutrinoproxy.core.ChannelAttribute; +import org.dromara.neutrinoproxy.server.proxy.domain.CmdChannelAttachInfo; +import org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping; +import org.dromara.neutrinoproxy.server.proxy.domain.VisitorChannelAttachInfo; import io.netty.channel.Channel; import io.netty.util.AttributeKey; diff --git a/neutrino-proxy-server/src/main/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml index 4cca73c3..3bca9b98 100644 --- a/neutrino-proxy-server/src/main/resources/app.yml +++ b/neutrino-proxy-server/src/main/resources/app.yml @@ -40,10 +40,10 @@ solon.staticfiles.mappings: mybatis.db: typeAliases: #支持包名 或 类名(大写开头 或 *)//支持 ** 或 * 占位符 - - "fun.asgc.neutrino.proxy.server.dal.entity" + - "org.dromara.neutrinoproxy.server.dal.entity" mappers: #支持包名 或 类名(大写开头 或 *)或 xml(.xml结尾)//支持 ** 或 * 占位符 - "classpath:mapper/*.xml" - - "fun.asgc.neutrino.proxy.server.dal" + - "org.dromara.neutrinoproxy.server.dal" configuration: #扩展配置(要与 MybatisConfiguration 类的属性一一对应) cacheEnabled: false mapUnderscoreToCamelCase: true diff --git a/neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml index 9108a026..3f60380b 100644 --- a/neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml +++ b/neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml @@ -1,8 +1,8 @@ - + - SELECT g.*, CASE WHEN g.possessor_type = 1 THEN diff --git a/neutrino-proxy-server/src/main/resources/mapper/PortMappingMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/PortMappingMapper.xml index d65fd915..35e29b88 100644 --- a/neutrino-proxy-server/src/main/resources/mapper/PortMappingMapper.xml +++ b/neutrino-proxy-server/src/main/resources/mapper/PortMappingMapper.xml @@ -1,8 +1,8 @@ - + - SELECT pm.* from port_mapping pm left join license on pm.license_id = license.`id` diff --git a/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml index 54d875a0..6cbb1935 100644 --- a/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml +++ b/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml @@ -1,8 +1,8 @@ - + - SELECT p.*, g.possessor_type, g.`name` group_name @@ -16,7 +16,7 @@ ORDER BY p.id - SELECT * FROM diff --git a/neutrino-proxy-server/src/main/resources/mapper/ReportMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/ReportMapper.xml index 917a67ac..dc894f50 100644 --- a/neutrino-proxy-server/src/main/resources/mapper/ReportMapper.xml +++ b/neutrino-proxy-server/src/main/resources/mapper/ReportMapper.xml @@ -1,8 +1,8 @@ - + - SELECT u.id AS 'userId', u.name AS 'userName', @@ -30,7 +30,7 @@ GROUP BY u.id - SELECT l.id AS 'licenseId', l.name AS 'licenseName', @@ -61,7 +61,7 @@ GROUP BY l.id - SELECT T2.user_id, u.name AS 'userName', @@ -121,7 +121,7 @@ ORDER BY T2.user_id ASC,T2.date DESC - SELECT T2.user_id, u.name AS 'userName', @@ -189,7 +189,7 @@ ORDER BY T2.user_id ASC,T2.license_id,T2.date DESC - SELECT IFNULL(SUM(frm.write_bytes),0) AS 'upFlowBytes', IFNULL(SUM(frm.read_bytes),0) AS 'downFlowBytes' @@ -197,7 +197,7 @@ WHERE frm.date >= #{curDayBeginDate} AND frm.date <= #{curDate} - SELECT IFNULL(SUM(T.upFlowBytes),0) AS 'upFlowBytes', IFNULL(SUM(T.downFlowBytes),0) AS 'downFlowBytes' @@ -226,7 +226,7 @@ ) T - SELECT T.* FROM (