Explorar o código

refactor:格式化代码

王智勇 %!s(int64=4) %!d(string=hai) anos
pai
achega
465beb1390
Modificáronse 20 ficheiros con 31 adicións e 8 borrados
  1. 8 1
      dim-client/src/main/java/com/dzdy/dim/NettyClient.java
  2. 1 0
      dim-client/src/main/java/com/dzdy/dim/handler/HeartBeatResponseHandler.java
  3. 1 0
      dim-client/src/main/java/com/dzdy/dim/handler/HeartBeatTimerHandler.java
  4. 1 0
      dim-client/src/main/java/com/dzdy/dim/handler/LoginResponseHandler.java
  5. 1 0
      dim-client/src/main/java/com/dzdy/dim/handler/LogoutResponseHandler.java
  6. 1 0
      dim-client/src/main/java/com/dzdy/dim/handler/SockDataRequestHandler.java
  7. 1 2
      dim-common/src/main/java/com/dzdy/dim/protocol/PacketCode.java
  8. 1 0
      dim-common/src/main/java/com/dzdy/dim/protocol/command/JWTUser.java
  9. 1 0
      dim-common/src/main/java/com/dzdy/dim/protocol/request/ConfirmRequestPacket.java
  10. 1 0
      dim-common/src/main/java/com/dzdy/dim/protocol/request/HeartBeatRequestPacket.java
  11. 1 0
      dim-common/src/main/java/com/dzdy/dim/protocol/request/LoginRequestPacket.java
  12. 1 0
      dim-common/src/main/java/com/dzdy/dim/protocol/request/LogoutRequestPacket.java
  13. 1 0
      dim-common/src/main/java/com/dzdy/dim/protocol/response/HeartBeatResponsePacket.java
  14. 1 0
      dim-common/src/main/java/com/dzdy/dim/protocol/response/LoginResponsePacket.java
  15. 1 0
      dim-common/src/main/java/com/dzdy/dim/protocol/response/LogoutResponsePacket.java
  16. 1 0
      dim-common/src/main/java/com/dzdy/dim/serialize/impl/JSONSerializer.java
  17. 1 0
      dim-service/src/main/java/com/dzdy/dim/handler/AuthHandler.java
  18. 1 0
      dim-service/src/main/java/com/dzdy/dim/handler/ConfirmRequestHandler.java
  19. 1 0
      dim-service/src/main/java/com/dzdy/dim/handler/LogoutRequestHandler.java
  20. 5 5
      dim-service/src/main/java/com/dzdy/dim/util/ApplicationContextUtils.java

+ 8 - 1
dim-client/src/main/java/com/dzdy/dim/NettyClient.java

