规范部分代码

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaUserService.java

@@ -13,11 +13,14 @@ import java.util.Map;
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 public interface WxMaUserService {
+  String SET_USER_STORAGE = "https://api.weixin.qq.com/wxa/set_user_storage?appid=%s&signature=%s&openid=%s&sig_method=%s";
 
   /**
    * 获取登录后的session信息.
    *
    * @param jsCode 登录时获取的 code
+   * @return .
+   * @throws WxErrorException .
    */
   WxMaJscode2SessionResult getSessionInfo(String jsCode) throws WxErrorException;
 
@@ -34,9 +37,11 @@ public interface WxMaUserService {
    * 上报用户数据后台接口.
    * <p>小游戏可以通过本接口上报key-value数据到用户的CloudStorage。</p>
    * 文档参考https://developers.weixin.qq.com/minigame/dev/document/open-api/data/setUserStorage.html
+   *
    * @param kvMap      要上报的数据
    * @param sessionKey 通过wx.login 获得的登录态
-   * @param openid
+   * @param openid     .
+   * @throws WxErrorException .
    */
   void setUserStorage(Map<String, String> kvMap, String sessionKey, String openid) throws WxErrorException;
 
@@ -46,6 +51,7 @@ public interface WxMaUserService {
    * @param sessionKey    会话密钥
    * @param encryptedData 消息密文
    * @param ivStr         加密算法的初始向量
+   * @return .
    */
   WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedData, String ivStr);
 
@@ -55,6 +61,7 @@ public interface WxMaUserService {
    * @param sessionKey 会话密钥
    * @param rawData    微信用户基本信息
    * @param signature  数据签名
+   * @return .
    */
   boolean checkUserInfo(String sessionKey, String rawData, String signature);
 }

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaUserServiceImpl.java

@@ -9,28 +9,21 @@ import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import lombok.AllArgsConstructor;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.SignUtils;
-import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
 
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 
 /**
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
+@AllArgsConstructor
 public class WxMaUserServiceImpl implements WxMaUserService {
   private WxMaService service;
 
-  public WxMaUserServiceImpl(WxMaService service) {
-    this.service = service;
-  }
-
   @Override
   public WxMaJscode2SessionResult getSessionInfo(String jsCode) throws WxErrorException {
     return service.jsCode2SessionInfo(jsCode);
@@ -55,9 +48,7 @@ public class WxMaUserServiceImpl implements WxMaUserService {
     param.add("kv_list", array);
     String params = param.toString();
     String signature = SignUtils.createHmacSha256Sign(params, sessionKey);
-    String url = String.format("https://api.weixin.qq.com/wxa/set_user_storage" +
+    String url = String.format(SET_USER_STORAGE, config.getAppid(), signature, openid, "hmac_sha256");
-        "?appid=%s&signature=%s&openid=%s&sig_method=%s",
-      config.getAppid(), signature, openid, "hmac_sha256");
     String result = this.service.post(url, params);
     WxError error = WxError.fromJson(result);
     if (error.getErrorCode() != 0) {