From 424a835c455180639fb65d80c005867ffb821c84 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 2 May 2020 22:29:32 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99Tic?=
 =?UTF-8?q?ketType=EF=BC=8C=E7=A7=BB=E5=88=B0common=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=85=B1=E4=BA=AB=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/common/enums}/TicketType.java      |  7 +++-
 .../cp/api/impl/WxCpServiceJoddHttpImpl.java  |  4 +--
 .../api/impl/BaseWxCpTpServiceImplTest.java   |  6 ++--
 .../weixin/cp/bean/WxCpXmlMessageTest.java    | 12 +++----
 .../impl/WxMaRedisBetterConfigImpl.java       |  2 +-
 .../impl/WxMaRedisConnectionConfigImpl.java   |  9 ++---
 .../me/chanjar/weixin/mp/api/WxMpService.java |  2 +-
 .../mp/api/impl/BaseWxMpServiceImpl.java      |  2 +-
 .../mp/api/impl/WxMpCardServiceImpl.java      |  2 +-
 .../weixin/mp/config/WxMpConfigStorage.java   |  2 +-
 .../mp/config/impl/WxMpDefaultConfigImpl.java |  2 +-
 .../mp/config/impl/WxMpRedisConfigImpl.java   |  2 +-
 .../chanjar/weixin/mp/enums/TicketType.java   | 35 -------------------
 .../mp/api/impl/WxMpServiceImplTest.java      |  2 +-
 .../api/impl/WxOpenInMemoryConfigStorage.java |  4 +--
 .../MaQrCodeJoddHttpRequestExecutor.java      |  2 +-
 16 files changed, 31 insertions(+), 64 deletions(-)
 rename {weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant => weixin-java-common/src/main/java/me/chanjar/weixin/common/enums}/TicketType.java (85%)
 delete mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/TicketType.java

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/TicketType.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/enums/TicketType.java
similarity index 85%
rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/TicketType.java
rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/enums/TicketType.java
index e8b07de0c..afbd1ec38 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/TicketType.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/enums/TicketType.java
@@ -1,4 +1,4 @@
-package cn.binarywang.wx.miniapp.constant;
+package me.chanjar.weixin.common.enums;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -18,10 +18,15 @@ public enum TicketType {
    * jsapi
    */
   JSAPI("jsapi"),
+  /**
+   * sdk
+   */
+  SDK("2"),
   /**
    * 微信卡券
    */
   WX_CARD("wx_card");
+
   /**
    * type代码
    */
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java
index cc76e9cf4..6aff7ed53 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java
@@ -3,8 +3,8 @@ package me.chanjar.weixin.cp.api.impl;
 import jodd.http.HttpConnectionProvider;
 import jodd.http.HttpRequest;
 import jodd.http.HttpResponse;
-import jodd.http.JoddHttp;
 import jodd.http.ProxyInfo;
+import jodd.http.net.SocketHttpConnectionProvider;
 import me.chanjar.weixin.common.WxType;
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.error.WxError;
@@ -68,7 +68,7 @@ public class WxCpServiceJoddHttpImpl extends BaseWxCpServiceImpl<HttpConnectionP
         configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword());
     }
 
-    httpClient = JoddHttp.httpConnectionProvider;
+    httpClient = new SocketHttpConnectionProvider();
   }
 
   @Override
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
index b8e572eb2..1c489e351 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
@@ -133,7 +133,7 @@ public class BaseWxCpTpServiceImplTest {
     assertThat(tpCorp.getPermanentCode()).isEqualTo("xxxx");
 
     final WxCpTpPermanentCodeInfo tpPermanentCodeInfo = tpService.getPermanentCodeInfo(authCode);
-    assertThat(tpPermanentCodeInfo.getAuthInfo().getAgent().get(0).getAgentid()).isEqualTo(1);
+    assertThat(tpPermanentCodeInfo.getAuthInfo().getAgents().get(0).getAgentId()).isEqualTo(1);
 
   }
 
