Merge branch 'release/1.0.1'

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>me.chanjar</groupId>
     <artifactId>weixin-java-tools</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <name>WeiXin Java Tools</name>
     <description>用于开发微信公众号的Java工具</description>
     <url>https://github.com/chanjarster/weixin-java-tools</url>
@@ -96,6 +96,28 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.1</version>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>9.3.0.M0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>9.3.0.M0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

src/main/java/me/chanjar/weixin/api/WxConfigStorage.java

@@ -20,7 +20,9 @@ public interface WxConfigStorage {
   public String getSecret();
 
   public String getToken();
-
+
+  public String getAesKey();
+
   public int getExpiresIn();
-  
+
 }

src/main/java/me/chanjar/weixin/api/WxInMemoryConfigStorage.java

@@ -13,6 +13,7 @@ public class WxInMemoryConfigStorage implements WxConfigStorage {
   protected String secret;
   protected String token;
   protected String accessToken;
+  protected String aesKey;
   protected int expiresIn;
 
   public void updateAccessToken(WxAccessToken accessToken) {
@@ -56,6 +57,14 @@ public void setToken(String token) {
     this.token = token;
   }
 
+  public String getAesKey() {
+    return aesKey;
+  }
+
+  public void setAesKey(String aesKey) {
+    this.aesKey = aesKey;
+  }
+
   public void setAccessToken(String accessToken) {
     this.accessToken = accessToken;
   }
@@ -64,4 +73,5 @@ public void setExpiresIn(int expiresIn) {
     this.expiresIn = expiresIn;
   }
 
+
 }

src/main/java/me/chanjar/weixin/api/WxServiceImpl.java

@@ -11,6 +11,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import me.chanjar.weixin.bean.WxCustomMessage;
+import me.chanjar.weixin.util.crypto.SHA1;
 import me.chanjar.weixin.util.json.GsonHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.ClientProtocolException;
@@ -67,33 +68,12 @@ public class WxServiceImpl implements WxService {
 
   public boolean checkSignature(String timestamp, String nonce, String signature) {
     try {
-      String token = wxConfigStorage.getToken();
-      MessageDigest sha1 = MessageDigest.getInstance("SHA1");
-      String[] arr = new String[] { token, timestamp, nonce };
-      Arrays.sort(arr);
-      StringBuilder sb = new StringBuilder();
-      for(String a : arr) {
-        sb.append(a);
-      }
-      sha1.update(sb.toString().getBytes());
-      byte[] output = sha1.digest();
-      return bytesToHex(output).equals(signature);
+      return SHA1.gen(wxConfigStorage.getToken(), timestamp, nonce).equals(signature);
     } catch (Exception e) {
       return false;
     }
   }
 
-  protected String bytesToHex(byte[] b) {
-    char hexDigit[] = {'0', '1', '2', '3', '4', '5', '6', '7',
-                       '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-    StringBuffer buf = new StringBuffer();
-    for (int j = 0; j < b.length; j++) {
-      buf.append(hexDigit[(b[j] >> 4) & 0x0f]);
-      buf.append(hexDigit[b[j] & 0x0f]);
-    }
-    return buf.toString();
- }
-
   public void accessTokenRefresh() throws WxErrorException {
     if (!GLOBAL_ACCESS_TOKEN_REFRESH_FLAG.getAndSet(true)) {
       try {