@@ -68,6 +68,7 @@ public class NettyClient {
     /**
      * 登录
      * todo 登录放入token
+     *
      * @param channel
      */
     private static void login(Channel channel) {
@@ -76,7 +77,13 @@ public class NettyClient {
         loginRequestPacket.setToken("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjI1NTk1NDY5MDMsInVzZXJfbmFtZSI6ImpnemgwMSIsImF1dGhvcml0aWVzIjpbIlJPTEVfT1BFUkFUT1IiXSwianRpIjoiZjA2NmQxMGMtZWVmMy00Mzk4LTg0NjctOTNiNGYwNWRiMTEwIiwiY2xpZW50X2lkIjoiYW5waW4tb3BzLXBjIiwic2NvcGUiOlsic2VsZWN0Il19.yB-K7s25d9cVUCT4Ec4ag5T4uJSa0X2hWNM5UJdinLk");
         // jgzh2
 //        loginRequestPacket.setToken("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjI1NTk1NDY5MDMsInVzZXJfbmFtZSI6ImpnemgwMiIsImF1dGhvcml0aWVzIjpbIlJPTEVfT1BFUkFUT1IiXSwianRpIjoiZjA2NmQxMGMtZWVmMy00Mzk4LTg0NjctOTNiNGYwNWRiMTExIiwiY2xpZW50X2lkIjoiYW5waW4tb3BzLXBjIiwic2NvcGUiOlsic2VsZWN0Il19.y3Dp1WNkobhp-u_oK-19Y6OcXYkb4x_KC_G6cZ8ELxo");
-        channel.writeAndFlush(loginRequestPacket);
+        channel.writeAndFlush(loginRequestPacket).addListener(future -> {
+            if (future.isSuccess()) {
+                System.out.println("client login success.");
+            } else {
+                System.out.println("client login failure.");
+            }
+        });
     }
 
 

+ 1 - 0
dim-client/src/main/java/com/dzdy/dim/handler/HeartBeatResponseHandler.java

@@ -8,6 +8,7 @@ import java.util.Date;
 
 /**
  * 心跳返回处理器
+ *
  * @author : wangzhiyong
  * @date : 2019/6/4 15:03
  * description :

+ 1 - 0
dim-client/src/main/java/com/dzdy/dim/handler/HeartBeatTimerHandler.java

@@ -10,6 +10,7 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * 心跳请求定时器
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 10:54
  * description :

+ 1 - 0
dim-client/src/main/java/com/dzdy/dim/handler/LoginResponseHandler.java

@@ -11,6 +11,7 @@ import static com.dzdy.dim.NettyClient.MAX_RETRY;
 
 /**
  * 登录返回处理器
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 17:40
  * description :

+ 1 - 0
dim-client/src/main/java/com/dzdy/dim/handler/LogoutResponseHandler.java

@@ -7,6 +7,7 @@ import io.netty.channel.SimpleChannelInboundHandler;
 
 /**
  * 登出下线处理器
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 17:57
  * description :

+ 1 - 0
dim-client/src/main/java/com/dzdy/dim/handler/SockDataRequestHandler.java

@@ -8,6 +8,7 @@ import io.netty.channel.SimpleChannelInboundHandler;
 
 /**
  * 通用消息接收处理器
+ *
  * @author : wangzhiyong
  * @date : 2019/5/29 16:39
  * description :

+ 1 - 2
dim-common/src/main/java/com/dzdy/dim/protocol/PacketCode.java

@@ -6,7 +6,6 @@ import com.dzdy.dim.serialize.impl.JSONSerializer;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 
-import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -100,7 +99,7 @@ public class PacketCode {
             if (null != serializer && null != comm) {
                 Packet packet = serializer.deserialize(bytes, comm.getClazz());
                 if (packet instanceof SockData) {
-                    SockData sockData = (SockData)packet;
+                    SockData sockData = (SockData) packet;
                     sockData.setCommand(comm);
                     return sockData;
                 }

+ 1 - 0
dim-common/src/main/java/com/dzdy/dim/protocol/command/JWTUser.java

@@ -8,6 +8,7 @@ import java.util.Set;
 
 /**
  * jwt 用户类 outh2 定义
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 16:50
  * description :

+ 1 - 0
dim-common/src/main/java/com/dzdy/dim/protocol/request/ConfirmRequestPacket.java

@@ -8,6 +8,7 @@ import static com.dzdy.dim.protocol.command.Command.CONFIRM;
 
 /**
  * 消息确认包
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 10:48
  * description :

+ 1 - 0
dim-common/src/main/java/com/dzdy/dim/protocol/request/HeartBeatRequestPacket.java

@@ -6,6 +6,7 @@ import static com.dzdy.dim.protocol.command.Command.HEARTBEAT_REQUEST;
 
 /**
  * 心跳请求包
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 09:20
  * description :

+ 1 - 0
dim-common/src/main/java/com/dzdy/dim/protocol/request/LoginRequestPacket.java

@@ -8,6 +8,7 @@ import static com.dzdy.dim.protocol.command.Command.LOGIN_REQUEST;
 
 /**
  * 登录请求包
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 10:45
  * description :

+ 1 - 0
dim-common/src/main/java/com/dzdy/dim/protocol/request/LogoutRequestPacket.java

@@ -6,6 +6,7 @@ import static com.dzdy.dim.protocol.command.Command.LOGOUT_REQUEST;
 
 /**
  * 登出/下线 请求包
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 17:53
  * description :

+ 1 - 0
dim-common/src/main/java/com/dzdy/dim/protocol/response/HeartBeatResponsePacket.java

@@ -6,6 +6,7 @@ import static com.dzdy.dim.protocol.command.Command.HEARTBEAT_RESPONSE;
 
 /**
  * 心跳返回包
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 10:17
  * description :

+ 1 - 0
dim-common/src/main/java/com/dzdy/dim/protocol/response/LoginResponsePacket.java

@@ -9,6 +9,7 @@ import static com.dzdy.dim.protocol.command.Command.LOGIN_RESPONSE;
 
 /**
  * 登录返回包
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 10:49
  * description :

+ 1 - 0
dim-common/src/main/java/com/dzdy/dim/protocol/response/LogoutResponsePacket.java

@@ -8,6 +8,7 @@ import static com.dzdy.dim.protocol.command.Command.LOGOUT_RESPONSE;
 
 /**
  * 登出返回包
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 17:56
  * description :

+ 1 - 0
dim-common/src/main/java/com/dzdy/dim/serialize/impl/JSONSerializer.java

@@ -7,6 +7,7 @@ import com.dzdy.dim.serialize.SerializerAlgorithm;
 
 /**
  * json 序列化
+ *
  * @author : wangzhiyong
  * @date : 2019/5/25 15:30
  * description :

+ 1 - 0
dim-service/src/main/java/com/dzdy/dim/handler/AuthHandler.java

@@ -7,6 +7,7 @@ import io.netty.channel.ChannelInboundHandlerAdapter;
 
 /**
  * 授权检查处理器
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 14:33
  * description :

+ 1 - 0
dim-service/src/main/java/com/dzdy/dim/handler/ConfirmRequestHandler.java

@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 
 /**
  * 消息确认请求处理器
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 13:49
  * description :

+ 1 - 0
dim-service/src/main/java/com/dzdy/dim/handler/LogoutRequestHandler.java

@@ -9,6 +9,7 @@ import io.netty.channel.SimpleChannelInboundHandler;
 
 /**
  * 登出请求处理器
+ *
  * @author : wangzhiyong
  * @date : 2019/5/28 17:53
  * description :

+ 5 - 5
dim-service/src/main/java/com/dzdy/dim/util/ApplicationContextUtils.java

@@ -15,11 +15,6 @@ public class ApplicationContextUtils implements ApplicationContextAware {
 
     private static ApplicationContext applicationContext;
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        ApplicationContextUtils.applicationContext = applicationContext;
-    }
-
     /**
      * 获取applicationContext
      *
@@ -29,6 +24,11 @@ public class ApplicationContextUtils implements ApplicationContextAware {
         return applicationContext;
     }
 
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        ApplicationContextUtils.applicationContext = applicationContext;
+    }
+
     /**
      * 通过name获取 Bean.
      *