@@ -193,8 +193,8 @@ public class BaseWxCpTpServiceImplTest {
     jsonObject.addProperty("auth_code", authCode);
     doReturn(returnJson).when(tpService).post(configStorage.getApiUrl(GET_PERMANENT_CODE), jsonObject.toString());
     final WxCpTpPermanentCodeInfo tpPermanentCodeInfo = tpService.getPermanentCodeInfo(authCode);
-    assertThat(tpPermanentCodeInfo.getAuthInfo().getAgent().get(0).getAgentid()).isEqualTo(1000012);
-    assertNotNull(tpPermanentCodeInfo.getAuthInfo().getAgent().get(0).getSquareLogoUrl());
+    assertThat(tpPermanentCodeInfo.getAuthInfo().getAgents().get(0).getAgentId()).isEqualTo(1000012);
+    assertNotNull(tpPermanentCodeInfo.getAuthInfo().getAgents().get(0).getSquareLogoUrl());
     assertNotNull(tpPermanentCodeInfo.getAuthCorpInfo().getCorpSquareLogoUrl());
   }
 
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlMessageTest.java
index f10b5d4fc..0a9f17a62 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlMessageTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlMessageTest.java
@@ -70,9 +70,9 @@ public class WxCpXmlMessageTest {
     assertEquals(wxMessage.getMediaId(), "media_id");
     assertEquals(wxMessage.getFormat(), "Format");
     assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id");
-    assertEquals(wxMessage.getLocationX(), 23.134521d);
-    assertEquals(wxMessage.getLocationY(), 113.358803d);
-    assertEquals(wxMessage.getScale(), 20d);
+    assertEquals(wxMessage.getLocationX().doubleValue(), 23.134521d);
+    assertEquals(wxMessage.getLocationY().doubleValue(), 113.358803d);
+    assertEquals(wxMessage.getScale().doubleValue(), 20d);
     assertEquals(wxMessage.getLabel(), "位置信息");
     assertEquals(wxMessage.getDescription(), "公众平台官网链接");
     assertEquals(wxMessage.getUrl(), "url");
@@ -80,9 +80,9 @@ public class WxCpXmlMessageTest {
     assertEquals(wxMessage.getEvent(), "subscribe");
     assertEquals(wxMessage.getEventKey(), "qrscene_123123");
     assertEquals(wxMessage.getTicket(), "TICKET");
-    assertEquals(wxMessage.getLatitude(), 23.137466);
-    assertEquals(wxMessage.getLongitude(), 113.352425);
-    assertEquals(wxMessage.getPrecision(), 119.385040);
+    assertEquals(wxMessage.getLatitude().doubleValue(), 23.137466);
+    assertEquals(wxMessage.getLongitude().doubleValue(), 113.352425);
+    assertEquals(wxMessage.getPrecision().doubleValue(), 119.385040);
     assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
     assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
     assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1));
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java
index e53ed198b..3932531a1 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java
@@ -1,6 +1,6 @@
 package cn.binarywang.wx.miniapp.config.impl;
 
-import cn.binarywang.wx.miniapp.constant.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.common.redis.JedisWxRedisOps;
 import me.chanjar.weixin.common.redis.WxRedisOps;
 import redis.clients.jedis.JedisPool;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConnectionConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConnectionConfigImpl.java
index e48cda204..0b710aeec 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConnectionConfigImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConnectionConfigImpl.java
@@ -1,5 +1,6 @@
 package cn.binarywang.wx.miniapp.config.impl;
 
+import lombok.RequiredArgsConstructor;
 import redis.clients.jedis.Jedis;
 
 /**
@@ -9,13 +10,9 @@ import redis.clients.jedis.Jedis;
  * 需要引入依赖<a href="https://github.com/abelaska/jedis-lock">jedis-lock</a>，才能使用该类。
  * </pre>
  */
