xingePush#22 兼容JDK 1.6

ablecao · ablecao · commit 695616e0ab22 · 2018-09-05T16:33:35.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -39,10 +39,6 @@
 
 
     <repositories>
-        <repository>
-            <id>maven-oa</id>
-            <url>http://maven.oa.com/nexus/content/groups/public</url>
-        </repository>
         <repository>
             <id>xingePush</id>
             <url>https://raw.githubusercontent.com/xingePush/maven-repository/release/</url>
@@ -64,8 +60,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <jackson.version>1.9.9</jackson.version>
+        <java.version>1.6</java.version>
     </properties>
 
     <dependencies>
@@ -141,8 +137,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.3</version>
                 <configuration>
-                    <source>7</source>
-                    <target>7</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                     <maxmem>1024m</maxmem>
                     <fork>true</fork>
@@ -237,8 +233,8 @@
                         <artifactId>maven-compiler-plugin</artifactId>
                         <version>3.0</version>
                         <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
+                            <source>${java.version}</source>
+                            <target>${java.version}</target>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -285,4 +281,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/src/main/java/com/tencent/xinge/XingeApp.java b/src/main/java/com/tencent/xinge/XingeApp.java
@@ -1,9 +1,9 @@
 package com.tencent.xinge;
 
+import com.google.common.base.Charsets;
 import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 
 import com.tencent.xinge.push.app.PushAppRequest;
 import org.apache.commons.codec.binary.Base64;
@@ -99,7 +99,7 @@ private JSONObject callRestful(String apiAddress, String jsonRequestString) {
             https.setDoOutput(true);
             https.setRequestProperty("Authorization", "Basic " + authStringEnc);
 
-            byte[] out = jsonRequestString.getBytes(StandardCharsets.UTF_8);
+            byte[] out = jsonRequestString.getBytes(Charsets.UTF_8);
             int length = out.length;
 
             https.setFixedLengthStreamingMode(length);
