From 1001158231ec290b5b34ea0187f675361aed7e26 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 6 Feb 2021 22:27:32 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E8=A7=84=E8=8C=83?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                              |  5 +++++
 .../chanjar/weixin/cp/tp/service/WxCpTpService.java  | 12 +++++++-----
 .../cp/tp/service/impl/BaseWxCpTpServiceImpl.java    |  4 ++--
 weixin-java-miniapp/pom.xml                          |  1 -
 weixin-java-pay/pom.xml                              |  1 -
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index f9f5e854c..2ba57812c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -276,6 +276,11 @@
         <version>1.18.8</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcpkix-jdk15on</artifactId>
+        <version>1.68</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java
index 901af65a6..364eee0fe 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/WxCpTpService.java
@@ -86,8 +86,8 @@ public interface WxCpTpService {
    * @param forceRefresh 强制刷新
    * @return the suite ticket
    * @throws WxErrorException the wx error exception
-   * @deprecated 由于无法主动刷新 ，所以这个接口实际已经没有意义，需要在接收企业微信的主动推送后，保存这个ticket
    * @see #setSuiteTicket(String) #setSuiteTicket(String)
+   * @deprecated 由于无法主动刷新 ，所以这个接口实际已经没有意义，需要在接收企业微信的主动推送后，保存这个ticket
    */
   @Deprecated
   String getSuiteTicket(boolean forceRefresh) throws WxErrorException;
@@ -127,12 +127,12 @@ public interface WxCpTpService {
   /**
    * 获取企业凭证
    *
-   * @param authCorpid    授权方corpid
+   * @param authCorpId    授权方corpid
    * @param permanentCode 永久授权码，通过get_permanent_code获取
    * @return the corp token
    * @throws WxErrorException the wx error exception
    */
-  WxAccessToken getCorpToken(String authCorpid, String permanentCode) throws WxErrorException;
+  WxAccessToken getCorpToken(String authCorpId, String permanentCode) throws WxErrorException;
 
   /**
    * 获取企业永久授权码 .
@@ -178,7 +178,8 @@ public interface WxCpTpService {
    * @param authType 授权类型：0 正式授权， 1 测试授权。
    * @return pre auth url
    * @throws WxErrorException the wx error exception
-   * @Link https ://work.weixin.qq.com/api/doc/90001/90143/90602 </pre>
+   * @link https ://work.weixin.qq.com/api/doc/90001/90143/90602
+   * </pre>
    */
   String getPreAuthUrl(String redirectUri, String state, int authType) throws WxErrorException;
 
@@ -317,8 +318,9 @@ public interface WxCpTpService {
 
   /**
    * 获取登录用户信息
-   *
+   * <p>
    * 文档地址：https://work.weixin.qq.com/api/doc/90001/90143/91125
+   *
    * @param authCode the auth code
    * @return login info
    * @throws WxErrorException the wx error exception
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/BaseWxCpTpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/BaseWxCpTpServiceImpl.java
index 004510236..363c9e85e 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/BaseWxCpTpServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/service/impl/BaseWxCpTpServiceImpl.java
@@ -184,9 +184,9 @@ public abstract class BaseWxCpTpServiceImpl<H, P> implements WxCpTpService, Requ
 
 
   @Override
-  public WxAccessToken getCorpToken(String authCorpid, String permanentCode) throws WxErrorException {
+  public WxAccessToken getCorpToken(String authCorpId, String permanentCode) throws WxErrorException {
     JsonObject jsonObject = new JsonObject();
-    jsonObject.addProperty("auth_corpid", authCorpid);
+    jsonObject.addProperty("auth_corpid", authCorpId);
     jsonObject.addProperty("permanent_code", permanentCode);
     String result = post(configStorage.getApiUrl(GET_CORP_TOKEN), jsonObject.toString());
 
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 21061581b..5d815ba12 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -74,7 +74,6 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.65</version>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index aa2d7deb6..7c11b4216 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -43,7 +43,6 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.65</version>
     </dependency>
 
     <dependency>