diff --git a/README.md b/README.md
index bec9215..e6f4afd 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,8 @@ cdp-common 公用
- cdp-common-core 基础模块用于公用类
- cdp-common-exception 公用异常
-- cdp-common-mybatist-plus mybatis-plus封装
+- cdp-common-mybatis-plus mybatis-plus封装
+- cdp-common-rocketmq rocketmq 封装
- cdp-common-security 鉴权服务
cdp-iaas 基础服务
- authorization-server 授权验证管理在线用户
diff --git a/cdp-manager/backstage-manger-server/backstage-manger-server-service/pom.xml b/cdp-manager/backstage-manger-server/backstage-manger-server-service/pom.xml
index bb2bd4a..5dcc766 100644
--- a/cdp-manager/backstage-manger-server/backstage-manger-server-service/pom.xml
+++ b/cdp-manager/backstage-manger-server/backstage-manger-server-service/pom.xml
@@ -57,7 +57,6 @@
-
com.alibaba
druid-spring-boot-starter
diff --git a/cdp-tools/dy-tool-livetelecast/.gitignore b/cdp-tools/cdp-tool-dy/dy-tool-livetelecast/.gitignore
similarity index 100%
rename from cdp-tools/dy-tool-livetelecast/.gitignore
rename to cdp-tools/cdp-tool-dy/dy-tool-livetelecast/.gitignore
diff --git a/cdp-tools/dy-tool-livetelecast/dy-tool-livetelecast-api/.gitignore b/cdp-tools/cdp-tool-dy/dy-tool-livetelecast/dy-tool-livetelecast-api/.gitignore
similarity index 100%
rename from cdp-tools/dy-tool-livetelecast/dy-tool-livetelecast-api/.gitignore
rename to cdp-tools/cdp-tool-dy/dy-tool-livetelecast/dy-tool-livetelecast-api/.gitignore
diff --git a/cdp-tools/dy-tool-livetelecast/dy-tool-livetelecast-api/pom.xml b/cdp-tools/cdp-tool-dy/dy-tool-livetelecast/dy-tool-livetelecast-api/pom.xml
similarity index 100%
rename from cdp-tools/dy-tool-livetelecast/dy-tool-livetelecast-api/pom.xml
rename to cdp-tools/cdp-tool-dy/dy-tool-livetelecast/dy-tool-livetelecast-api/pom.xml
diff --git a/cdp-tools/dy-tool-livetelecast/dy-tool-livetelecast-service/.gitignore b/cdp-tools/cdp-tool-dy/dy-tool-livetelecast/dy-tool-livetelecast-service/.gitignore
similarity index 100%
rename from cdp-tools/dy-tool-livetelecast/dy-tool-livetelecast-service/.gitignore
rename to cdp-tools/cdp-tool-dy/dy-tool-livetelecast/dy-tool-livetelecast-service/.gitignore
diff --git a/cdp-tools/dy-tool-livetelecast/dy-tool-livetelecast-service/pom.xml b/cdp-tools/cdp-tool-dy/dy-tool-livetelecast/dy-tool-livetelecast-service/pom.xml
similarity index 100%
rename from cdp-tools/dy-tool-livetelecast/dy-tool-livetelecast-service/pom.xml
rename to cdp-tools/cdp-tool-dy/dy-tool-livetelecast/dy-tool-livetelecast-service/pom.xml
diff --git a/cdp-tools/dy-tool-livetelecast/pom.xml b/cdp-tools/cdp-tool-dy/dy-tool-livetelecast/pom.xml
similarity index 100%
rename from cdp-tools/dy-tool-livetelecast/pom.xml
rename to cdp-tools/cdp-tool-dy/dy-tool-livetelecast/pom.xml
diff --git a/cdp-tools/dy-tool-member/.gitignore b/cdp-tools/cdp-tool-dy/dy-tool-member/.gitignore
similarity index 100%
rename from cdp-tools/dy-tool-member/.gitignore
rename to cdp-tools/cdp-tool-dy/dy-tool-member/.gitignore
diff --git a/cdp-tools/dy-tool-member/dy-tool-member-api/.gitignore b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/.gitignore
similarity index 100%
rename from cdp-tools/dy-tool-member/dy-tool-member-api/.gitignore
rename to cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/.gitignore
diff --git a/cdp-tools/dy-tool-member/dy-tool-member-api/pom.xml b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/pom.xml
similarity index 100%
rename from cdp-tools/dy-tool-member/dy-tool-member-api/pom.xml
rename to cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-api/pom.xml
diff --git a/cdp-tools/dy-tool-member/dy-tool-member-service/.gitignore b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/.gitignore
similarity index 100%
rename from cdp-tools/dy-tool-member/dy-tool-member-service/.gitignore
rename to cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/.gitignore
diff --git a/cdp-tools/dy-tool-member/dy-tool-member-service/pom.xml b/cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/pom.xml
similarity index 100%
rename from cdp-tools/dy-tool-member/dy-tool-member-service/pom.xml
rename to cdp-tools/cdp-tool-dy/dy-tool-member/dy-tool-member-service/pom.xml
diff --git a/cdp-tools/dy-tool-member/pom.xml b/cdp-tools/cdp-tool-dy/dy-tool-member/pom.xml
similarity index 100%
rename from cdp-tools/dy-tool-member/pom.xml
rename to cdp-tools/cdp-tool-dy/dy-tool-member/pom.xml
diff --git a/cdp-tools/dy-tool-video/.gitignore b/cdp-tools/cdp-tool-dy/dy-tool-video/.gitignore
similarity index 100%
rename from cdp-tools/dy-tool-video/.gitignore
rename to cdp-tools/cdp-tool-dy/dy-tool-video/.gitignore
diff --git a/cdp-tools/dy-tool-video/dy-tool-video-api/.gitignore b/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-api/.gitignore
similarity index 100%
rename from cdp-tools/dy-tool-video/dy-tool-video-api/.gitignore
rename to cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-api/.gitignore
diff --git a/cdp-tools/dy-tool-video/dy-tool-video-api/pom.xml b/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-api/pom.xml
similarity index 100%
rename from cdp-tools/dy-tool-video/dy-tool-video-api/pom.xml
rename to cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-api/pom.xml
diff --git a/cdp-tools/dy-tool-video/dy-tool-video-service/.gitignore b/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-service/.gitignore
similarity index 100%
rename from cdp-tools/dy-tool-video/dy-tool-video-service/.gitignore
rename to cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-service/.gitignore
diff --git a/cdp-tools/dy-tool-video/dy-tool-video-service/pom.xml b/cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-service/pom.xml
similarity index 100%
rename from cdp-tools/dy-tool-video/dy-tool-video-service/pom.xml
rename to cdp-tools/cdp-tool-dy/dy-tool-video/dy-tool-video-service/pom.xml
diff --git a/cdp-tools/dy-tool-video/pom.xml b/cdp-tools/cdp-tool-dy/dy-tool-video/pom.xml
similarity index 100%
rename from cdp-tools/dy-tool-video/pom.xml
rename to cdp-tools/cdp-tool-dy/dy-tool-video/pom.xml
diff --git a/cdp-tools/cdp-tool-dy/pom.xml b/cdp-tools/cdp-tool-dy/pom.xml
new file mode 100644
index 0000000..ccb3457
--- /dev/null
+++ b/cdp-tools/cdp-tool-dy/pom.xml
@@ -0,0 +1,28 @@
+
+
+ 4.0.0
+
+ cdp-tools
+ com.baiye
+ 1.0-SNAPSHOT
+
+ com.example
+ cdp-tool-dy
+ 1.0-SNAPSHOT
+ cdp-tool-dy
+ cdp-tool-dy
+
+ 8
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git a/cdp-tools/cdp-tool-mq/.gitignore b/cdp-tools/cdp-tool-mq/.gitignore
deleted file mode 100644
index c84de1f..0000000
--- a/cdp-tools/cdp-tool-mq/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-.mvn
diff --git a/cdp-tools/cdp-tool-netty-disruptor/pom.xml b/cdp-tools/cdp-tool-netty-disruptor/pom.xml
new file mode 100644
index 0000000..144065f
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/pom.xml
@@ -0,0 +1,58 @@
+
+
+ 4.0.0
+
+ cdp-tools
+ com.baiye
+ 1.0-SNAPSHOT
+
+ cdp-tool-netty-disruptor
+ 1.0.0-SNAPSHOT
+ cdp-tool-netty-disruptor
+ cdp-tool-netty-disruptor
+
+ 1.8
+
+
+
+
+ io.netty
+ netty-all
+
+
+
+
+ com.lmax
+ disruptor
+
+
+
+ com.baiye
+ cdp-common-core
+ 1.0-SNAPSHOT
+
+
+
+
+ org.jboss.marshalling
+ jboss-marshalling
+ 1.3.0.CR9
+
+
+ org.jboss.marshalling
+ jboss-marshalling-serial
+ 1.3.0.CR9
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/CdpToolNettyDisruptorApplication.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/CdpToolNettyDisruptorApplication.java
new file mode 100644
index 0000000..eb1717c
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/CdpToolNettyDisruptorApplication.java
@@ -0,0 +1,36 @@
+package com.baiye;
+
+import com.baiye.common.MessageConsumer;
+import com.baiye.common.RingBufferWorkerPoolFactory;
+import com.baiye.server.MessageConsumerImpl;
+import com.baiye.server.SocketServer;
+import com.lmax.disruptor.YieldingWaitStrategy;
+import com.lmax.disruptor.dsl.ProducerType;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+/**
+ * @author Enzo
+ * @date 2022-7-20
+ */
+@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
+public class CdpToolNettyDisruptorApplication {
+
+ public static void main(String[] args) throws InterruptedException {
+ int consumerCount = 10;
+ MessageConsumer[] consumers = new MessageConsumer[consumerCount];
+
+ for (int i = 0; i < consumerCount; i++){
+ MessageConsumer consumer =
+ new MessageConsumerImpl("CODE" + i);
+ consumers[i] = consumer;
+ }
+ RingBufferWorkerPoolFactory.getInstance().initStart
+ (ProducerType.MULTI, 1024 * 1024, new YieldingWaitStrategy(), consumers);
+
+ SocketServer.getInstance().startServer();
+ SpringApplication.run(CdpToolNettyDisruptorApplication.class, args);
+ }
+
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/codec/MarshallingCodeCFactory.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/codec/MarshallingCodeCFactory.java
new file mode 100644
index 0000000..9373ae4
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/codec/MarshallingCodeCFactory.java
@@ -0,0 +1,45 @@
+package com.baiye.codec;
+
+import io.netty.handler.codec.marshalling.*;
+import org.jboss.marshalling.MarshallerFactory;
+import org.jboss.marshalling.Marshalling;
+import org.jboss.marshalling.MarshallingConfiguration;
+
+/**
+ * Marshalling工厂 - 进行自定义编码
+ *
+ * @author q
+ * @date 2022/07/11
+ */
+public final class MarshallingCodeCFactory {
+
+ /**
+ * 创建Jboss Marshalling解码器MarshallingDecoder
+ * @return MarshallingDecoder
+ */
+ public static MarshallingDecoder buildMarshallingDecoder() {
+ //首先通过Marshalling工具类的精通方法获取Marshalling实例对象 参数serial标识创建的是java序列化工厂对象。
+ final MarshallerFactory marshallerFactory = Marshalling.getProvidedMarshallerFactory("serial");
+ //创建了MarshallingConfiguration对象,配置了版本号为5
+ final MarshallingConfiguration configuration = new MarshallingConfiguration();
+ configuration.setVersion(5);
+ //根据marshallerFactory和configuration创建provider
+ UnmarshallerProvider provider = new DefaultUnmarshallerProvider(marshallerFactory, configuration);
+ //构建Netty的MarshallingDecoder对象,俩个参数分别为provider和单个消息序列化后的最大长度
+ return new MarshallingDecoder(provider, 1024 * 1024);
+ }
+
+ /**
+ * 创建Jboss Marshalling编码器MarshallingEncoder
+ * @return MarshallingEncoder
+ */
+ public static MarshallingEncoder buildMarshallingEncoder() {
+ final MarshallerFactory marshallerFactory = Marshalling.getProvidedMarshallerFactory("serial");
+ final MarshallingConfiguration configuration = new MarshallingConfiguration();
+ configuration.setVersion(5);
+ MarshallerProvider provider = new DefaultMarshallerProvider(marshallerFactory, configuration);
+ //构建Netty的MarshallingEncoder对象,MarshallingEncoder用于实现序列化接口的POJO对象序列化为二进制数组
+ MarshallingEncoder encoder = new MarshallingEncoder(provider);
+ return encoder;
+ }
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/MessageConsumer.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/MessageConsumer.java
new file mode 100644
index 0000000..fc60799
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/MessageConsumer.java
@@ -0,0 +1,19 @@
+package com.baiye.common;
+
+import com.lmax.disruptor.WorkHandler;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Enzo
+ * @date
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode
+public abstract class MessageConsumer implements WorkHandler {
+ protected String consumerId;
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/MessageProducer.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/MessageProducer.java
new file mode 100644
index 0000000..16064cd
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/MessageProducer.java
@@ -0,0 +1,30 @@
+package com.baiye.common;
+
+import com.lmax.disruptor.RingBuffer;
+import io.netty.channel.ChannelHandlerContext;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Enzo
+ */
+@Data
+@EqualsAndHashCode
+@AllArgsConstructor
+@NoArgsConstructor
+public class MessageProducer {
+
+
+ private RingBuffer ringBuffer;
+
+
+ public void sendData(ChannelHandlerContext context, String msg){
+ long seq = ringBuffer.next();
+ TranslatorDataWraper translatorDataWraper = ringBuffer.get(seq);
+ translatorDataWraper.setContext(context);
+ translatorDataWraper.setMsg(msg);
+ ringBuffer.publish(seq);
+ }
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/RingBufferWorkerPoolFactory.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/RingBufferWorkerPoolFactory.java
new file mode 100644
index 0000000..231a49e
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/RingBufferWorkerPoolFactory.java
@@ -0,0 +1,83 @@
+package com.baiye.common;
+
+import com.lmax.disruptor.*;
+import com.lmax.disruptor.dsl.ProducerType;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+
+@Slf4j
+public class RingBufferWorkerPoolFactory {
+ private static class SingletonHolder{
+ static final RingBufferWorkerPoolFactory factory = new RingBufferWorkerPoolFactory();
+ }
+ public RingBufferWorkerPoolFactory() {
+ }
+
+ public static RingBufferWorkerPoolFactory getInstance(){
+ return SingletonHolder.factory;
+ }
+
+ private static Map producers = new ConcurrentHashMap<>();
+ private static Map consumers = new ConcurrentHashMap<>();
+
+ private RingBuffer ringBuffer;
+
+ private WorkerPool workerPool;
+ private SequenceBarrier sequenceBarrier;
+
+ public void initStart(ProducerType type, int bufferSize, WaitStrategy waitStrategy, MessageConsumer[] consumersList){
+ //构造 ringbuffer
+ this.ringBuffer = RingBuffer.create(type, TranslatorDataWraper::new, bufferSize, waitStrategy);
+
+ //设置栅栏
+ this.sequenceBarrier = this.ringBuffer.newBarrier();
+ //设置workpool
+ this.workerPool = new WorkerPool<>(this.ringBuffer, this.sequenceBarrier, null, consumersList);
+ //把所构建的消费者放入池中
+ Arrays.asList(consumersList).forEach(messageConsumer -> consumers.put(messageConsumer.getConsumerId(), messageConsumer));
+
+ //添加sequence
+ this.ringBuffer.addGatingSequences(this.workerPool.getWorkerSequences());
+ //启动workpool
+ this.workerPool.start(Executors.newFixedThreadPool(10));
+ }
+
+ public MessageProducer getMessageProducer(String produceId){
+ MessageProducer producer = producers.get(produceId);
+ if (null == producer){
+ producer = new MessageProducer(this.ringBuffer);
+ producers.put(produceId, producer);
+ }
+ return producer;
+ }
+ /**
+ * 事件异常处理程序
+ *
+ *
+ *
+ * @author q
+ * @date 2022/07/13
+ */
+ static class EventExceptionHandler implements ExceptionHandler {
+
+ @Override
+ public void handleEventException(Throwable throwable, long l, TranslatorDataWapper translatorDataWapper) {
+ // TODO: 2022/7/13 0013 todo...
+ }
+
+ @Override
+ public void handleOnStartException(Throwable throwable) {
+ // TODO: 2022/7/13 0013 todo...
+ }
+
+ @Override
+ public void handleOnShutdownException(Throwable throwable) {
+ // TODO: 2022/7/13 0013 todo...
+ }
+ }
+}
+
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/TranslatorDataWapper.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/TranslatorDataWapper.java
new file mode 100644
index 0000000..4239f12
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/TranslatorDataWapper.java
@@ -0,0 +1,23 @@
+package com.baiye.common;
+
+import com.baiye.dto.TranslatorData;
+import io.netty.channel.ChannelHandlerContext;
+import lombok.Data;
+
+/**
+ * 包装 Netty 使用的数据类型给 Disruptor 进行使用
+ *
+ * @author q
+ * @date 2022/07/13
+ */
+@Data
+public class TranslatorDataWapper {
+
+ private TranslatorData translatorData;
+
+ private ChannelHandlerContext ctx;
+
+
+
+
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/TranslatorDataWraper.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/TranslatorDataWraper.java
new file mode 100644
index 0000000..9c23ee6
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/common/TranslatorDataWraper.java
@@ -0,0 +1,10 @@
+package com.baiye.common;
+
+import io.netty.channel.ChannelHandlerContext;
+import lombok.Data;
+
+@Data
+public class TranslatorDataWraper {
+ private String msg;
+ private ChannelHandlerContext context;
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/dto/TranslatorData.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/dto/TranslatorData.java
new file mode 100644
index 0000000..6e2944b
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/dto/TranslatorData.java
@@ -0,0 +1,37 @@
+package com.baiye.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * 传输数据对象
+ *
+ * @author q
+ * @date 2022/07/11
+ */
+@Getter
+@Setter
+@ToString
+public class TranslatorData implements Serializable {
+
+
+ /**
+ * id
+ */
+ private String id;
+
+ /**
+ * 消息的名字
+ */
+ private String name;
+
+ /**
+ * 消息内容
+ */
+ private String message;
+
+
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/dto/TranslatorDataWapper.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/dto/TranslatorDataWapper.java
new file mode 100644
index 0000000..41d28e9
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/dto/TranslatorDataWapper.java
@@ -0,0 +1,22 @@
+package com.baiye.dto;
+
+import io.netty.channel.ChannelHandlerContext;
+import lombok.Data;
+
+/**
+ * 包装 Netty 使用的数据类型给 Disruptor 进行使用
+ *
+ * @author q
+ * @date 2022/07/13
+ */
+@Data
+public class TranslatorDataWapper {
+
+ private TranslatorData translatorData;
+
+ private ChannelHandlerContext ctx;
+
+
+
+
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/MessageConsumerImpl.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/MessageConsumerImpl.java
new file mode 100644
index 0000000..d5e123e
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/MessageConsumerImpl.java
@@ -0,0 +1,21 @@
+package com.baiye.server;
+
+import com.baiye.common.MessageConsumer;
+import com.baiye.common.TranslatorDataWraper;
+import io.netty.channel.ChannelHandlerContext;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class MessageConsumerImpl extends MessageConsumer {
+ public MessageConsumerImpl(String consumerId) {
+ super(consumerId);
+ }
+
+ @Override
+ public void onEvent(TranslatorDataWraper translatorDataWraper) throws Exception {
+ log.info("收到客户端消息----------{}", translatorDataWraper.getMsg());
+
+ ChannelHandlerContext ctx = translatorDataWraper.getContext();
+ ctx.channel().writeAndFlush("返回给客户端消息");
+ }
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/SocketServer.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/SocketServer.java
new file mode 100644
index 0000000..1196d40
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/SocketServer.java
@@ -0,0 +1,85 @@
+package com.baiye.server;
+
+import com.baiye.codec.MarshallingCodeCFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.PooledByteBufAllocator;
+import io.netty.channel.*;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.logging.LogLevel;
+import io.netty.handler.logging.LoggingHandler;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class SocketServer {
+
+ //扩展 完善 池化: ConcurrentHashMap String, Value -> Channel>
+ private Channel channel;
+ private SocketServer() {
+
+ }
+
+ public static SocketServer getInstance() {
+ return Singleton.INSTANCE.getInstance();
+ }
+
+ private enum Singleton {
+ INSTANCE;
+
+ private SocketServer singleton;
+
+
+ //jvm保证只调用一次
+ Singleton() {
+ singleton = new SocketServer();
+ }
+
+ public SocketServer getInstance() {
+ return singleton;
+ }
+ }
+
+
+ public void startServer() throws InterruptedException {
+ log.info("---------启动socket服务---------");
+ EventLoopGroup bossGroup = new NioEventLoopGroup();
+ EventLoopGroup workerGroup = new NioEventLoopGroup();
+ ServerBootstrap serverBootstrap;
+ serverBootstrap = new ServerBootstrap()
+ .group(bossGroup, workerGroup)
+ .channel(NioServerSocketChannel.class)
+ // fixme 设置 backlog大小
+ .option(ChannelOption.SO_BACKLOG, 1024)
+ // fixme 表示缓存区动态调配(自适应) 数据包相差不大的时候比较合适
+ .option(ChannelOption.RCVBUF_ALLOCATOR, AdaptiveRecvByteBufAllocator.DEFAULT)
+ // 缓冲区 池化操作
+ .option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT)
+ // 记录日志
+ .handler(new LoggingHandler(LogLevel.INFO))
+ // 数据接收过来给哪个方法进行回调 -> 接收数据进行异步处理
+ .childHandler(new ChannelInitializer() {
+ @Override
+ protected void initChannel(SocketChannel socketChannel) throws Exception {
+ // fixme 在管道上加一些拦截器进行处理
+
+ // 进行设置编解码 -> 对Java对象转为的二进制数据进行编解码
+ socketChannel.pipeline().addLast(MarshallingCodeCFactory.buildMarshallingDecoder());
+ socketChannel.pipeline().addLast(MarshallingCodeCFactory.buildMarshallingEncoder());
+ // 信息处理
+ socketChannel.pipeline().addLast(new SocketServerHandler());
+ }
+ });
+ // 绑定端口, 同步请求链接
+ ChannelFuture cf = serverBootstrap.bind(8099).sync();
+ // 异步的进行关闭
+ //接下来就进行数据的发送, 但是首先我们要获取channel:
+ this.channel = cf.channel();
+ log.info("---------socket服务启动成功---------");
+ }
+
+
+ public static void main(String[] args) throws InterruptedException {
+ SocketServer.getInstance().startServer();
+ }
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/SocketServerHandler.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/SocketServerHandler.java
new file mode 100644
index 0000000..06c73e1
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/SocketServerHandler.java
@@ -0,0 +1,36 @@
+package com.baiye.server;
+
+import com.baiye.common.MessageProducer;
+import com.baiye.common.RingBufferWorkerPoolFactory;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author Enzo
+ * @date 2022-7-21
+ */
+@Slf4j
+public class SocketServerHandler extends SimpleChannelInboundHandler {
+ @Override
+ protected void channelRead0(ChannelHandlerContext channelHandlerContext, String msg) throws Exception {
+ MessageProducer messageProducer = RingBufferWorkerPoolFactory.getInstance().getMessageProducer("message001");
+ messageProducer.sendData(channelHandlerContext, msg);
+ log.info("消息-------- {}", msg);
+ }
+
+ @Override
+ public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+ log.info("server handler added----{}", ctx.channel().remoteAddress());
+ }
+
+ @Override
+ public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
+ log.info("server handler removed----{}", ctx.channel().remoteAddress());
+ }
+
+ @Override
+ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+ ctx.close();
+ }
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/SocketServerInitializer.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/SocketServerInitializer.java
new file mode 100644
index 0000000..da05bef
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/server/SocketServerInitializer.java
@@ -0,0 +1,22 @@
+package com.baiye.server;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
+
+public class SocketServerInitializer extends ChannelInitializer {
+ @Override
+ protected void initChannel(SocketChannel socketChannel) throws Exception {
+ ChannelPipeline pipeline = socketChannel.pipeline();
+ pipeline.addLast(new LengthFieldBasedFrameDecoder(Integer.MAX_VALUE, 0, 4, 0, 4));
+ pipeline.addLast( new LengthFieldPrepender(4));
+ pipeline.addLast(new StringDecoder(CharsetUtil.UTF_8));
+ pipeline.addLast(new StringEncoder(CharsetUtil.UTF_8));
+ pipeline.addLast(new SocketServerHandler());
+ }
+}
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/resources/application.yml b/cdp-tools/cdp-tool-netty-disruptor/src/main/resources/application.yml
new file mode 100644
index 0000000..92cb64f
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/resources/application.yml
@@ -0,0 +1,2 @@
+server:
+ port: 8092
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/test/java/com/baiye/CdpToolNettyDisruptorApplicationTests.java b/cdp-tools/cdp-tool-netty-disruptor/src/test/java/com/baiye/CdpToolNettyDisruptorApplicationTests.java
new file mode 100644
index 0000000..4390f5d
--- /dev/null
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/test/java/com/baiye/CdpToolNettyDisruptorApplicationTests.java
@@ -0,0 +1,13 @@
+package com.baiye;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class CdpToolNettyDisruptorApplicationTests {
+
+ @Test
+ void contextLoads() {
+ }
+
+}
diff --git a/cdp-wechat/cdp-wechat-api/pom.xml b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/pom.xml
similarity index 92%
rename from cdp-wechat/cdp-wechat-api/pom.xml
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/pom.xml
index 17ec712..528036c 100644
--- a/cdp-wechat/cdp-wechat-api/pom.xml
+++ b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- cdp-wechat
+ cdp-tool-wechat
com.baiye
1.0-SNAPSHOT
@@ -60,10 +60,7 @@
-
-
-
-
+
com.alibaba
@@ -96,4 +93,4 @@
5.4.5
-
\ No newline at end of file
+
diff --git a/cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/WechatApiApplication.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/WechatApiApplication.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/WechatApiApplication.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/WechatApiApplication.java
diff --git a/cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/aop/LogAdvice.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/aop/LogAdvice.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/aop/LogAdvice.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/aop/LogAdvice.java
diff --git a/cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/aop/LogAspect.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/aop/LogAspect.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/aop/LogAspect.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/aop/LogAspect.java
diff --git a/cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/SourceController.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/SourceController.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/SourceController.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/SourceController.java
diff --git a/cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/WeChatCallbackController.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/WeChatCallbackController.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/WeChatCallbackController.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/WeChatCallbackController.java
diff --git a/cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/WechatController.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/WechatController.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/WechatController.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/controller/WechatController.java
diff --git a/cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/event/LogEvent.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/event/LogEvent.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/event/LogEvent.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/event/LogEvent.java
diff --git a/cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/event/LogListener.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/event/LogListener.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/event/LogListener.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/event/LogListener.java
diff --git a/cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/job/AddFriendJob.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/job/AddFriendJob.java
similarity index 97%
rename from cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/job/AddFriendJob.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/job/AddFriendJob.java
index 351574d..f6d0a66 100644
--- a/cdp-wechat/cdp-wechat-api/src/main/java/com/baiye/job/AddFriendJob.java
+++ b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/java/com/baiye/job/AddFriendJob.java
@@ -2,7 +2,6 @@ package com.baiye.job;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpStatus;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
@@ -25,7 +24,6 @@ import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
/**
diff --git a/cdp-wechat/cdp-wechat-api/src/main/resources/config/application-dev.yml b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/resources/config/application-dev.yml
similarity index 100%
rename from cdp-wechat/cdp-wechat-api/src/main/resources/config/application-dev.yml
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/resources/config/application-dev.yml
diff --git a/cdp-wechat/cdp-wechat-api/src/main/resources/config/application-prod.yml b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/resources/config/application-prod.yml
similarity index 100%
rename from cdp-wechat/cdp-wechat-api/src/main/resources/config/application-prod.yml
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/resources/config/application-prod.yml
diff --git a/cdp-wechat/cdp-wechat-api/src/main/resources/config/application.yml b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/resources/config/application.yml
similarity index 100%
rename from cdp-wechat/cdp-wechat-api/src/main/resources/config/application.yml
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-api/src/main/resources/config/application.yml
diff --git a/cdp-wechat/cdp-wechat-server/pom.xml b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/pom.xml
similarity index 88%
rename from cdp-wechat/cdp-wechat-server/pom.xml
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/pom.xml
index 5e74b79..51012bd 100644
--- a/cdp-wechat/cdp-wechat-server/pom.xml
+++ b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- cdp-wechat
+ cdp-tool-wechat
com.baiye
1.0-SNAPSHOT
@@ -37,10 +37,6 @@
1.0-SNAPSHOT
-
-
-
-
com.alibaba
@@ -51,6 +47,7 @@
mysql
mysql-connector-java
+
com.github.ulisesbocchio
jasypt-spring-boot-starter
@@ -63,4 +60,4 @@
-
\ No newline at end of file
+
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/AppUserMapper.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/AppUserMapper.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/AppUserMapper.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/AppUserMapper.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/CommonLogMapper.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/CommonLogMapper.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/CommonLogMapper.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/CommonLogMapper.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/QrCodeRecordMapper.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/QrCodeRecordMapper.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/QrCodeRecordMapper.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/QrCodeRecordMapper.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/SourceMapper.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/SourceMapper.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/SourceMapper.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/SourceMapper.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/SourceUploadRecordMapper.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/SourceUploadRecordMapper.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/SourceUploadRecordMapper.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/SourceUploadRecordMapper.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WeChatCallbackLogMapper.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WeChatCallbackLogMapper.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WeChatCallbackLogMapper.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WeChatCallbackLogMapper.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WeChatUserMapper.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WeChatUserMapper.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WeChatUserMapper.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WeChatUserMapper.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WechatSourceMapper.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WechatSourceMapper.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WechatSourceMapper.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/dao/WechatSourceMapper.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/AppUser.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/AppUser.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/AppUser.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/AppUser.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/CommonLog.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/CommonLog.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/CommonLog.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/CommonLog.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/QrCodeRecord.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/QrCodeRecord.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/QrCodeRecord.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/QrCodeRecord.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/Source.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/Source.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/Source.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/Source.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/SourceUploadRecord.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/SourceUploadRecord.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/SourceUploadRecord.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/SourceUploadRecord.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatCallbackLog.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatCallbackLog.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatCallbackLog.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatCallbackLog.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatSource.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatSource.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatSource.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatSource.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatUser.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatUser.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatUser.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/WeChatUser.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/DistributeSourceDto.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/DistributeSourceDto.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/DistributeSourceDto.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/DistributeSourceDto.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatAddBulkFriendDTO.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatAddBulkFriendDTO.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatAddBulkFriendDTO.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatAddBulkFriendDTO.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatAddFriendDTO.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatAddFriendDTO.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatAddFriendDTO.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatAddFriendDTO.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatFriendInfoDTO.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatFriendInfoDTO.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatFriendInfoDTO.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatFriendInfoDTO.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatLogoutDTO.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatLogoutDTO.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatLogoutDTO.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatLogoutDTO.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendGifDTO.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendGifDTO.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendGifDTO.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendGifDTO.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendPicDTO.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendPicDTO.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendPicDTO.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendPicDTO.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendTextDTO.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendTextDTO.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendTextDTO.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatSendTextDTO.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginDTO.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginDTO.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginDTO.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginDTO.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginFailDTO.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginFailDTO.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginFailDTO.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginFailDTO.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginSuccessDTO.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginSuccessDTO.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginSuccessDTO.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/dto/WeChatUserLoginSuccessDTO.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/query/SourceRecordQuery.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/query/SourceRecordQuery.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/query/SourceRecordQuery.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/query/SourceRecordQuery.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/query/WeChatUserQuery.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/query/WeChatUserQuery.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/query/WeChatUserQuery.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/entity/query/WeChatUserQuery.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/properties/WeChatProperties.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/properties/WeChatProperties.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/properties/WeChatProperties.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/properties/WeChatProperties.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/service/SourceService.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/service/SourceService.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/service/SourceService.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/service/SourceService.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/service/WeChatUserService.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/service/WeChatUserService.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/service/WeChatUserService.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/service/WeChatUserService.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/service/impl/SourceServiceImpl.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/service/impl/SourceServiceImpl.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/service/impl/SourceServiceImpl.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/service/impl/SourceServiceImpl.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/service/impl/WeChatUserServiceImpl.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/service/impl/WeChatUserServiceImpl.java
similarity index 99%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/service/impl/WeChatUserServiceImpl.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/service/impl/WeChatUserServiceImpl.java
index a9fd8a4..ca1b95d 100644
--- a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/service/impl/WeChatUserServiceImpl.java
+++ b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/service/impl/WeChatUserServiceImpl.java
@@ -39,8 +39,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/utils/AverageDataUtil.java b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/utils/AverageDataUtil.java
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/java/com/baiye/utils/AverageDataUtil.java
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/java/com/baiye/utils/AverageDataUtil.java
diff --git a/cdp-wechat/cdp-wechat-server/src/main/resources/mapper/AppUserMapper.xml b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/AppUserMapper.xml
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/resources/mapper/AppUserMapper.xml
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/AppUserMapper.xml
diff --git a/cdp-wechat/cdp-wechat-server/src/main/resources/mapper/QrCodeRecordMapper.xml b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/QrCodeRecordMapper.xml
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/resources/mapper/QrCodeRecordMapper.xml
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/QrCodeRecordMapper.xml
diff --git a/cdp-wechat/cdp-wechat-server/src/main/resources/mapper/SourceMapper.xml b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/SourceMapper.xml
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/resources/mapper/SourceMapper.xml
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/SourceMapper.xml
diff --git a/cdp-wechat/cdp-wechat-server/src/main/resources/mapper/SourceUploadRecordMapper.xml b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/SourceUploadRecordMapper.xml
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/resources/mapper/SourceUploadRecordMapper.xml
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/SourceUploadRecordMapper.xml
diff --git a/cdp-wechat/cdp-wechat-server/src/main/resources/mapper/WeChatUserMapper.xml b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/WeChatUserMapper.xml
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/resources/mapper/WeChatUserMapper.xml
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/WeChatUserMapper.xml
diff --git a/cdp-wechat/cdp-wechat-server/src/main/resources/mapper/WechatSourceMapper.xml b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/WechatSourceMapper.xml
similarity index 100%
rename from cdp-wechat/cdp-wechat-server/src/main/resources/mapper/WechatSourceMapper.xml
rename to cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/mapper/WechatSourceMapper.xml
diff --git a/cdp-wechat/pom.xml b/cdp-tools/cdp-tool-wechat/pom.xml
similarity index 53%
rename from cdp-wechat/pom.xml
rename to cdp-tools/cdp-tool-wechat/pom.xml
index aece26a..50e8111 100644
--- a/cdp-wechat/pom.xml
+++ b/cdp-tools/cdp-tool-wechat/pom.xml
@@ -1,24 +1,27 @@
-
+
+ 4.0.0
+
- by-cdp
+ cdp-tools
com.baiye
1.0-SNAPSHOT
- 4.0.0
-
- cdp-wechat
pom
+ cdp-tool-wechat
+ cdp-tool-wechat
+ cdp-tool-wechat
cdp-wechat-server
cdp-wechat-api
- 8
- 8
+ 8
-
\ No newline at end of file
+
+
+
+
diff --git a/cdp-tools/pom.xml b/cdp-tools/pom.xml
index 865177a..19e8776 100644
--- a/cdp-tools/pom.xml
+++ b/cdp-tools/pom.xml
@@ -12,10 +12,10 @@
cdp-tools
pom
- dy-tool-livetelecast
- dy-tool-member
- dy-tool-video
+ cdp-tool-dy
cdp-tool-mq
+ cdp-tool-wechat
+ cdp-tool-netty-disruptor
diff --git a/pom.xml b/pom.xml
index b47d0ea..0bd608e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,6 @@
cdp-entrance
cdp-tag-center
cdp-customer
- cdp-wechat
@@ -59,7 +58,6 @@
5.1.47
1.3.1.Final
1.9.4
- 1.1.23
5.0.0-RC1
3.3.1
1.5.20
@@ -85,8 +83,6 @@
swagger-annotations
-
-
com.baomidou
@@ -150,6 +146,7 @@
mybatis-plus-annotation
${mybatis-plus-boot-stater.version}
+
commons-beanutils
commons-beanutils
@@ -163,11 +160,6 @@
${mybatis-plus-boot-stater.version}
-
- com.alibaba
- druid-spring-boot-starter
- ${druid-boot-stater.version}
-