open-soure / cim · 提交

转到一个项目

作者 crossoverJie
提交 528076a385ae15b6179885f324ff5e5f8a036040 1 个父辈 b9dbd076

:recycle: Refactoring code.

内嵌 并排对比
正在显示 64 个修改的文件 包含 150 行增加 和 155 行删除
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 <modelVersion>4.0.0</modelVersion> 5 <modelVersion>4.0.0</modelVersion>
6 <parent> 6 <parent>
7 <groupId>com.crossoverjie.netty</groupId> 7 <groupId>com.crossoverjie.netty</groupId>
8 - <artifactId>netty-action</artifactId> 8 + <artifactId>cim</artifactId>
9 <version>1.0.0-SNAPSHOT</version> 9 <version>1.0.0-SNAPSHOT</version>
10 </parent> 10 </parent>
11 - <artifactId>netty-action-heartbeat-client</artifactId> 11 + <artifactId>cim-client</artifactId>
12 <packaging>jar</packaging> 12 <packaging>jar</packaging>
13 13
14 <properties> 14 <properties>
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 30
31 <dependency> 31 <dependency>
32 <groupId>com.crossoverjie.netty</groupId> 32 <groupId>com.crossoverjie.netty</groupId>
33 - <artifactId>netty-action-common</artifactId> 33 + <artifactId>cim-common</artifactId>
34 </dependency> 34 </dependency>
35 35
36 36
1 -package com.crossoverjie.netty.action.client; 1 +package com.crossoverjie.cim.client;
2 2
3 -import com.crossoverjie.netty.action.client.scanner.Scan; 3 +import com.crossoverjie.cim.client.scanner.Scan;
4 import org.slf4j.Logger; 4 import org.slf4j.Logger;
5 import org.slf4j.LoggerFactory; 5 import org.slf4j.LoggerFactory;
6 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,16 +12,16 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,16 +12,16 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
12 * @author crossoverJie 12 * @author crossoverJie
13 */ 13 */
14 @SpringBootApplication 14 @SpringBootApplication
15 -public class HeartbeatClientApplication implements CommandLineRunner{ 15 +public class CIMClientApplication implements CommandLineRunner{
16 16
17 - private final static Logger LOGGER = LoggerFactory.getLogger(HeartbeatClientApplication.class); 17 + private final static Logger LOGGER = LoggerFactory.getLogger(CIMClientApplication.class);
18 18
19 @Autowired 19 @Autowired
20 private HeartbeatClient heartbeatClient ; 20 private HeartbeatClient heartbeatClient ;
21 21
22 22
23 public static void main(String[] args) { 23 public static void main(String[] args) {
24 - SpringApplication.run(HeartbeatClientApplication.class, args); 24 + SpringApplication.run(CIMClientApplication.class, args);
25 LOGGER.info("启动 Client 成功"); 25 LOGGER.info("启动 Client 成功");
26 } 26 }
27 27
1 -package com.crossoverjie.netty.action.client; 1 +package com.crossoverjie.cim.client;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 -import com.crossoverjie.netty.action.client.init.CustomerHandleInitializer;  
5 -import com.crossoverjie.netty.action.client.vo.req.GoogleProtocolVO;  
6 -import com.crossoverjie.netty.action.common.pojo.CustomProtocol;  
7 -import com.crossoverjie.netty.action.common.protocol.BaseRequestProto; 4 +import com.crossoverjie.cim.client.init.CustomerHandleInitializer;
  5 +import com.crossoverjie.cim.client.vo.req.GoogleProtocolVO;
  6 +import com.crossoverjie.cim.common.protocol.BaseRequestProto;
  7 +import com.crossoverjie.cim.common.pojo.CustomProtocol;
8 import io.netty.bootstrap.Bootstrap; 8 import io.netty.bootstrap.Bootstrap;
9 import io.netty.buffer.ByteBuf; 9 import io.netty.buffer.ByteBuf;
10 import io.netty.buffer.Unpooled; 10 import io.netty.buffer.Unpooled;
1 -package com.crossoverjie.netty.action.client.config; 1 +package com.crossoverjie.cim.client.config;
2 2
3 -import com.crossoverjie.netty.action.common.protocol.BaseRequestProto; 3 +import com.crossoverjie.cim.common.protocol.BaseRequestProto;
4 import okhttp3.OkHttpClient; 4 import okhttp3.OkHttpClient;
5 import org.springframework.beans.factory.annotation.Value; 5 import org.springframework.beans.factory.annotation.Value;
6 import org.springframework.context.annotation.Bean; 6 import org.springframework.context.annotation.Bean;
1 -package com.crossoverjie.netty.action.client.config; 1 +package com.crossoverjie.cim.client.config;
2 2
3 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; 3 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
4 import org.springframework.context.annotation.Bean; 4 import org.springframework.context.annotation.Bean;
1 -package com.crossoverjie.netty.action.client.controller;  
2 -  
3 -import com.crossoverjie.netty.action.client.HeartbeatClient;  
4 -import com.crossoverjie.netty.action.client.service.RouteRequest;  
5 -import com.crossoverjie.netty.action.client.vo.req.GoogleProtocolVO;  
6 -import com.crossoverjie.netty.action.client.vo.req.SendMsgReqVO;  
7 -import com.crossoverjie.netty.action.client.vo.req.StringReqVO;  
8 -import com.crossoverjie.netty.action.client.vo.res.SendMsgResVO;  
9 -import com.crossoverjie.netty.action.common.constant.Constants;  
10 -import com.crossoverjie.netty.action.common.enums.StatusEnum;  
11 -import com.crossoverjie.netty.action.common.pojo.CustomProtocol;  
12 -import com.crossoverjie.netty.action.common.res.BaseResponse;  
13 -import com.crossoverjie.netty.action.common.res.NULLBody; 1 +package com.crossoverjie.cim.client.controller;
  2 +
  3 +import com.crossoverjie.cim.client.HeartbeatClient;
  4 +import com.crossoverjie.cim.client.vo.req.SendMsgReqVO;
  5 +import com.crossoverjie.cim.client.vo.res.SendMsgResVO;
  6 +import com.crossoverjie.cim.client.vo.req.GoogleProtocolVO;
  7 +import com.crossoverjie.cim.client.vo.req.StringReqVO;
  8 +import com.crossoverjie.cim.common.enums.StatusEnum;
  9 +import com.crossoverjie.cim.common.res.BaseResponse;
  10 +import com.crossoverjie.cim.client.service.RouteRequest;
  11 +import com.crossoverjie.cim.common.constant.Constants;
  12 +import com.crossoverjie.cim.common.pojo.CustomProtocol;
  13 +import com.crossoverjie.cim.common.res.NULLBody;
14 import io.swagger.annotations.ApiOperation; 14 import io.swagger.annotations.ApiOperation;
15 import org.springframework.beans.factory.annotation.Autowired; 15 import org.springframework.beans.factory.annotation.Autowired;
16 import org.springframework.boot.actuate.metrics.CounterService; 16 import org.springframework.boot.actuate.metrics.CounterService;
1 -package com.crossoverjie.netty.action.client.encode; 1 +package com.crossoverjie.cim.client.encode;
2 2
3 -import com.crossoverjie.netty.action.common.pojo.CustomProtocol; 3 +import com.crossoverjie.cim.common.pojo.CustomProtocol;
4 import io.netty.buffer.ByteBuf; 4 import io.netty.buffer.ByteBuf;
5 import io.netty.channel.ChannelHandlerContext; 5 import io.netty.channel.ChannelHandlerContext;
6 import io.netty.handler.codec.MessageToByteEncoder; 6 import io.netty.handler.codec.MessageToByteEncoder;
1 -package com.crossoverjie.netty.action.client.handle; 1 +package com.crossoverjie.cim.client.handle;
2 2
3 -import com.crossoverjie.netty.action.client.util.SpringBeanFactory;  
4 -import com.crossoverjie.netty.action.common.pojo.CustomProtocol;  
5 -import com.crossoverjie.netty.action.common.protocol.BaseRequestProto;  
6 -import com.crossoverjie.netty.action.common.protocol.BaseResponseProto; 3 +import com.crossoverjie.cim.client.util.SpringBeanFactory;
  4 +import com.crossoverjie.cim.common.protocol.BaseRequestProto;
  5 +import com.crossoverjie.cim.common.protocol.BaseResponseProto;
7 import io.netty.channel.ChannelFutureListener; 6 import io.netty.channel.ChannelFutureListener;
8 import io.netty.channel.ChannelHandlerContext; 7 import io.netty.channel.ChannelHandlerContext;
9 import io.netty.channel.SimpleChannelInboundHandler; 8 import io.netty.channel.SimpleChannelInboundHandler;
1 -package com.crossoverjie.netty.action.client.init; 1 +package com.crossoverjie.cim.client.init;
2 2
3 -import com.crossoverjie.netty.action.client.handle.EchoClientHandle;  
4 -import com.crossoverjie.netty.action.common.protocol.BaseResponseProto; 3 +import com.crossoverjie.cim.client.handle.EchoClientHandle;
  4 +import com.crossoverjie.cim.common.protocol.BaseResponseProto;
5 import io.netty.channel.Channel; 5 import io.netty.channel.Channel;
6 import io.netty.channel.ChannelInitializer; 6 import io.netty.channel.ChannelInitializer;
7 import io.netty.handler.codec.protobuf.ProtobufDecoder; 7 import io.netty.handler.codec.protobuf.ProtobufDecoder;
1 -package com.crossoverjie.netty.action.client.scanner; 1 +package com.crossoverjie.cim.client.scanner;
2 2
3 -import com.crossoverjie.netty.action.client.HeartbeatClient;  
4 -import com.crossoverjie.netty.action.client.vo.req.GoogleProtocolVO; 3 +import com.crossoverjie.cim.client.HeartbeatClient;
  4 +import com.crossoverjie.cim.client.vo.req.GoogleProtocolVO;
5 import org.slf4j.Logger; 5 import org.slf4j.Logger;
6 import org.slf4j.LoggerFactory; 6 import org.slf4j.LoggerFactory;
7 7
1 -package com.crossoverjie.netty.action.client.service.impl; 1 +package com.crossoverjie.cim.client.service.impl;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 -import com.crossoverjie.netty.action.client.service.RouteRequest; 4 +import com.crossoverjie.cim.client.service.RouteRequest;
5 import okhttp3.*; 5 import okhttp3.*;
6 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
7 import org.springframework.beans.factory.annotation.Value; 7 import org.springframework.beans.factory.annotation.Value;
1 -package com.crossoverjie.netty.action.client.util; 1 +package com.crossoverjie.cim.client.util;
2 2
3 import org.springframework.beans.BeansException; 3 import org.springframework.beans.BeansException;
4 import org.springframework.context.ApplicationContext; 4 import org.springframework.context.ApplicationContext;
1 -package com.crossoverjie.netty.action.client.vo.req; 1 +package com.crossoverjie.cim.client.vo.req;
2 2
3 -import com.crossoverjie.netty.action.common.req.BaseRequest; 3 +import com.crossoverjie.cim.common.req.BaseRequest;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
5 5
6 import javax.validation.constraints.NotNull; 6 import javax.validation.constraints.NotNull;
1 -package com.crossoverjie.netty.action.client.vo.req; 1 +package com.crossoverjie.cim.client.vo.req;
2 2
3 -import com.crossoverjie.netty.action.common.req.BaseRequest; 3 +import com.crossoverjie.cim.common.req.BaseRequest;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
5 5
6 import javax.validation.constraints.NotNull; 6 import javax.validation.constraints.NotNull;
1 -package com.crossoverjie.netty.action.client.vo.req; 1 +package com.crossoverjie.cim.client.vo.req;
2 2
3 -import com.crossoverjie.netty.action.common.req.BaseRequest; 3 +import com.crossoverjie.cim.common.req.BaseRequest;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
5 5
6 import javax.validation.constraints.NotNull; 6 import javax.validation.constraints.NotNull;
@@ -3,13 +3,13 @@ @@ -3,13 +3,13 @@
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 <parent> 5 <parent>
6 - <artifactId>netty-action</artifactId> 6 + <artifactId>cim</artifactId>
7 <groupId>com.crossoverjie.netty</groupId> 7 <groupId>com.crossoverjie.netty</groupId>
8 <version>1.0.0-SNAPSHOT</version> 8 <version>1.0.0-SNAPSHOT</version>
9 </parent> 9 </parent>
10 <modelVersion>4.0.0</modelVersion> 10 <modelVersion>4.0.0</modelVersion>
11 11
12 - <artifactId>netty-action-common</artifactId> 12 + <artifactId>cim-common</artifactId>
13 13
14 14
15 <dependencies> 15 <dependencies>
1 -package com.crossoverjie.netty.action.common.constant; 1 +package com.crossoverjie.cim.common.constant;
2 2
3 /** 3 /**
4 * Function:常量 4 * Function:常量
1 -package com.crossoverjie.netty.action.common.enums; 1 +package com.crossoverjie.cim.common.enums;
2 2
3 import java.util.ArrayList; 3 import java.util.ArrayList;
4 import java.util.List; 4 import java.util.List;
1 -package com.crossoverjie.netty.action.common.pojo; 1 +package com.crossoverjie.cim.common.pojo;
2 2
3 import java.io.Serializable; 3 import java.io.Serializable;
4 4
1 // Generated by the protocol buffer compiler. DO NOT EDIT! 1 // Generated by the protocol buffer compiler. DO NOT EDIT!
2 // source: BaseProtoc.proto 2 // source: BaseProtoc.proto
3 3
4 -package com.crossoverjie.netty.action.common.protocol; 4 +package com.crossoverjie.cim.common.protocol;
5 5
6 public final class BaseProto { 6 public final class BaseProto {
7 private BaseProto() {} 7 private BaseProto() {}
1 // Generated by the protocol buffer compiler. DO NOT EDIT! 1 // Generated by the protocol buffer compiler. DO NOT EDIT!
2 // source: BaseRequestProto.proto 2 // source: BaseRequestProto.proto
3 3
4 -package com.crossoverjie.netty.action.common.protocol; 4 +package com.crossoverjie.cim.common.protocol;
5 5
6 public final class BaseRequestProto { 6 public final class BaseRequestProto {
7 private BaseRequestProto() {} 7 private BaseRequestProto() {}
1 // Generated by the protocol buffer compiler. DO NOT EDIT! 1 // Generated by the protocol buffer compiler. DO NOT EDIT!
2 // source: BaseResponseProto.proto 2 // source: BaseResponseProto.proto
3 3
4 -package com.crossoverjie.netty.action.common.protocol; 4 +package com.crossoverjie.cim.common.protocol;
5 5
6 public final class BaseResponseProto { 6 public final class BaseResponseProto {
7 private BaseResponseProto() {} 7 private BaseResponseProto() {}
1 -package com.crossoverjie.netty.action.common.protocol; 1 +package com.crossoverjie.cim.common.protocol;
2 2
3 import com.google.protobuf.InvalidProtocolBufferException; 3 import com.google.protobuf.InvalidProtocolBufferException;
4 4
1 -package com.crossoverjie.netty.action.common.req; 1 +package com.crossoverjie.cim.common.req;
2 2
3 import io.swagger.annotations.ApiModelProperty; 3 import io.swagger.annotations.ApiModelProperty;
4 4
1 -package com.crossoverjie.netty.action.common.res; 1 +package com.crossoverjie.cim.common.res;
2 2
3 3
4 4
5 -import com.crossoverjie.netty.action.common.util.StringUtil;  
6 -import com.crossoverjie.netty.action.common.enums.StatusEnum; 5 +import com.crossoverjie.cim.common.enums.StatusEnum;
  6 +import com.crossoverjie.cim.common.util.StringUtil;
7 7
8 import java.io.Serializable; 8 import java.io.Serializable;
9 9
1 -package com.crossoverjie.netty.action.common.res; 1 +package com.crossoverjie.cim.common.res;
2 2
3 /** 3 /**
4 * Function:空对象,用在泛型中,表示没有额外的请求参数或者返回参数 4 * Function:空对象,用在泛型中,表示没有额外的请求参数或者返回参数
1 -package com.crossoverjie.netty.action.common.util; 1 +package com.crossoverjie.cim.common.util;
2 2
3 import java.util.Random; 3 import java.util.Random;
4 import java.util.UUID; 4 import java.util.UUID;
1 -package com.crossoverjie.netty.action.common.util; 1 +package com.crossoverjie.cim.common.util;
2 2
3 /** 3 /**
4 * Function: 4 * Function:
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 <parent> 5 <parent>
6 - <artifactId>netty-action</artifactId> 6 + <artifactId>cim</artifactId>
7 <groupId>com.crossoverjie.netty</groupId> 7 <groupId>com.crossoverjie.netty</groupId>
8 <version>1.0.0-SNAPSHOT</version> 8 <version>1.0.0-SNAPSHOT</version>
9 </parent> 9 </parent>
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 26
27 <dependency> 27 <dependency>
28 <groupId>com.crossoverjie.netty</groupId> 28 <groupId>com.crossoverjie.netty</groupId>
29 - <artifactId>netty-action-common</artifactId> 29 + <artifactId>cim-common</artifactId>
30 </dependency> 30 </dependency>
31 31
32 32
@@ -2,8 +2,8 @@ package com.crossoverjie.cim.route.controller; @@ -2,8 +2,8 @@ package com.crossoverjie.cim.route.controller;
2 2
3 import com.crossoverjie.cim.route.vo.req.P2PRequest; 3 import com.crossoverjie.cim.route.vo.req.P2PRequest;
4 import com.crossoverjie.cim.route.vo.req.GroupRequest; 4 import com.crossoverjie.cim.route.vo.req.GroupRequest;
5 -import com.crossoverjie.netty.action.common.enums.StatusEnum;  
6 -import com.crossoverjie.netty.action.common.res.BaseResponse; 5 +import com.crossoverjie.cim.common.enums.StatusEnum;
  6 +import com.crossoverjie.cim.common.res.BaseResponse;
7 import io.swagger.annotations.ApiOperation; 7 import io.swagger.annotations.ApiOperation;
8 import org.slf4j.Logger; 8 import org.slf4j.Logger;
9 import org.slf4j.LoggerFactory; 9 import org.slf4j.LoggerFactory;
1 package com.crossoverjie.cim.route.vo.req; 1 package com.crossoverjie.cim.route.vo.req;
2 2
3 -import com.crossoverjie.netty.action.common.req.BaseRequest; 3 +import com.crossoverjie.cim.common.req.BaseRequest;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
5 5
6 import javax.validation.constraints.NotNull; 6 import javax.validation.constraints.NotNull;
1 package com.crossoverjie.cim.route.vo.req; 1 package com.crossoverjie.cim.route.vo.req;
2 2
3 -import com.crossoverjie.netty.action.common.req.BaseRequest; 3 +import com.crossoverjie.cim.common.req.BaseRequest;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
5 5
6 import javax.validation.constraints.NotNull; 6 import javax.validation.constraints.NotNull;
1 package com.crossoverjie.cim.route.vo.req; 1 package com.crossoverjie.cim.route.vo.req;
2 2
3 -import com.crossoverjie.netty.action.common.req.BaseRequest; 3 +import com.crossoverjie.cim.common.req.BaseRequest;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
5 5
6 import javax.validation.constraints.NotNull; 6 import javax.validation.constraints.NotNull;
@@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
5 <modelVersion>4.0.0</modelVersion> 5 <modelVersion>4.0.0</modelVersion>
6 <parent> 6 <parent>
7 <groupId>com.crossoverjie.netty</groupId> 7 <groupId>com.crossoverjie.netty</groupId>
8 - <artifactId>netty-action</artifactId> 8 + <artifactId>cim</artifactId>
9 <version>1.0.0-SNAPSHOT</version> 9 <version>1.0.0-SNAPSHOT</version>
10 </parent> 10 </parent>
11 - <artifactId>netty-action-hearbeat</artifactId> 11 + <artifactId>cim-server</artifactId>
12 <packaging>jar</packaging> 12 <packaging>jar</packaging>
13 13
14 <properties> 14 <properties>
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 28
29 <dependency> 29 <dependency>
30 <groupId>com.crossoverjie.netty</groupId> 30 <groupId>com.crossoverjie.netty</groupId>
31 - <artifactId>netty-action-common</artifactId> 31 + <artifactId>cim-common</artifactId>
32 </dependency> 32 </dependency>
33 33
34 <dependency> 34 <dependency>
1 -package com.crossoverjie.netty.action; 1 +package com.crossoverjie.cim.server;
2 2
3 import org.slf4j.Logger; 3 import org.slf4j.Logger;
4 import org.slf4j.LoggerFactory; 4 import org.slf4j.LoggerFactory;
@@ -9,12 +9,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -9,12 +9,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
9 * @author crossoverJie 9 * @author crossoverJie
10 */ 10 */
11 @SpringBootApplication 11 @SpringBootApplication
12 -public class HeartbeatServerApplication { 12 +public class CIMServerApplication {
13 13
14 - private final static Logger LOGGER = LoggerFactory.getLogger(HeartbeatServerApplication.class); 14 + private final static Logger LOGGER = LoggerFactory.getLogger(CIMServerApplication.class);
15 15
16 public static void main(String[] args) { 16 public static void main(String[] args) {
17 - SpringApplication.run(HeartbeatServerApplication.class, args); 17 + SpringApplication.run(CIMServerApplication.class, args);
18 LOGGER.info("启动 Server 成功"); 18 LOGGER.info("启动 Server 成功");
19 } 19 }
20 20
1 -package com.crossoverjie.netty.action.config; 1 +package com.crossoverjie.cim.server.config;
2 2
3 -import com.crossoverjie.netty.action.endpoint.CustomEndpoint; 3 +import com.crossoverjie.cim.server.endpoint.CustomEndpoint;
4 import org.springframework.beans.factory.annotation.Value; 4 import org.springframework.beans.factory.annotation.Value;
5 import org.springframework.context.annotation.Bean; 5 import org.springframework.context.annotation.Bean;
6 import org.springframework.context.annotation.Configuration; 6 import org.springframework.context.annotation.Configuration;
1 -package com.crossoverjie.netty.action.config; 1 +package com.crossoverjie.cim.server.config;
2 2
3 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; 3 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
4 import org.springframework.context.annotation.Bean; 4 import org.springframework.context.annotation.Bean;
1 -package com.crossoverjie.netty.action.controller;  
2 -  
3 -import com.crossoverjie.netty.action.common.constant.Constants;  
4 -import com.crossoverjie.netty.action.common.enums.StatusEnum;  
5 -import com.crossoverjie.netty.action.common.res.BaseResponse;  
6 -import com.crossoverjie.netty.action.server.HeartBeatServer;  
7 -import com.crossoverjie.netty.action.vo.req.SendMsgReqVO;  
8 -import com.crossoverjie.netty.action.vo.res.SendMsgResVO; 1 +package com.crossoverjie.cim.server.controller;
  2 +
  3 +import com.crossoverjie.cim.common.enums.StatusEnum;
  4 +import com.crossoverjie.cim.common.res.BaseResponse;
  5 +import com.crossoverjie.cim.server.vo.req.SendMsgReqVO;
  6 +import com.crossoverjie.cim.common.constant.Constants;
  7 +import com.crossoverjie.cim.server.server.HeartBeatServer;
  8 +import com.crossoverjie.cim.server.vo.res.SendMsgResVO;
9 import io.swagger.annotations.ApiOperation; 9 import io.swagger.annotations.ApiOperation;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.boot.actuate.metrics.CounterService; 11 import org.springframework.boot.actuate.metrics.CounterService;
1 -package com.crossoverjie.netty.action.decoder; 1 +package com.crossoverjie.cim.server.decoder;
2 2
3 -import com.crossoverjie.netty.action.common.pojo.CustomProtocol; 3 +import com.crossoverjie.cim.common.pojo.CustomProtocol;
4 import io.netty.buffer.ByteBuf; 4 import io.netty.buffer.ByteBuf;
5 import io.netty.channel.ChannelHandlerContext; 5 import io.netty.channel.ChannelHandlerContext;
6 import io.netty.handler.codec.ByteToMessageDecoder; 6 import io.netty.handler.codec.ByteToMessageDecoder;
1 -package com.crossoverjie.netty.action.endpoint; 1 +package com.crossoverjie.cim.server.endpoint;
2 2
3 -import com.crossoverjie.netty.action.util.NettySocketHolder; 3 +import com.crossoverjie.cim.server.util.NettySocketHolder;
4 import io.netty.channel.socket.nio.NioSocketChannel; 4 import io.netty.channel.socket.nio.NioSocketChannel;
5 -import org.springframework.beans.factory.annotation.Autowired;  
6 import org.springframework.boot.actuate.endpoint.AbstractEndpoint; 5 import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
7 6
8 -import java.util.HashMap;  
9 -import java.util.List;  
10 import java.util.Map; 7 import java.util.Map;
11 8
12 /** 9 /**
1 -package com.crossoverjie.netty.action.handle; 1 +package com.crossoverjie.cim.server.handle;
2 2
3 -import com.crossoverjie.netty.action.common.pojo.CustomProtocol;  
4 -import com.crossoverjie.netty.action.common.protocol.BaseRequestProto;  
5 -import com.crossoverjie.netty.action.common.protocol.BaseResponseProto;  
6 -import com.crossoverjie.netty.action.util.NettySocketHolder; 3 +import com.crossoverjie.cim.common.protocol.BaseRequestProto;
  4 +import com.crossoverjie.cim.common.protocol.BaseResponseProto;
  5 +import com.crossoverjie.cim.server.util.NettySocketHolder;
  6 +import com.crossoverjie.cim.common.pojo.CustomProtocol;
7 import io.netty.buffer.ByteBuf; 7 import io.netty.buffer.ByteBuf;
8 import io.netty.buffer.Unpooled; 8 import io.netty.buffer.Unpooled;
9 import io.netty.channel.ChannelHandlerContext; 9 import io.netty.channel.ChannelHandlerContext;
1 -package com.crossoverjie.netty.action.init; 1 +package com.crossoverjie.cim.server.init;
2 2
3 -import com.crossoverjie.netty.action.common.protocol.BaseRequestProto;  
4 -import com.crossoverjie.netty.action.handle.HeartBeatSimpleHandle; 3 +import com.crossoverjie.cim.common.protocol.BaseRequestProto;
  4 +import com.crossoverjie.cim.server.handle.HeartBeatSimpleHandle;
5 import io.netty.channel.Channel; 5 import io.netty.channel.Channel;
6 import io.netty.channel.ChannelInitializer; 6 import io.netty.channel.ChannelInitializer;
7 import io.netty.handler.codec.protobuf.ProtobufDecoder; 7 import io.netty.handler.codec.protobuf.ProtobufDecoder;
1 -package com.crossoverjie.netty.action.server; 1 +package com.crossoverjie.cim.server.server;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 -import com.crossoverjie.netty.action.common.pojo.CustomProtocol;  
5 -import com.crossoverjie.netty.action.common.protocol.BaseRequestProto;  
6 -import com.crossoverjie.netty.action.init.HeartbeatInitializer;  
7 -import com.crossoverjie.netty.action.util.NettySocketHolder;  
8 -import com.crossoverjie.netty.action.vo.req.SendMsgReqVO; 4 +import com.crossoverjie.cim.common.protocol.BaseRequestProto;
  5 +import com.crossoverjie.cim.server.util.NettySocketHolder;
  6 +import com.crossoverjie.cim.server.vo.req.SendMsgReqVO;
  7 +import com.crossoverjie.cim.common.pojo.CustomProtocol;
  8 +import com.crossoverjie.cim.server.init.HeartbeatInitializer;
9 import io.netty.bootstrap.ServerBootstrap; 9 import io.netty.bootstrap.ServerBootstrap;
10 import io.netty.buffer.Unpooled; 10 import io.netty.buffer.Unpooled;
11 import io.netty.channel.ChannelFuture; 11 import io.netty.channel.ChannelFuture;
@@ -46,7 +46,7 @@ public class HeartBeatServer { @@ -46,7 +46,7 @@ public class HeartBeatServer {
46 46
47 47
48 /** 48 /**
49 - * 启动 Netty 49 + * 启动 cim server
50 * 50 *
51 * @return 51 * @return
52 * @throws InterruptedException 52 * @throws InterruptedException
@@ -64,7 +64,7 @@ public class HeartBeatServer { @@ -64,7 +64,7 @@ public class HeartBeatServer {
64 64
65 ChannelFuture future = bootstrap.bind().sync(); 65 ChannelFuture future = bootstrap.bind().sync();
66 if (future.isSuccess()) { 66 if (future.isSuccess()) {
67 - LOGGER.info("启动 Netty 成功"); 67 + LOGGER.info("启动 cim server 成功");
68 } 68 }
69 } 69 }
70 70
@@ -76,7 +76,7 @@ public class HeartBeatServer { @@ -76,7 +76,7 @@ public class HeartBeatServer {
76 public void destroy() { 76 public void destroy() {
77 boss.shutdownGracefully().syncUninterruptibly(); 77 boss.shutdownGracefully().syncUninterruptibly();
78 work.shutdownGracefully().syncUninterruptibly(); 78 work.shutdownGracefully().syncUninterruptibly();
79 - LOGGER.info("关闭 Netty 成功"); 79 + LOGGER.info("关闭 cim server 成功");
80 } 80 }
81 81
82 82
1 -package com.crossoverjie.netty.action.util; 1 +package com.crossoverjie.cim.server.util;
2 2
3 import io.netty.channel.socket.SocketChannel; 3 import io.netty.channel.socket.SocketChannel;
4 import io.netty.channel.socket.nio.NioServerSocketChannel; 4 import io.netty.channel.socket.nio.NioServerSocketChannel;
1 -package com.crossoverjie.netty.action.util; 1 +package com.crossoverjie.cim.server.util;
2 2
3 import org.springframework.beans.BeansException; 3 import org.springframework.beans.BeansException;
4 import org.springframework.context.ApplicationContext; 4 import org.springframework.context.ApplicationContext;
1 -package com.crossoverjie.netty.action.vo.req; 1 +package com.crossoverjie.cim.server.vo.req;
2 2
3 -import com.crossoverjie.netty.action.common.req.BaseRequest; 3 +import com.crossoverjie.cim.common.req.BaseRequest;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
5 5
6 import javax.validation.constraints.NotNull; 6 import javax.validation.constraints.NotNull;
@@ -3,13 +3,13 @@ @@ -3,13 +3,13 @@
3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 3 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5 <parent> 5 <parent>
6 - <artifactId>netty-action</artifactId> 6 + <artifactId>cim</artifactId>
7 <groupId>com.crossoverjie.netty</groupId> 7 <groupId>com.crossoverjie.netty</groupId>
8 <version>1.0.0-SNAPSHOT</version> 8 <version>1.0.0-SNAPSHOT</version>
9 </parent> 9 </parent>
10 <modelVersion>4.0.0</modelVersion> 10 <modelVersion>4.0.0</modelVersion>
11 11
12 - <artifactId>netty-action-zk</artifactId> 12 + <artifactId>cim-zk</artifactId>
13 13
14 14
15 15
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <dependencies> 22 <dependencies>
23 <dependency> 23 <dependency>
24 <groupId>com.crossoverjie.netty</groupId> 24 <groupId>com.crossoverjie.netty</groupId>
25 - <artifactId>netty-action-common</artifactId> 25 + <artifactId>cim-common</artifactId>
26 <exclusions> 26 <exclusions>
27 <exclusion> 27 <exclusion>
28 <artifactId>log4j</artifactId> 28 <artifactId>log4j</artifactId>
1 -package com.crossoverjie.netty.action.zk; 1 +package com.crossoverjie.cim.server.zk;
2 2
3 -import com.crossoverjie.netty.action.zk.thread.RegistryZK;  
4 -import com.crossoverjie.netty.action.zk.util.AppConfiguration;  
5 -import com.crossoverjie.netty.action.zk.util.ZKUtil; 3 +import com.crossoverjie.cim.server.zk.util.AppConfiguration;
  4 +import com.crossoverjie.cim.server.zk.thread.RegistryZK;
  5 +import com.crossoverjie.cim.server.zk.util.ZKUtil;
6 import org.slf4j.Logger; 6 import org.slf4j.Logger;
7 import org.slf4j.LoggerFactory; 7 import org.slf4j.LoggerFactory;
8 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
1 -package com.crossoverjie.netty.action.zk.cache; 1 +package com.crossoverjie.cim.server.zk.cache;
2 2
3 -import com.crossoverjie.netty.action.zk.util.ZKUtil; 3 +import com.crossoverjie.cim.server.zk.util.ZKUtil;
4 import com.google.common.cache.LoadingCache; 4 import com.google.common.cache.LoadingCache;
5 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
6 import org.springframework.stereotype.Component; 6 import org.springframework.stereotype.Component;
1 -package com.crossoverjie.netty.action.zk.config; 1 +package com.crossoverjie.cim.server.zk.config;
2 2
3 -import com.crossoverjie.netty.action.zk.util.AppConfiguration; 3 +import com.crossoverjie.cim.server.zk.util.AppConfiguration;
4 import com.google.common.cache.CacheBuilder; 4 import com.google.common.cache.CacheBuilder;
5 import com.google.common.cache.CacheLoader; 5 import com.google.common.cache.CacheLoader;
6 import com.google.common.cache.LoadingCache; 6 import com.google.common.cache.LoadingCache;
7 import org.I0Itec.zkclient.ZkClient; 7 import org.I0Itec.zkclient.ZkClient;
8 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
9 -import org.springframework.beans.factory.annotation.Value;  
10 import org.springframework.context.annotation.Bean; 9 import org.springframework.context.annotation.Bean;
11 import org.springframework.context.annotation.Configuration; 10 import org.springframework.context.annotation.Configuration;
12 11
1 -package com.crossoverjie.netty.action.zk.config; 1 +package com.crossoverjie.cim.server.zk.config;
2 2
3 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; 3 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
4 import org.springframework.context.annotation.Bean; 4 import org.springframework.context.annotation.Bean;
1 -package com.crossoverjie.netty.action.zk.controller; 1 +package com.crossoverjie.cim.server.zk.controller;
2 2
3 -import com.crossoverjie.netty.action.common.enums.StatusEnum;  
4 -import com.crossoverjie.netty.action.common.res.BaseResponse;  
5 -import com.crossoverjie.netty.action.zk.cache.ServerCache; 3 +import com.crossoverjie.cim.common.enums.StatusEnum;
  4 +import com.crossoverjie.cim.common.res.BaseResponse;
  5 +import com.crossoverjie.cim.server.zk.cache.ServerCache;
6 import io.swagger.annotations.ApiOperation; 6 import io.swagger.annotations.ApiOperation;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Controller; 8 import org.springframework.stereotype.Controller;
1 -package com.crossoverjie.netty.action.zk.thread; 1 +package com.crossoverjie.cim.server.zk.thread;
2 2
3 -import com.crossoverjie.netty.action.zk.util.AppConfiguration;  
4 -import com.crossoverjie.netty.action.zk.util.SpringBeanFactory;  
5 -import com.crossoverjie.netty.action.zk.util.ZKUtil; 3 +import com.crossoverjie.cim.server.zk.util.AppConfiguration;
  4 +import com.crossoverjie.cim.server.zk.util.SpringBeanFactory;
  5 +import com.crossoverjie.cim.server.zk.util.ZKUtil;
6 import org.slf4j.Logger; 6 import org.slf4j.Logger;
7 import org.slf4j.LoggerFactory; 7 import org.slf4j.LoggerFactory;
8 8
1 -package com.crossoverjie.netty.action.zk.util; 1 +package com.crossoverjie.cim.server.zk.util;
2 2
3 import org.springframework.beans.factory.annotation.Value; 3 import org.springframework.beans.factory.annotation.Value;
4 import org.springframework.stereotype.Component; 4 import org.springframework.stereotype.Component;
1 -package com.crossoverjie.netty.action.zk.util; 1 +package com.crossoverjie.cim.server.zk.util;
2 2
3 import org.springframework.beans.BeansException; 3 import org.springframework.beans.BeansException;
4 import org.springframework.context.ApplicationContext; 4 import org.springframework.context.ApplicationContext;
1 -package com.crossoverjie.netty.action.zk.util; 1 +package com.crossoverjie.cim.server.zk.util;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 -import com.crossoverjie.netty.action.zk.cache.ServerCache; 4 +import com.crossoverjie.cim.server.zk.cache.ServerCache;
5 import org.I0Itec.zkclient.IZkChildListener; 5 import org.I0Itec.zkclient.IZkChildListener;
6 import org.I0Itec.zkclient.ZkClient; 6 import org.I0Itec.zkclient.ZkClient;
7 import org.slf4j.Logger; 7 import org.slf4j.Logger;
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3 <modelVersion>4.0.0</modelVersion> 3 <modelVersion>4.0.0</modelVersion>
4 <groupId>com.crossoverjie.netty</groupId> 4 <groupId>com.crossoverjie.netty</groupId>
5 - <artifactId>netty-action</artifactId> 5 + <artifactId>cim</artifactId>
6 <version>1.0.0-SNAPSHOT</version> 6 <version>1.0.0-SNAPSHOT</version>
7 <packaging>pom</packaging> 7 <packaging>pom</packaging>
8 8
@@ -27,11 +27,11 @@ @@ -27,11 +27,11 @@
27 </parent> 27 </parent>
28 28
29 <modules> 29 <modules>
30 - <module>netty-action-heartbeat</module>  
31 - <module>netty-action-heartbeat-client</module>  
32 - <module>netty-action-common</module> 30 + <module>cim-server</module>
  31 + <module>cim-client</module>
  32 + <module>cim-common</module>
33 <module>springboot-admin</module> 33 <module>springboot-admin</module>
34 - <module>netty-action-zk</module> 34 + <module>cim-zk</module>
35 <module>cim-forward-route</module> 35 <module>cim-forward-route</module>
36 </modules> 36 </modules>
37 37
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 52
53 <dependency> 53 <dependency>
54 <groupId>com.crossoverjie.netty</groupId> 54 <groupId>com.crossoverjie.netty</groupId>
55 - <artifactId>netty-action-common</artifactId> 55 + <artifactId>cim-common</artifactId>
56 <version>1.0.0-SNAPSHOT</version> 56 <version>1.0.0-SNAPSHOT</version>
57 </dependency> 57 </dependency>
58 58
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 <parent> 6 <parent>
7 <groupId>com.crossoverjie.netty</groupId> 7 <groupId>com.crossoverjie.netty</groupId>
8 - <artifactId>netty-action</artifactId> 8 + <artifactId>cim</artifactId>
9 <version>1.0.0-SNAPSHOT</version> 9 <version>1.0.0-SNAPSHOT</version>
10 </parent> 10 </parent>
11 11