diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/decoder/StartAndLengthFieldFrameDecoder.java b/jsowell-netty/src/main/java/com/jsowell/netty/decoder/StartAndLengthFieldFrameDecoder.java
index d7e6cdc7f..783957618 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/decoder/StartAndLengthFieldFrameDecoder.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/decoder/StartAndLengthFieldFrameDecoder.java
@@ -14,11 +14,11 @@ public class StartAndLengthFieldFrameDecoder extends ByteToMessageDecoder {
private static final int HEADER_LENGTH_68 = 1; // 68 包头的长度
// 起始标志
- private int HEAD_DATA;
+ // private int HEAD_DATA;
- public StartAndLengthFieldFrameDecoder(int HEAD_DATA) {
- this.HEAD_DATA = HEAD_DATA;
- }
+ // public StartAndLengthFieldFrameDecoder(int HEAD_DATA) {
+ // this.HEAD_DATA = HEAD_DATA;
+ // }
/**
*
@@ -26,62 +26,62 @@ public class StartAndLengthFieldFrameDecoder extends ByteToMessageDecoder {
* 表示数据的长度contentLength，int类型，占据1个字节.
*
*/
- public final int BASE_LENGTH = 1 + 1;
+ // public final int BASE_LENGTH = 1 + 1;
// @Override
- protected void decode2(ChannelHandlerContext ctx, ByteBuf buffer, List out) throws Exception {
- // 可读长度必须大于基本长度
- if (buffer.readableBytes() <= BASE_LENGTH) {
- log.warn("可读字节数:{}小于基础长度:{}", buffer.readableBytes(), BASE_LENGTH);
- return;
- }
-
- // 记录包头开始的index
- int beginReader;
-
- while (true) {
- // 获取包头开始的index
- beginReader = buffer.readerIndex();
- // log.info("包头开始的index:{}", beginReader);
- // 标记包头开始的index
- buffer.markReaderIndex();
- // 读到了协议的开始标志，结束while循环
- if (buffer.getUnsignedByte(beginReader) == HEAD_DATA) {
- // log.info("读到了协议的开始标志，结束while循环 byte:{}, HEAD_DATA:{}", buffer.getUnsignedByte(beginReader), HEAD_DATA);
- break;
- }
-
- // 未读到包头，略过一个字节
- // 每次略过，一个字节，去读取，包头信息的开始标记
- buffer.resetReaderIndex();
- buffer.readByte();
-
- // 当略过，一个字节之后，
- // 数据包的长度，又变得不满足
- // 此时，应该结束。等待后面的数据到达
- if (buffer.readableBytes() < BASE_LENGTH) {
- log.debug("数据包的长度不满足 readableBytes:{}, BASE_LENGTH:{}", buffer.readableBytes(), BASE_LENGTH);
- return;
- }
- }
-
- // 消息的长度
- int length = buffer.getUnsignedByte(beginReader + 1);
- // 判断请求数据包数据是否到齐
- if (buffer.readableBytes() < length + 4) {
- // log.info("请求数据包数据没有到齐,还原读指针 readableBytes:{}, 消息的长度:{}", buffer.readableBytes(), length);
- // 还原读指针
- buffer.readerIndex(beginReader);
- return;
- }
-
- // 读取data数据
- byte[] data = new byte[length + 4];
- buffer.readBytes(data);
- ByteBuf frame = buffer.retainedSlice(beginReader, length + 4);
- buffer.readerIndex(beginReader + length + 4);
- out.add(frame);
- }
+ // protected void decode2(ChannelHandlerContext ctx, ByteBuf buffer, List out) throws Exception {
+ // // 可读长度必须大于基本长度
+ // if (buffer.readableBytes() <= BASE_LENGTH) {
+ // log.warn("可读字节数:{}小于基础长度:{}", buffer.readableBytes(), BASE_LENGTH);
+ // return;
+ // }
+ //
+ // // 记录包头开始的index
+ // int beginReader;
+ //
+ // while (true) {
+ // // 获取包头开始的index
+ // beginReader = buffer.readerIndex();
+ // // log.info("包头开始的index:{}", beginReader);
+ // // 标记包头开始的index
+ // buffer.markReaderIndex();
+ // // 读到了协议的开始标志，结束while循环
+ // if (buffer.getUnsignedByte(beginReader) == HEAD_DATA) {
+ // // log.info("读到了协议的开始标志，结束while循环 byte:{}, HEAD_DATA:{}", buffer.getUnsignedByte(beginReader), HEAD_DATA);
+ // break;
+ // }
+ //
+ // // 未读到包头，略过一个字节
+ // // 每次略过，一个字节，去读取，包头信息的开始标记
+ // buffer.resetReaderIndex();
+ // buffer.readByte();
+ //
+ // // 当略过，一个字节之后，
+ // // 数据包的长度，又变得不满足
+ // // 此时，应该结束。等待后面的数据到达
+ // if (buffer.readableBytes() < BASE_LENGTH) {
+ // log.debug("数据包的长度不满足 readableBytes:{}, BASE_LENGTH:{}", buffer.readableBytes(), BASE_LENGTH);
+ // return;
+ // }
+ // }
+ //
+ // // 消息的长度
+ // int length = buffer.getUnsignedByte(beginReader + 1);
+ // // 判断请求数据包数据是否到齐
+ // if (buffer.readableBytes() < length + 4) {
+ // // log.info("请求数据包数据没有到齐,还原读指针 readableBytes:{}, 消息的长度:{}", buffer.readableBytes(), length);
+ // // 还原读指针
+ // buffer.readerIndex(beginReader);
+ // return;
+ // }
+ //
+ // // 读取data数据
+ // byte[] data = new byte[length + 4];
+ // buffer.readBytes(data);
+ // ByteBuf frame = buffer.retainedSlice(beginReader, length + 4);
+ // buffer.readerIndex(beginReader + length + 4);
+ // out.add(frame);
+ // }
protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List out) throws Exception {
// 记录包头开始的index
@@ -97,7 +97,12 @@ public class StartAndLengthFieldFrameDecoder extends ByteToMessageDecoder {
buffer.markReaderIndex();
// 读到了协议的开始标志，结束while循环
- if (buffer.getUnsignedByte(beginReader) == HEAD_DATA) {
+ // if (buffer.getUnsignedByte(beginReader) == HEAD_DATA) {
+ // break;
+ // }
+
+ // 读到了协议的开始标志，结束while循环
+ if (isStartOfDnyHeader(buffer, beginReader) || isStartOf68Header(buffer, beginReader)) {
break;
}
@@ -132,6 +137,23 @@ public class StartAndLengthFieldFrameDecoder extends ByteToMessageDecoder {
buffer.resetReaderIndex();
}
+ private boolean isStartOfDnyHeader(ByteBuf buffer, int beginReader) {
+ if (buffer.readableBytes() >= HEADER_LENGTH_DNY) {
+ byte[] headerBytes = new byte[HEADER_LENGTH_DNY];
+ buffer.getBytes(beginReader, headerBytes, 0, HEADER_LENGTH_DNY);
+ String header = new String(headerBytes, StandardCharsets.UTF_8);
+ return "DNY".equals(header);
+ }
+ return false;
+ }
+
+ private boolean isStartOf68Header(ByteBuf buffer, int beginReader) {
+ if (buffer.readableBytes() >= HEADER_LENGTH_68) {
+ return buffer.getUnsignedByte(beginReader) == 0x68;
+ }
+ return false;
+ }
+
private void decode68Message(ByteBuf buffer, List out, int beginReader) {
if (buffer.readableBytes() < HEADER_LENGTH_68 + 1) {
buffer.readerIndex(beginReader);
diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/NettyServerManager.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/NettyServerManager.java
new file mode 100644
index 000000000..0c050ba84
--- /dev/null
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/NettyServerManager.java
@@ -0,0 +1,98 @@
+package com.jsowell.netty.server;
+
+import com.jsowell.common.constant.Constants;
+import com.jsowell.netty.server.yunkuaichong.NettyServerChannelInitializer;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.logging.LogLevel;
+import io.netty.handler.logging.LoggingHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.net.InetSocketAddress;
+
+@Slf4j
+@Component
+public class NettyServerManager implements CommandLineRunner {
+
+ @Resource
+ private NettyServerChannelInitializer nettyServerChannelInitializer;
+
+ @Override
+ public void run(String... args) throws Exception {
+ startNettyServer(Constants.SOCKET_IP, 9011);
+ startElectricBikeNettyServer(Constants.SOCKET_IP, 9012);
+ }
+
+ public void startNettyServer(String host, int port) {
+ new Thread(() -> {
+ EventLoopGroup bossGroup = new NioEventLoopGroup(1);
+ EventLoopGroup workerGroup = new NioEventLoopGroup();
+
+ try {
+ ServerBootstrap bootstrap = new ServerBootstrap()
+ .group(bossGroup, workerGroup)
+ .channel(NioServerSocketChannel.class)
+ .handler(new LoggingHandler(LogLevel.DEBUG))
+ .option(ChannelOption.SO_BACKLOG, 128)
+ .option(ChannelOption.SO_REUSEADDR, true)
+ .childOption(ChannelOption.SO_KEEPALIVE, true)
+ .childOption(ChannelOption.SO_REUSEADDR, true)
+ .childHandler(nettyServerChannelInitializer)
+ .localAddress(new InetSocketAddress(host, port));
+
+ ChannelFuture future = bootstrap.bind(port).sync();
+ if (future.isSuccess()) {
+ log.info("NettyServer启动成功, 开始监听端口:{}", port);
+ } else {
+ log.error("NettyServer启动失败", future.cause());
+ }
+
+ future.channel().closeFuture().sync();
+ } catch (Exception e) {
+ log.error("NettyServer.start error", e);
+ bossGroup.shutdownGracefully();
+ workerGroup.shutdownGracefully();
+ }
+ }).start();
+ }
+
+ public void startElectricBikeNettyServer(String host, int port) {
+ new Thread(() -> {
+ EventLoopGroup bossGroup = new NioEventLoopGroup(1);
+ EventLoopGroup workerGroup = new NioEventLoopGroup();
+
+ try {
+ ServerBootstrap bootstrap = new ServerBootstrap()
+ .group(bossGroup, workerGroup)
+ .channel(NioServerSocketChannel.class)
+ .handler(new LoggingHandler(LogLevel.DEBUG))
+ .option(ChannelOption.SO_BACKLOG, 128)
+ .option(ChannelOption.SO_REUSEADDR, true)
+ .childOption(ChannelOption.SO_KEEPALIVE, true)
+ .childOption(ChannelOption.SO_REUSEADDR, true)
+ .childHandler(nettyServerChannelInitializer)
+ .localAddress(new InetSocketAddress(host, port));
+
+ ChannelFuture future = bootstrap.bind(port).sync();
+ if (future.isSuccess()) {
+ log.info("ElectricBikeNettyServer启动成功, 开始监听端口:{}", port);
+ } else {
+ log.error("ElectricBikeNettyServer启动失败", future.cause());
+ }
+
+ future.channel().closeFuture().sync();
+ } catch (Exception e) {
+ log.error("ElectricBikeNettyServer.start error", e);
+ bossGroup.shutdownGracefully();
+ workerGroup.shutdownGracefully();
+ }
+ }).start();
+ }
+}
diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java
index 09649c12d..c2970de0b 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/mqtt/MqttSever.java
@@ -20,7 +20,7 @@ import java.net.InetSocketAddress;
@Slf4j
@Component
-@Order(5)
+@Order(7)
public class MqttSever implements CommandLineRunner {
@Override
diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServer.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServer.java
index 4ff2a2e5e..d1eb8d88b 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServer.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServer.java
@@ -16,8 +16,9 @@ import javax.annotation.Resource;
import java.net.InetSocketAddress;
@Slf4j
-@Component
-@Order(2)
+@Deprecated
+// @Component
+// @Order(3)
public class NettyServer implements CommandLineRunner {
@Resource
private NettyServerChannelInitializer nettyServerChannelInitializer;
diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java
index 8551a6229..b343fde1b 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java
@@ -21,7 +21,7 @@ public class NettyServerChannelInitializer extends ChannelInitializer>>>>>>>>>>>>>>服务启动执行，执行加载数据等操作 InitializeAdapayConfig order 1 <<<<<<<<<<<<<");
/*
单商户
*/
@@ -47,6 +46,7 @@ public class InitializeAdapayConfig implements CommandLineRunner {
目前有jsowell和xixiao
*/
multiMerchant();
+ log.info(">>>>>>>>>>>>>>>服务启动执行，执行加载数据等操作 InitializeAdapayConfig order 2 <<<<<<<<<<<<<");
}
/**
diff --git a/jsowell-pile/src/main/java/com/jsowell/alipay/config/AliPayConfig.java b/jsowell-pile/src/main/java/com/jsowell/alipay/config/AliPayConfig.java
index 968c0a227..b9c1b22d2 100644
--- a/jsowell-pile/src/main/java/com/jsowell/alipay/config/AliPayConfig.java
+++ b/jsowell-pile/src/main/java/com/jsowell/alipay/config/AliPayConfig.java
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
@Slf4j
@Component
-@Order(2)
+@Order(4)
public class AliPayConfig implements CommandLineRunner {
@Value("${alipay.gatewayHost}")
private String gatewayHost;
@@ -33,7 +33,6 @@ public class AliPayConfig implements CommandLineRunner {
@Override
public void run(String... args) throws Exception {
- log.info(">>>>>>>>>>>>>>>服务启动执行，执行加载数据等操作 AliPayConfig order 2 <<<<<<<<<<<<<");
// 设置参数（全局只需设置一次）
Config config = new Config();
config.protocol = Constants.HTTPS;
@@ -57,5 +56,6 @@ public class AliPayConfig implements CommandLineRunner {
// 可设置AES密钥，调用AES加解密相关接口时需要（可选）
config.encryptKey = encryptKey;
Factory.setOptions(config);
+ log.info(">>>>>>>>>>>>>>>服务启动执行，执行加载数据等操作 AliPayConfig order 4 <<<<<<<<<<<<<");
}
}
\ No newline at end of file
diff --git a/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java b/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java
index 797075a5b..dd0d2391f 100644
--- a/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java
+++ b/jsowell-pile/src/main/java/com/jsowell/wxpay/config/WechatPayConfig.java
@@ -3,13 +3,15 @@ package com.jsowell.wxpay.config;
import com.jsowell.wxpay.common.WeChatPayParameter;
import com.jsowell.wxpay.utils.WechatPayUtils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
-@Order(3)
+@Slf4j
@Component
+@Order(5)
public class WechatPayConfig implements CommandLineRunner {
/**
* 公众号appid
@@ -78,7 +80,6 @@ public class WechatPayConfig implements CommandLineRunner {
@Override
public void run(String... args) throws Exception {
- System.out.println(">>>>>>>>>>>>>>>服务启动执行，执行加载数据等操作 WechatPayConfig order 3 <<<<<<<<<<<<<");
//微信支付
WeChatPayParameter.mchId = wechatMchId;
WeChatPayParameter.appId = wechatAppId;
@@ -94,5 +95,6 @@ public class WechatPayConfig implements CommandLineRunner {
WeChatPayParameter.mchSerialNo = mchSerialNo;
//获取平台证书
WeChatPayParameter.certificateMap = WechatPayUtils.refreshCertificate();
+ log.info(">>>>>>>>>>>>>>>服务启动执行，执行加载数据等操作 WechatPayConfig order 5 <<<<<<<<<<<<<");
}
}