diff --git a/wkim/src/main/java/com/xinbida/wukongim/message/WKConnection.java b/wkim/src/main/java/com/xinbida/wukongim/message/WKConnection.java index 788a1c1..df7a6f0 100644 --- a/wkim/src/main/java/com/xinbida/wukongim/message/WKConnection.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/WKConnection.java @@ -91,7 +91,7 @@ public class WKConnection { private String lastRequestId; private int unReceivePongCount = 0; public volatile Handler reconnectionHandler = new Handler(Objects.requireNonNull(Looper.myLooper())); -// private final Handler mainHandler = new Handler(Looper.getMainLooper()); + // private final Handler mainHandler = new Handler(Looper.getMainLooper()); Runnable reconnectionRunnable = this::reconnection; private int connCount = 0; @@ -168,11 +168,13 @@ public class WKConnection { connectionClient = new ConnectionClient(iNonBlockingConnection -> { connCount = 0; if (iNonBlockingConnection == null || connection == null || !connection.getId().equals(iNonBlockingConnection.getId())) { + WKLoggerUtils.getInstance().e(TAG,"重复连接"); forcedReconnection(); return; } Object att = iNonBlockingConnection.getAttachment(); if (att == null || !att.equals(socketSingleID)) { + WKLoggerUtils.getInstance().e(TAG,"不属于当前连接"); forcedReconnection(); return; } diff --git a/wkim/src/main/java/com/xinbida/wukongim/message/WKProto.java b/wkim/src/main/java/com/xinbida/wukongim/message/WKProto.java index d068be6..a5ad059 100644 --- a/wkim/src/main/java/com/xinbida/wukongim/message/WKProto.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/WKProto.java @@ -220,6 +220,7 @@ class WKProto { receivedMsg.topicID = wkRead.readString(); } String content = wkRead.readPayload(); + WKLoggerUtils.getInstance().e(TAG, "消息payload:" + content); receivedMsg.payload = CryptoUtils.getInstance().aesDecrypt(CryptoUtils.getInstance().base64Decode(content)); String msgKey = receivedMsg.messageID + receivedMsg.messageSeq diff --git a/wkim/src/main/java/com/xinbida/wukongim/utils/CryptoUtils.java b/wkim/src/main/java/com/xinbida/wukongim/utils/CryptoUtils.java index 3a55872..eed255b 100644 --- a/wkim/src/main/java/com/xinbida/wukongim/utils/CryptoUtils.java +++ b/wkim/src/main/java/com/xinbida/wukongim/utils/CryptoUtils.java @@ -102,10 +102,10 @@ public class CryptoUtils { } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) { - WKLoggerUtils.getInstance().e(TAG,"aesEncrypt encrypt error"); + WKLoggerUtils.getInstance().e(TAG, "aesEncrypt encrypt error"); } if (encrypted == null) { - WKLoggerUtils.getInstance().e(TAG,"aesEncrypt The encrypted data is empty"); + WKLoggerUtils.getInstance().e(TAG, "aesEncrypt The encrypted data is empty"); encrypted = sSrc.getBytes(); } return encrypted; @@ -136,8 +136,9 @@ public class CryptoUtils { return content; } + public byte[] base64Decode(String data) { - return Base64.decode(data, Base64.NO_WRAP); + return Base64.decode(data, Base64.NO_WRAP); } /**