+@RequiredArgsConstructor
 public class WxMaRedisConnectionConfigImpl extends AbstractWxMaRedisConfig {
-
-  public WxMaRedisConnectionConfigImpl(Jedis jedis) {
-    this.jedis = jedis;
-  }
-
-  private Jedis jedis;
+  private final Jedis jedis;
 
   @Override
   protected Jedis getJedis() {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
index db8d00865..3803ef979 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -13,7 +13,7 @@ import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.mp.enums.WxMpApiUrl;
 
 import java.util.Map;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
index 58ba8446d..fb4ae5d0d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
@@ -26,7 +26,7 @@ import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.mp.enums.WxMpApiUrl;
 import me.chanjar.weixin.mp.util.WxMpConfigStorageHolder;
 import org.apache.commons.lang3.StringUtils;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java
index 1bf61ffe3..faba08acd 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java
@@ -13,7 +13,7 @@ import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 import me.chanjar.weixin.mp.api.WxMpCardService;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.card.*;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.mp.enums.WxMpApiUrl;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 import org.apache.commons.codec.digest.DigestUtils;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java
index 7c3c46292..d0d7003a2 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java
@@ -3,7 +3,7 @@ package me.chanjar.weixin.mp.config;
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.mp.bean.WxMpHostConfig;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 
 import java.io.File;
 import java.util.concurrent.locks.Lock;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java
index 08e7d0830..0cb350f72 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java
@@ -10,7 +10,7 @@ import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
 import me.chanjar.weixin.mp.bean.WxMpHostConfig;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 /**
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
index 8460d4641..dbb387821 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
@@ -3,7 +3,7 @@ package me.chanjar.weixin.mp.config.impl;
 import lombok.Data;
 import me.chanjar.weixin.common.redis.JedisWxRedisOps;
 import me.chanjar.weixin.common.redis.WxRedisOps;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import redis.clients.jedis.JedisPool;
 
 import java.util.concurrent.TimeUnit;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/TicketType.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/TicketType.java
deleted file mode 100644
index 02de06f6d..000000000
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/TicketType.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package me.chanjar.weixin.mp.enums;
-
-import lombok.Getter;
-
-/**
- * <pre>
- * ticket类型枚举
- * Created by Binary Wang on 2018/11/18.
- * </pre>
- *
- * @author <a href="https://github.com/binarywang">Binary Wang</a>
- */
-@Getter
-public enum TicketType {
-  /**
-   * jsapi
-   */
-  JSAPI("jsapi"),
-  /**
-   * sdk
-   */
-  SDK("2"),
-  /**
-   * 微信卡券
-   */
-  WX_CARD("wx_card");
-  /**
-   * type代码
-   */
-  private String code;
-
-  TicketType(String code) {
-    this.code = code;
-  }
-}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java
index a434144cc..c450775d2 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java
@@ -12,7 +12,7 @@ import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.test.ApiTestModule;
 import me.chanjar.weixin.mp.api.test.TestConfigStorage;
 import me.chanjar.weixin.mp.bean.result.WxMpCurrentAutoReplyInfo;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 
 import static org.testng.Assert.*;
 
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
index 966db0612..bcd6001e5 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
@@ -7,7 +7,7 @@ import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.mp.bean.WxMpHostConfig;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.open.api.WxOpenConfigStorage;
 import me.chanjar.weixin.open.bean.WxOpenAuthorizerAccessToken;
 import me.chanjar.weixin.open.bean.WxOpenComponentAccessToken;
@@ -78,7 +78,7 @@ public class WxOpenInMemoryConfigStorage implements WxOpenConfigStorage {
     }
     return lock;
   }
-  
+
   @Override
   public WxMpConfigStorage getWxMpConfigStorage(String appId) {
     return new WxOpenInnerConfigStorage(this, appId);
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java
index f376dd454..c06fbafa7 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java
@@ -4,7 +4,7 @@ import jodd.http.HttpConnectionProvider;
 import jodd.http.HttpRequest;
 import jodd.http.HttpResponse;
 import jodd.http.ProxyInfo;
-import jodd.util.MimeTypes;
+import jodd.net.MimeTypes;
 import jodd.util.StringPool;
 import me.chanjar.weixin.common.WxType;
 import me.chanjar.weixin.common.error.WxError;