代码优化

mpusher · Mar 8, 2016 · 2458ea7 · 2458ea7
1 parent 39742bc
commit 2458ea7
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 46 deletions.
diff --git a/mpush-common/src/main/java/com/shinemo/mpush/common/message/BaseMessage.java b/mpush-common/src/main/java/com/shinemo/mpush/common/message/BaseMessage.java
@@ -21,41 +21,37 @@ public abstract class BaseMessage implements Message {
     protected final Connection connection;
 
     public BaseMessage(Packet packet, Connection connection) {
-    	Profiler.enter("start decode message");
+        this.packet = packet;
-    	try{
+        this.connection = connection;
-            this.packet = packet;
+        Profiler.enter("start decode message");
-            this.connection = connection;
+        try {
-            this.decodeBody();
+            decodeBody();
-    	}finally{
+        } finally {
-    		Profiler.release();
+            Profiler.release();
-    	}
+        }
     }
 
     protected void decodeBody() {
-
         if (packet.body != null && packet.body.length > 0) {
             //1.解密
             byte[] tmp = packet.body;
             if (packet.hasFlag(Packet.FLAG_CRYPTO)) {
-                SessionContext info = connection.getSessionContext();
+                if (connection.getSessionContext().cipher != null) {
-                if (info.cipher != null) {
+                    tmp = connection.getSessionContext().cipher.decrypt(tmp);
-                	tmp = info.cipher.decrypt(tmp);
                 }
             }
             //2.解压
             if (packet.hasFlag(Packet.FLAG_COMPRESS)) {
-                byte[] result = IOUtils.uncompress(tmp);
+                tmp = IOUtils.uncompress(tmp);
-                if (result.length > 0) {
-                    tmp = result;
-                }
             }
+
             if (tmp.length == 0) {
                 throw new RuntimeException("message decode ex");
             }
+
             packet.body = tmp;
             decode(packet.body);
         }
-
     }
 
     protected void encodeBody() {

diff --git a/mpush-tools/src/main/java/com/shinemo/mpush/tools/IOUtils.java b/mpush-tools/src/main/java/com/shinemo/mpush/tools/IOUtils.java
@@ -26,10 +26,9 @@ public static void close(Closeable closeable) {
         }
     }
 
-
     public static byte[] compress(byte[] data) {
-        ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+        ByteArrayOutputStream out = new ByteArrayOutputStream(data.length / 4);
-        DeflaterOutputStream zipOut = new DeflaterOutputStream(byteStream);
+        DeflaterOutputStream zipOut = new DeflaterOutputStream(out);
         try {
             zipOut.write(data);
             zipOut.finish();
@@ -40,23 +39,23 @@ public static byte[] compress(byte[] data) {
         } finally {
             close(zipOut);
         }
-        return byteStream.toByteArray();
+        return out.toByteArray();
     }
 
     public static byte[] uncompress(byte[] data) {
-        InflaterInputStream in = new InflaterInputStream(new ByteArrayInputStream(data));
+        InflaterInputStream zipIn = new InflaterInputStream(new ByteArrayInputStream(data));
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        ByteArrayOutputStream out = new ByteArrayOutputStream(data.length * 4);
-        byte[] buffer = new byte[data.length * 2];
+        byte[] buffer = new byte[1024];
         int length;
         try {
-            while ((length = in.read(buffer)) != -1) {
+            while ((length = zipIn.read(buffer)) != -1) {
                 out.write(buffer, 0, length);
             }
         } catch (IOException e) {
             LOGGER.error("uncompress ex", e);
             return Constants.EMPTY_BYTES;
         } finally {
-            close(in);
+            close(zipIn);
         }
         return out.toByteArray();
     }

diff --git a/mpush-tools/src/main/java/com/shinemo/mpush/tools/Strings.java b/mpush-tools/src/main/java/com/shinemo/mpush/tools/Strings.java
@@ -3,7 +3,7 @@
 /**
  * Created by ohun on 2015/12/23.
  */
-public class Strings {
+public final class Strings {
     public static final String EMPTY = "";
 
     public static boolean isBlank(CharSequence text) {

diff --git a/mpush-tools/src/main/java/com/shinemo/mpush/tools/config/ConfigCenter.java b/mpush-tools/src/main/java/com/shinemo/mpush/tools/config/ConfigCenter.java
@@ -24,7 +24,7 @@ public interface ConfigCenter extends Config {
     int maxPacketSize();
 
     @Key("compress_limit")
-    @DefaultValue("10240")
+    @DefaultValue("1024")
     int compressLimit();
 
     @Key("min_heartbeat")

diff --git a/mpush-tools/src/main/java/com/shinemo/mpush/tools/crypto/AESUtils.java b/mpush-tools/src/main/java/com/shinemo/mpush/tools/crypto/AESUtils.java
@@ -25,7 +25,7 @@ public final class AESUtils {
      * <p>
      * 生成密钥
      * </p>
-     * 
+     *
      * @param seed 密钥种子
      * @return
      * @throws Exception
@@ -36,7 +36,7 @@ public static SecretKey getSecretKey(byte[] seed) throws Exception {
         keyGenerator.init(secureRandom);
         return keyGenerator.generateKey();
     }
-    
+
     public static byte[] encrypt(byte[] data, byte[] encryptKey, byte[] iv) {
         IvParameterSpec zeroIv = new IvParameterSpec(iv);
         SecretKeySpec key = new SecretKeySpec(encryptKey, KEY_ALGORITHM);
@@ -49,8 +49,6 @@ public static byte[] encrypt(byte[] data, byte[] encryptKey, byte[] iv) {
             throw new RuntimeException("AES encrypt ex", e);
         }
     }
-
-
 
     public static byte[] decrypt(byte[] data, byte[] decryptKey, byte[] iv) {
         IvParameterSpec zeroIv = new IvParameterSpec(iv);

diff --git a/mpush-tools/src/main/java/com/shinemo/mpush/tools/crypto/MD5Utils.java b/mpush-tools/src/main/java/com/shinemo/mpush/tools/crypto/MD5Utils.java
@@ -14,13 +14,13 @@
 /**
  * Created by ohun on 2015/12/25.
  */
-public class MD5Utils {
+public final class MD5Utils {
     public static String encrypt(File file) {
         InputStream in = null;
         try {
             MessageDigest digest = MessageDigest.getInstance("MD5");
             in = new FileInputStream(file);
-            byte[] buffer = new byte[10240];//10k
+            byte[] buffer = new byte[1024];//10k
             int readLen;
             while ((readLen = in.read(buffer)) != -1) {
                 digest.update(buffer, 0, readLen);
@@ -55,7 +55,7 @@ public static String encrypt(byte[] bytes) {
     }
 
     private static String toHex(byte[] bytes) {
-        StringBuffer buffer = new StringBuffer(bytes.length * 2);
+        StringBuilder buffer = new StringBuilder(bytes.length * 2);
 
         for (int i = 0; i < bytes.length; ++i) {
             buffer.append(Character.forDigit((bytes[i] & 240) >> 4, 16));

diff --git a/mpush-tools/src/main/java/com/shinemo/mpush/tools/crypto/RSAUtils.java b/mpush-tools/src/main/java/com/shinemo/mpush/tools/crypto/RSAUtils.java
@@ -25,7 +25,7 @@
  * 由于非对称加密速度极其缓慢，一般文件不使用它来加密而是使用对称加密，<br/>
  * 非对称加密算法可以用来对对称加密的密钥加密，这样保证密钥的安全也就保证了数据的安全
  */
-public class RSAUtils {
+public final class RSAUtils {
     private static final Logger LOGGER = LoggerFactory.getLogger(RSAUtils.class);
 
     /**
@@ -237,7 +237,7 @@ public static byte[] decryptByPrivateKey(byte[] data, RSAPrivateKey privateKey)
             return doFinal(cipher, data, key_len);
         } catch (Exception e) {
             LOGGER.error("decryptByPrivateKey ex", e);
-            throw new RuntimeException("RSA encrypt ex", e);
+            throw new RuntimeException("RSA decrypt ex", e);
         }
     }
 
@@ -253,9 +253,9 @@ public static byte[] decryptByPrivateKey(byte[] data, RSAPrivateKey privateKey)
      * @throws IllegalBlockSizeException
      */
     private static byte[] doFinal(Cipher cipher, byte[] data, int key_len) throws BadPaddingException, IllegalBlockSizeException {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
         int inputLen = data.length, offSet = 0;
         byte[] tmp;
+        ByteArrayOutputStream out = new ByteArrayOutputStream(getTmpArrayLength(inputLen));
         while (inputLen > 0) {
             tmp = cipher.doFinal(data, offSet, Math.min(key_len, inputLen));
             out.write(tmp, 0, tmp.length);
@@ -265,6 +265,12 @@ private static byte[] doFinal(Cipher cipher, byte[] data, int key_len) throws Ba
         return out.toByteArray();
     }
 
+    private static int getTmpArrayLength(int L) {
+        int S = MAX_DECRYPT_BLOCK;
+        while (S < L) S <<= 1;
+        return S;
+    }
+
     /**
      * 私钥解密
      *

diff --git a/mpush-tools/src/test/java/com/shinemo/mpush/tools/IOUtilsTest.java b/mpush-tools/src/test/java/com/shinemo/mpush/tools/IOUtilsTest.java
@@ -0,0 +1,61 @@
+package com.shinemo.mpush.tools;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by ohun on 2016/3/8.
+ */
+public class IOUtilsTest {
+
+    @Test
+    public void testCompress() throws Exception {
+        byte[] s = ("士大夫士大大啊实打实大苏打撒" +
+                "阿斯顿撒大苏打实打实的苏打似的啊实" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "打实大苏打实打实大苏打水水" +
+                "水水水水夫").getBytes();
+        long t1 = System.currentTimeMillis();
+        for (int i = 0; i < 100; i++) {
+            IOUtils.compress(s);
+        }
+        System.out.println((System.currentTimeMillis()-t1));
+        System.out.println("src:" + s.length);
+        byte[] out = IOUtils.compress(s);
+        System.out.println("compress:" + out.length);
+        byte[] ss = IOUtils.uncompress(out);
+        System.out.println("uncompress:" + ss.length);
+    }
+
+    @Test
+    public void testUncompress() throws Exception {
+
+    }
+}
diff --git a/mpush-tools/src/test/java/com/shinemo/mpush/tools/crypto/RSAUtilsTest.java b/mpush-tools/src/test/java/com/shinemo/mpush/tools/crypto/RSAUtilsTest.java
@@ -15,7 +15,7 @@
 public class RSAUtilsTest {
     String publicKey;
     String privateKey;
-    
+
     String publicKey2;
     String privateKey2;
 
@@ -27,7 +27,7 @@ public void setUp() throws Exception {
             privateKey = RSAUtils.encodeBase64(pair.value);
             System.out.println("公钥: \n\r" + publicKey);
             System.out.println("私钥： \n\r" + privateKey);
-            
+
             pair = RSAUtils.genKeyPair();
             publicKey2 = RSAUtils.encodeBase64(pair.key);
             privateKey2 = RSAUtils.encodeBase64(pair.value);
@@ -38,23 +38,23 @@ public void setUp() throws Exception {
 
     @Test
     public void testGetKeys() throws Exception {
-    	String source = "这是一行测试RSA数字签名的无意义文字";
+        String source = "这是一行测试RSA数字签名的无意义文字";
-    	byte[] data = source.getBytes();
+        byte[] data = source.getBytes();
         byte[] encodedData = RSAUtils.encryptByPublicKey(data, publicKey);
         System.out.println("加密后:\n" + new String(encodedData));
         byte[] decodedData = RSAUtils.decryptByPrivateKey(encodedData, privateKey);
         String target = new String(decodedData);
         System.out.println("解密后:\n" + target);
-        
+
         decodedData = RSAUtils.decryptByPrivateKey(encodedData, privateKey2);
         target = new String(decodedData);
         System.out.println("解密后2:\n" + target);
-        
+
     }
 
     @Test
     public void testGetPrivateKey() throws Exception {
-    	System.out.println("公钥: \n\r" + publicKey);
+        System.out.println("公钥: \n\r" + publicKey);
         System.out.println("私钥： \n\r" + privateKey);
     }
 
@@ -91,7 +91,7 @@ public void test1() throws Exception {
         System.out.println("加密后文字：\r\n" + new String(encodedData));
         byte[] decodedData = RSAUtils.decryptByPrivateKey(encodedData, privateKey);
         String target = new String(decodedData);
-        System.out.println("解密后文字: \r\n" + target);
+        System.out.println("解密后文字: \r\n" + target + ", 明文长度:" + data.length + ", 密文长度:" + encodedData.length);
     }
 
     @Test