构建兼容性升级到 jdk 1.8

weijunyi · weijunyi · commit b60084357989 · 2020-12-27T16:49:42.000+08:00
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@
 ### gradle
 ```
 dependencies {
-    compile 'com.github.tencentyun:tls-sig-api-v2:1.1'
+    compile 'com.github.tencentyun:tls-sig-api-v2:2.0'
 }
 ```
 
@@ -32,4 +32,4 @@ import com.tencentyun.TLSSigAPIv2;
 
 TLSSigAPIv2 api = new TLSSigAPIv2(1400000000, "5bd2850fff3ecb11d7c805251c51ee463a25727bddc2385f3fa8bfee1bb93b5e");
 System.out.print(api.genSig("xiaojun", 180*86400));
-```
+```
diff --git a/build.gradle b/build.gradle
@@ -13,8 +13,8 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
-sourceCompatibility = 1.6
-version = '1.2'
+sourceCompatibility = 1.8
+version = '2.0'
 group = "com.github.tencentyun"
 archivesBaseName = "tls-sig-api-v2"
 tasks.withType(JavaCompile) {
diff --git a/src/main/java/com/tencentyun/Base64URL.java b/src/main/java/com/tencentyun/Base64URL.java
@@ -1,15 +1,10 @@
 package com.tencentyun;
 
-// 使用旧版本 base64 编解码实现增强兼容性
-
-import sun.misc.BASE64Encoder;
-import sun.misc.BASE64Decoder;
-
-import java.io.IOException;
+import java.util.Base64;
 
 public class Base64URL {
     public static byte[] base64EncodeUrl(byte[] input) {
-        byte[] base64 = new BASE64Encoder().encode(input).getBytes();
+        byte[] base64 = Base64.getEncoder().encode(input);
         for (int i = 0; i < base64.length; ++i)
             switch (base64[i]) {
                 case '+':
@@ -26,23 +21,4 @@ public static byte[] base64EncodeUrl(byte[] input) {
             }
         return base64;
     }
-
-    public static byte[] base64DecodeUrl(byte[] input) throws IOException {
-        byte[] base64 = input.clone();
-        for (int i = 0; i < base64.length; ++i)
-            switch (base64[i]) {
-                case '*':
-                    base64[i] = '+';
-                    break;
-                case '-':
-                    base64[i] = '/';
-                    break;
-                case '_':
-                    base64[i] = '=';
-                    break;
-                default:
-                    break;
-            }
-        return new BASE64Decoder().decodeBuffer(new String(base64));
-    }
 }
diff --git a/src/main/java/com/tencentyun/TLSSigAPIv2.java b/src/main/java/com/tencentyun/TLSSigAPIv2.java
@@ -1,12 +1,8 @@
 package com.tencentyun;
 
-// 使用旧版本 base64 编解码实现增强兼容性
-
-import sun.misc.BASE64Encoder;
-
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.security.*;
-import java.nio.charset.Charset;
 
 import java.util.Arrays;
 import java.util.zip.Deflater;
@@ -109,17 +105,13 @@ private String hmacsha256(String identifier, long currTime, long expire, String
             contentToBeSigned += "TLS.userbuf:" + base64Userbuf + "\n";
         }
         try {
-            byte[] byteKey = key.getBytes("UTF-8");
+            byte[] byteKey = key.getBytes(StandardCharsets.UTF_8);
             Mac hmac = Mac.getInstance("HmacSHA256");
             SecretKeySpec keySpec = new SecretKeySpec(byteKey, "HmacSHA256");
             hmac.init(keySpec);
-            byte[] byteSig = hmac.doFinal(contentToBeSigned.getBytes("UTF-8"));
-            return (new BASE64Encoder().encode(byteSig)).replaceAll("\\s*", "");
-        } catch (UnsupportedEncodingException e) {
-            return "";
-        } catch (NoSuchAlgorithmException e) {
-            return "";
-        } catch (InvalidKeyException e) {
+            byte[] byteSig = hmac.doFinal(contentToBeSigned.getBytes(StandardCharsets.UTF_8));
+            return (Base64.getEncoder().encodeToString(byteSig)).replaceAll("\\s*", "");
+        } catch (NoSuchAlgorithmException | InvalidKeyException e) {
             return "";
         }
     }
@@ -137,7 +129,7 @@ private String genUserSig(String userid, long expire, byte[] userbuf) {
 
         String base64UserBuf = null;
         if (null != userbuf) {
-            base64UserBuf = new BASE64Encoder().encode(userbuf);
+            base64UserBuf = Base64.getEncoder().encodeToString(userbuf).replaceAll("\\s*", "");
             sigDoc.put("TLS.userbuf", base64UserBuf);
         }
         String sig = hmacsha256(userid, currTime, expire, base64UserBuf);
@@ -146,7 +138,7 @@ private String genUserSig(String userid, long expire, byte[] userbuf) {
         }
         sigDoc.put("TLS.sig", sig);
         Deflater compressor = new Deflater();
-        compressor.setInput(sigDoc.toString().getBytes(Charset.forName("UTF-8")));
+        compressor.setInput(sigDoc.toString().getBytes(StandardCharsets.UTF_8));
         compressor.finish();
         byte[] compressedBytes = new byte[2048];
         int compressedBytesLength = compressor.deflate(compressedBytes);
diff --git a/src/test/com/tencentyun/TLSSigAPITest.java b/src/test/com/tencentyun/TLSSigAPITest.java
@@ -32,14 +32,14 @@ public void testGenSig() {
 
     //使用userbuf生产privatemapkey
     @Test
-    public void testGenSigWithUserBug() {
+    public void testGenSigWithUserBuf() {
         TLSSigAPIv2 api = new TLSSigAPIv2(1400000000, "5bd2850fff3ecb11d7c805251c51ee463a25727bddc2385f3fa8bfee1bb93b5e");
         System.out.println(api.genPrivateMapKey("xiaojun", 180 * 86400, 10000, 255));
     }
 
     //使用userbuf和字符串房间号生产privatemapkey
     @Test
-    public void testGenSigWithUserBug1() {
+    public void testGenSigWithUserBuf1() {
         TLSSigAPIv2 api = new TLSSigAPIv2(1400000000, "5bd2850fff3ecb11d7c805251c51ee463a25727bddc2385f3fa8bfee1bb93b5e");
         System.out.println(api.genPrivateMapKeyWithStringRoomID("xiaojun", 180 * 86400, "100000000", 255));
     }
diff --git a/user_build.gradle b/user_build.gradle
@@ -12,7 +12,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
-sourceCompatibility = 1.6
+sourceCompatibility = 1.8
 group = "com.github.tencentyun"
 archivesBaseName = "tls-sig-api-v2"
 tasks.withType(JavaCompile) {

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ dependencies {`
`12`	`12`	`testCompile group: 'junit', name: 'junit', version: '4.12'`
`13`	`13`	`}`
`14`	`14`
`15`		`-sourceCompatibility = 1.6`
	`15`	`+sourceCompatibility = 1.8`
`16`	`16`	`group = "com.github.tencentyun"`
`17`	`17`	`archivesBaseName = "tls-sig-api-v2"`
`18`	`18`	`tasks.withType(JavaCompile) {`