diff --git a/broker/pom.xml b/broker/pom.xml index 485c4b8b..0e578ddd 100644 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -44,7 +44,7 @@ org.slf4j slf4j-api - 1.7.25 + 2.0.12 com.lmax @@ -129,18 +129,17 @@ 3.11.5 - - com.xiaoleilu - hutool - 2.15.11 + cn.hutool + hutool-all + 5.8.26 junit junit - 4.13.1 + 4.13.2 test @@ -214,14 +213,12 @@ runtime - com.squareup.okhttp3 okhttp - 3.13.1 + 4.12.0 - org.flywaydb flyway-core diff --git a/broker/src/main/java/com/xiaoleilu/loServer/LoFileServer.java b/broker/src/main/java/com/xiaoleilu/loServer/LoFileServer.java index ebcadc1a..588d6476 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/LoFileServer.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/LoFileServer.java @@ -1,8 +1,6 @@ package com.xiaoleilu.loServer; -import com.xiaoleilu.hutool.log.Log; -import com.xiaoleilu.hutool.log.StaticLog; -import com.xiaoleilu.hutool.util.DateUtil; +import cn.hutool.core.date.DateUtil; import com.xiaoleilu.loServer.action.Action; import com.xiaoleilu.loServer.action.ClassUtil; import com.xiaoleilu.loServer.annotation.Route; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/LoServer.java b/broker/src/main/java/com/xiaoleilu/loServer/LoServer.java index f22760ad..23b413e4 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/LoServer.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/LoServer.java @@ -1,6 +1,6 @@ package com.xiaoleilu.loServer; -import com.xiaoleilu.hutool.util.DateUtil; +import cn.hutool.core.date.DateUtil; import com.xiaoleilu.loServer.action.Action; import com.xiaoleilu.loServer.annotation.Route; import com.xiaoleilu.loServer.handler.AdminActionHandler; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/ServerSetting.java b/broker/src/main/java/com/xiaoleilu/loServer/ServerSetting.java index 40121361..b130b25d 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/ServerSetting.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/ServerSetting.java @@ -5,11 +5,9 @@ import java.nio.charset.Charset; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.xiaoleilu.hutool.lang.Singleton; -import com.xiaoleilu.hutool.log.Log; -import com.xiaoleilu.hutool.log.StaticLog; -import com.xiaoleilu.hutool.util.FileUtil; -import com.xiaoleilu.hutool.util.StrUtil; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.lang.Singleton; +import cn.hutool.core.util.StrUtil; import com.xiaoleilu.loServer.action.Action; import com.xiaoleilu.loServer.action.DefaultIndexAction; import com.xiaoleilu.loServer.action.UnknownErrorAction; @@ -189,7 +187,7 @@ public class ServerSetting { * @param filterClass Filter类 */ public static void setFilter(String path, Class filterClass) { - setFilter(path, (Filter)Singleton.get(filterClass)); + setFilter(path, (Filter) Singleton.get(filterClass)); } //----------------------------------------------------------------------------------------------- Filter end diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java index f901f792..650d7acf 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java @@ -8,13 +8,11 @@ import java.util.Date; import java.util.Locale; import java.util.regex.Pattern; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.ReUtil; +import cn.hutool.core.util.StrUtil; import com.hazelcast.core.HazelcastInstance; -import com.xiaoleilu.hutool.log.Log; -import com.xiaoleilu.hutool.log.StaticLog; -import com.xiaoleilu.hutool.util.DateUtil; -import com.xiaoleilu.hutool.util.FileUtil; -import com.xiaoleilu.hutool.util.ReUtil; -import com.xiaoleilu.hutool.util.StrUtil; import com.xiaoleilu.loServer.ServerSetting; import com.xiaoleilu.loServer.handler.Request; import com.xiaoleilu.loServer.handler.Response; @@ -24,6 +22,8 @@ import io.netty.handler.codec.http.HttpHeaderNames; import io.netty.handler.codec.http.HttpResponseStatus; import org.slf4j.LoggerFactory; +import static cn.hutool.core.date.DatePattern.HTTP_DATETIME_PATTERN; + /** * 默认的主页Action，当访问主页且没有定义主页Action时，调用此Action * @@ -96,7 +96,7 @@ public class FileAction extends Action { } private static final Pattern INSECURE_URI = Pattern.compile(".*[<>&\"].*"); - private static final SimpleDateFormat HTTP_DATE_FORMATER = new SimpleDateFormat(DateUtil.HTTP_DATETIME_PATTERN, Locale.US); + private static final SimpleDateFormat HTTP_DATE_FORMATER = new SimpleDateFormat(HTTP_DATETIME_PATTERN, Locale.US); /** diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/NotFoundAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/NotFoundAction.java index 607facf9..d1630ed1 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/NotFoundAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/NotFoundAction.java @@ -1,9 +1,6 @@ package com.xiaoleilu.loServer.action; import com.hazelcast.core.HazelcastInstance; -import com.xiaoleilu.hutool.log.Log; -import com.xiaoleilu.hutool.log.StaticLog; -import com.xiaoleilu.hutool.util.StrUtil; import com.xiaoleilu.loServer.handler.Request; import com.xiaoleilu.loServer.handler.Response; import io.moquette.spi.IMessagesStore; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/UnknownErrorAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/UnknownErrorAction.java index d0eaf109..0b064c74 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/UnknownErrorAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/UnknownErrorAction.java @@ -4,9 +4,6 @@ import java.io.PrintWriter; import java.io.StringWriter; import com.hazelcast.core.HazelcastInstance; -import com.xiaoleilu.hutool.log.Log; -import com.xiaoleilu.hutool.log.StaticLog; -import com.xiaoleilu.hutool.util.StrUtil; import com.xiaoleilu.loServer.handler.Request; import com.xiaoleilu.loServer.handler.Response; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/exception/ServerSettingException.java b/broker/src/main/java/com/xiaoleilu/loServer/exception/ServerSettingException.java index c2aa0cb6..56f0e4ef 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/exception/ServerSettingException.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/exception/ServerSettingException.java @@ -1,31 +1,32 @@ -package com.xiaoleilu.loServer.exception; - -import com.xiaoleilu.hutool.util.StrUtil; - -/** - * 设置异常 - * @author xiaoleilu - */ -public class ServerSettingException extends RuntimeException{ - private static final long serialVersionUID = -4134588858314744501L; - - public ServerSettingException(Throwable e) { - super(e); - } - - public ServerSettingException(String message) { - super(message); - } - - public ServerSettingException(String messageTemplate, Object... params) { - super(StrUtil.format(messageTemplate, params)); - } - - public ServerSettingException(String message, Throwable throwable) { - super(message, throwable); - } - - public ServerSettingException(Throwable throwable, String messageTemplate, Object... params) { - super(StrUtil.format(messageTemplate, params), throwable); - } -} +package com.xiaoleilu.loServer.exception; + + +import cn.hutool.core.util.StrUtil; + +/** + * 设置异常 + * @author xiaoleilu + */ +public class ServerSettingException extends RuntimeException{ + private static final long serialVersionUID = -4134588858314744501L; + + public ServerSettingException(Throwable e) { + super(e); + } + + public ServerSettingException(String message) { + super(message); + } + + public ServerSettingException(String messageTemplate, Object... params) { + super(StrUtil.format(messageTemplate, params)); + } + + public ServerSettingException(String message, Throwable throwable) { + super(message, throwable); + } + + public ServerSettingException(Throwable throwable, String messageTemplate, Object... params) { + super(StrUtil.format(messageTemplate, params), throwable); + } +} diff --git a/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java b/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java index c9bd35f5..a875179d 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java @@ -1,7 +1,7 @@ package com.xiaoleilu.loServer.handler; +import cn.hutool.core.lang.Singleton; import cn.wildfirechat.common.IMExceptionEvent; -import com.xiaoleilu.hutool.lang.Singleton; import com.xiaoleilu.loServer.ServerSetting; import com.xiaoleilu.loServer.action.Action; import com.xiaoleilu.loServer.action.UnknownErrorAction; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/handler/AdminActionHandler.java b/broker/src/main/java/com/xiaoleilu/loServer/handler/AdminActionHandler.java index e8f4d7d6..39cf24e3 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/handler/AdminActionHandler.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/handler/AdminActionHandler.java @@ -8,7 +8,6 @@ package com.xiaoleilu.loServer.handler; -import com.xiaoleilu.hutool.lang.Singleton; import com.xiaoleilu.loServer.ServerSetting; import com.xiaoleilu.loServer.action.Action; import com.xiaoleilu.loServer.action.FileAction; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/handler/HttpChunkContentCompressor.java b/broker/src/main/java/com/xiaoleilu/loServer/handler/HttpChunkContentCompressor.java index c94edfd6..f2736846 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/handler/HttpChunkContentCompressor.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/handler/HttpChunkContentCompressor.java @@ -1,28 +1,27 @@ -package com.xiaoleilu.loServer.handler; - -import com.xiaoleilu.hutool.log.StaticLog; - -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelPromise; -import io.netty.channel.FileRegion; -import io.netty.handler.codec.http.DefaultHttpResponse; -import io.netty.handler.codec.http.HttpContentCompressor; - -/** - * 解决大文件传输与Gzip压缩冲突问题 - * @author Looly - * - */ -public class HttpChunkContentCompressor extends HttpContentCompressor { - @Override - public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { - StaticLog.debug("Write object [{}]", msg); - - if (msg instanceof FileRegion || msg instanceof DefaultHttpResponse) { - //文件传输不经过Gzip压缩 - ctx.write(msg, promise); - }else{ - super.write(ctx, msg, promise); - } - } -} +package com.xiaoleilu.loServer.handler; + +import cn.hutool.log.StaticLog; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelPromise; +import io.netty.channel.FileRegion; +import io.netty.handler.codec.http.DefaultHttpResponse; +import io.netty.handler.codec.http.HttpContentCompressor; + +/** + * 解决大文件传输与Gzip压缩冲突问题 + * @author Looly + * + */ +public class HttpChunkContentCompressor extends HttpContentCompressor { + @Override + public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception { + StaticLog.debug("Write object [{}]", msg); + + if (msg instanceof FileRegion || msg instanceof DefaultHttpResponse) { + //文件传输不经过Gzip压缩 + ctx.write(msg, promise); + }else{ + super.write(ctx, msg, promise); + } + } +} diff --git a/broker/src/main/java/com/xiaoleilu/loServer/handler/HttpResponseHelper.java b/broker/src/main/java/com/xiaoleilu/loServer/handler/HttpResponseHelper.java index 88433f94..4452fa5a 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/handler/HttpResponseHelper.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/handler/HttpResponseHelper.java @@ -1,7 +1,6 @@ package com.xiaoleilu.loServer.handler; import io.netty.util.internal.StringUtil; -import com.xiaoleilu.hutool.util.FileUtil; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/handler/IMActionHandler.java b/broker/src/main/java/com/xiaoleilu/loServer/handler/IMActionHandler.java index 1af9b110..11fc4c61 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/handler/IMActionHandler.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/handler/IMActionHandler.java @@ -8,7 +8,6 @@ package com.xiaoleilu.loServer.handler; -import com.xiaoleilu.hutool.lang.Singleton; import com.xiaoleilu.loServer.ServerSetting; import com.xiaoleilu.loServer.action.Action; import com.xiaoleilu.loServer.action.FileAction; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/handler/Request.java b/broker/src/main/java/com/xiaoleilu/loServer/handler/Request.java index 96d8b9d9..310b33f5 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/handler/Request.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/handler/Request.java @@ -10,15 +10,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.xiaoleilu.hutool.http.HttpUtil; -import com.xiaoleilu.hutool.lang.Conver; -import com.xiaoleilu.hutool.log.Log; -import com.xiaoleilu.hutool.log.StaticLog; -import com.xiaoleilu.hutool.util.CharsetUtil; -import com.xiaoleilu.hutool.util.DateUtil; -import com.xiaoleilu.hutool.util.StrUtil; -import com.xiaoleilu.hutool.util.URLUtil; - +import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.net.NetUtil; +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.core.util.URLUtil; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpHeaderNames; @@ -261,7 +258,7 @@ public class Request { * @return 获得Integer类型请求参数 */ public Integer getIntParam(String name, Integer defaultValue) { - return Conver.toInt(getParam(name), defaultValue); + return Convert.toInt(getParam(name), defaultValue); } /** @@ -270,7 +267,7 @@ public class Request { * @return 获得long类型请求参数 */ public Long getLongParam(String name, Long defaultValue) { - return Conver.toLong(getParam(name), defaultValue); + return Convert.toLong(getParam(name), defaultValue); } /** @@ -279,7 +276,7 @@ public class Request { * @return 获得Double类型请求参数 */ public Double getDoubleParam(String name, Double defaultValue) { - return Conver.toDouble(getParam(name), defaultValue); + return Convert.toDouble(getParam(name), defaultValue); } /** @@ -288,7 +285,7 @@ public class Request { * @return 获得Float类型请求参数 */ public Float getFloatParam(String name, Float defaultValue) { - return Conver.toFloat(getParam(name), defaultValue); + return Convert.toFloat(getParam(name), defaultValue); } /** @@ -297,7 +294,7 @@ public class Request { * @return 获得Boolean类型请求参数 */ public Boolean getBoolParam(String name, Boolean defaultValue) { - return Conver.toBool(getParam(name), defaultValue); + return Convert.toBool(getParam(name), defaultValue); } /** @@ -477,7 +474,7 @@ public class Request { protected void putIp(ChannelHandlerContext ctx) { String ip = getHeader("X-Forwarded-For"); if (StrUtil.isNotBlank(ip)) { - ip = HttpUtil.getMultistageReverseProxyIp(ip); + ip = NetUtil.getMultistageReverseProxyIp(ip); } else { final InetSocketAddress insocket = (InetSocketAddress) ctx.channel().remoteAddress(); ip = insocket.getAddress().getHostAddress(); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/handler/Response.java b/broker/src/main/java/com/xiaoleilu/loServer/handler/Response.java index 44f99165..61ebf921 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/handler/Response.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/handler/Response.java @@ -13,12 +13,9 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TimeZone; -import com.xiaoleilu.hutool.http.HttpUtil; -import com.xiaoleilu.hutool.log.Log; -import com.xiaoleilu.hutool.log.StaticLog; -import com.xiaoleilu.hutool.util.CharsetUtil; -import com.xiaoleilu.hutool.util.DateUtil; -import com.xiaoleilu.hutool.util.StrUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.util.StrUtil; import com.xiaoleilu.loServer.ServerSetting; import com.xiaoleilu.loServer.listener.FileProgressiveFutureListener; @@ -44,6 +41,8 @@ import io.netty.handler.codec.http.cookie.ServerCookieEncoder; import org.apache.tika.Tika; import org.slf4j.LoggerFactory; +import static cn.hutool.core.date.DatePattern.HTTP_DATETIME_PATTERN; + /** * 响应对象 * @@ -332,7 +331,7 @@ public class Response { * @param httpCacheSeconds 缓存时间，单位秒 */ public void setDateAndCache(long lastModify, int httpCacheSeconds) { - SimpleDateFormat formatter = new SimpleDateFormat(DateUtil.HTTP_DATETIME_PATTERN, Locale.US); + SimpleDateFormat formatter = new SimpleDateFormat(HTTP_DATETIME_PATTERN, Locale.US); formatter.setTimeZone(TimeZone.getTimeZone("GMT")); // Date header diff --git a/broker/src/main/java/com/xiaoleilu/loServer/listener/FileProgressiveFutureListener.java b/broker/src/main/java/com/xiaoleilu/loServer/listener/FileProgressiveFutureListener.java index 9395f336..8c0f138a 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/listener/FileProgressiveFutureListener.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/listener/FileProgressiveFutureListener.java @@ -2,10 +2,7 @@ package com.xiaoleilu.loServer.listener; import java.io.RandomAccessFile; -import com.xiaoleilu.hutool.io.IoUtil; -import com.xiaoleilu.hutool.log.Log; -import com.xiaoleilu.hutool.log.StaticLog; - +import cn.hutool.core.io.IoUtil; import io.netty.channel.ChannelProgressiveFuture; import io.netty.channel.ChannelProgressiveFutureListener; import org.slf4j.LoggerFactory; diff --git a/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java b/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java index b11ee053..1ce59ab9 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java @@ -10,7 +10,6 @@ package io.moquette.imhandler; import cn.wildfirechat.proto.ProtoConstants; import cn.wildfirechat.proto.WFCMessage; -import com.xiaoleilu.hutool.system.UserInfo; import io.moquette.persistence.MemorySessionStore; import io.moquette.spi.impl.Qos1PublishHandler; import io.moquette.spi.impl.security.TokenAuthenticator; diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index e1bb1ce8..bddf37ee 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -23,7 +23,6 @@ import com.google.gson.Gson; import com.google.protobuf.ByteString; import com.hazelcast.core.*; import com.hazelcast.util.StringUtil; -import com.xiaoleilu.hutool.system.UserInfo; import com.xiaoleilu.loServer.RestResult; import com.xiaoleilu.loServer.action.admin.AdminAction; import com.xiaoleilu.loServer.model.FriendData; diff --git a/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java b/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java index e0159799..cc6df820 100755 --- a/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java +++ b/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.util.*; import java.util.zip.GZIPOutputStream; +import cn.hutool.core.util.ReflectUtil; import cn.wildfirechat.proto.ProtoConstants; import cn.wildfirechat.server.ThreadPoolExecutorWrapper; import com.google.gson.Gson; @@ -92,7 +93,7 @@ public class Qos1PublishHandler extends QosPublishHandler { for (Class cls:ClassUtil.getAllAssignedClass(IMHandler.class)) { Handler annotation = (Handler)cls.getAnnotation(Handler.class); if(annotation != null) { - IMHandler handler = (IMHandler) com.xiaoleilu.hutool.util.ClassUtil.newInstance(cls); + IMHandler handler = (IMHandler) ReflectUtil.newInstance(cls); m_imHandlers.put(annotation.value(), handler); } }