Merge branch 'wei_master' into '105'

update

See merge request !45

src/main/java/com/server/utils/weixin/WeixinBaseUtil.java

@@ -103,7 +103,7 @@ public class WeixinBaseUtil {
         String str;
         String signature = "";
         //注意这里参数名必须全部小写，且必须有序
-        str = "jsapi_ticket=" + jsapi_ticket + "&noncestr=" + nonce_str + "&timestamp=" + timestamp + "&url=" + url;
+        str = "jsapi_ticket=" + jsapi_ticket + "&nonceStr=" + nonce_str + "&timestamp=" + timestamp + "&url=" + url;
         try {
             MessageDigest crypt = MessageDigest.getInstance("SHA-1");
             crypt.reset();