From 068192327c003d7ddc4a26c2143cfa6321e43657 Mon Sep 17 00:00:00 2001
From: yc13649764453 <1902434166@qq.com>
Date: Wed, 24 May 2023 18:13:36 +0800
Subject: [PATCH] =?UTF-8?q?--=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 1635 ++++++++++-------
 .../utils/ExcludeEmptyQueryWrapper.java       |  104 ++
 .../modules/book/dao/PayWechatOrderDao.java   |   19 +
 .../book/entity/PayWechatOrderEntity.java     |   75 +
 .../book/service/PayWechatOrderService.java   |   20 +
 .../impl/PayWechatOrderServiceImpl.java       |   30 +
 .../pay/IOSPay/controller/AppController.java  |  278 +++
 .../controller/ApplePayController.java        |  150 ++
 .../applePay/controller/IapController.java    |  133 ++
 .../pay/applePay/service/ApplePayService.java |   36 +
 .../service/impl/ApplePayServiceImpl.java     |  214 +++
 .../pay/applePay/utils/ApplePayUtil.java      |  159 ++
 .../pay/weChatPay/config/WechatPayConfig.java |  194 ++
 .../controller/WeChatPayController.java       |  335 ++++
 .../dto/WxchatCallbackSuccessData.java        |   77 +
 .../modules/pay/weChatPay/util/HttpUtils.java |   45 +
 .../weChatPay/util/WechatPayValidator.java    |  150 ++
 .../controller/SysAgreementController.java    |   69 +
 .../modules/sys/dao/SysAgreementDao.java      |   25 +
 .../sys/entity/SysAgreementEntity.java        |   30 +
 .../sys/service/SysAgreementService.java      |   29 +
 .../service/impl/SysAgreementServiceImpl.java |   42 +
 .../mapper/book/PayWechatOrderDao.xml         |   22 +
 .../resources/mapper/sys/SysAgreementDao.xml  |    6 +
 src/main/resources/weChatConfig.properties    |   21 +
 25 files changed, 3241 insertions(+), 657 deletions(-)
 create mode 100644 src/main/java/com/peanut/common/utils/ExcludeEmptyQueryWrapper.java
 create mode 100644 src/main/java/com/peanut/modules/book/dao/PayWechatOrderDao.java
 create mode 100644 src/main/java/com/peanut/modules/book/entity/PayWechatOrderEntity.java
 create mode 100644 src/main/java/com/peanut/modules/book/service/PayWechatOrderService.java
 create mode 100644 src/main/java/com/peanut/modules/book/service/impl/PayWechatOrderServiceImpl.java
 create mode 100644 src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java
 create mode 100644 src/main/java/com/peanut/modules/pay/applePay/controller/ApplePayController.java
 create mode 100644 src/main/java/com/peanut/modules/pay/applePay/controller/IapController.java
 create mode 100644 src/main/java/com/peanut/modules/pay/applePay/service/ApplePayService.java
 create mode 100644 src/main/java/com/peanut/modules/pay/applePay/service/impl/ApplePayServiceImpl.java
 create mode 100644 src/main/java/com/peanut/modules/pay/applePay/utils/ApplePayUtil.java
 create mode 100644 src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java
 create mode 100644 src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java
 create mode 100644 src/main/java/com/peanut/modules/pay/weChatPay/dto/WxchatCallbackSuccessData.java
 create mode 100644 src/main/java/com/peanut/modules/pay/weChatPay/util/HttpUtils.java
 create mode 100644 src/main/java/com/peanut/modules/pay/weChatPay/util/WechatPayValidator.java
 create mode 100644 src/main/java/com/peanut/modules/sys/controller/SysAgreementController.java
 create mode 100644 src/main/java/com/peanut/modules/sys/dao/SysAgreementDao.java
 create mode 100644 src/main/java/com/peanut/modules/sys/entity/SysAgreementEntity.java
 create mode 100644 src/main/java/com/peanut/modules/sys/service/SysAgreementService.java
 create mode 100644 src/main/java/com/peanut/modules/sys/service/impl/SysAgreementServiceImpl.java
 create mode 100644 src/main/resources/mapper/book/PayWechatOrderDao.xml
 create mode 100644 src/main/resources/mapper/sys/SysAgreementDao.xml
 create mode 100644 src/main/resources/weChatConfig.properties

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f0ab6777..f4bcba25 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,80 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="c20d2499-ffac-46d1-a23d-75d554327ce0" name="Default Changelist" comment="支付">
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/peanut_book.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/peanut_book.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/common/utils/ExcludeEmptyQueryWrapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/PayWechatOrderDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/PayWechatOrderEntity.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/PayWechatOrderService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/PayWechatOrderServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/applePay/controller/ApplePayController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/applePay/controller/IapController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/applePay/service/ApplePayService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/applePay/service/impl/ApplePayServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/applePay/utils/ApplePayUtil.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/dto/WxchatCallbackSuccessData.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/HttpUtils.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WechatPayValidator.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/controller/SysAgreementController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/dao/SysAgreementDao.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/entity/SysAgreementEntity.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/service/SysAgreementService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/service/impl/SysAgreementServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/book/PayWechatOrderDao.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/sys/SysAgreementDao.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/weChatConfig.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_18_0.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_checkerframework_checker_qual_3_5_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/peanut_book.iml" beforeDir="false" afterPath="$PROJECT_DIR$/peanut_book.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/PeanutBookApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/PeanutBookApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/common/Interface/KdApiEOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/common/Interface/KdApiEOrder.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/common/utils/R.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/common/utils/R.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/config/ShiroConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/config/ShiroConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookReadRateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookReadRateController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/CouponController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/CouponController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/MyUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/MyUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProductController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProductController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/UserEbookBuyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/UserEbookBuyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/MyUserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/MyUserDao.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookBrowseRecordsEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookBrowseRecordsEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BuyOrderEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BuyOrderEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/MyUserEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/MyUserEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/PayPaymentOrderEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/PayPaymentOrderEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/PayZfbOrderEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/PayZfbOrderEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/TransactionDetailsEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/TransactionDetailsEntity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BuyOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BuyOrderService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/MyUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/MyUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookShelfServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BookShelfServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/CouponHistoryServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/CouponHistoryServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/CouponServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/CouponServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/PayPaymentOrderServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopProductServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopSeckillServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ShopSeckillServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/TransactionDetailsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/TransactionDetailsServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/alipay/config/AliPayConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/alipay/config/AliPayConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/controller/SysRoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/controller/SysRoleController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/controller/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/controller/SysUserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/service/impl/SysRoleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/service/impl/SysRoleServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/service/impl/SysUserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/peanut/modules/wx/controller/WeixinApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/peanut/modules/wx/controller/WeixinApiController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/book/BookBrowseRecordsDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/book/BookBrowseRecordsDao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/book/MyUserDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/book/MyUserDao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/book/PayPaymentOrderDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/book/PayPaymentOrderDao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/book/ShopProductDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/book/ShopProductDao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/book/TransactionDetailsDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/book/TransactionDetailsDao.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -23,6 +91,20 @@
   <component name="CoverageViewManager">
     <option name="myElementSize" value="53" />
   </component>
+  <component name="DatabaseView">
+    <option name="SHOW_INTERMEDIATE" value="true" />
+    <option name="GROUP_DATA_SOURCES" value="true" />
+    <option name="GROUP_SCHEMA" value="true" />
+    <option name="GROUP_CONTENTS" value="false" />
+    <option name="SORT_POSITIONED" value="false" />
+    <option name="SHOW_EMPTY_GROUPS" value="false" />
+    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
+    <option name="HIDDEN_KINDS">
+      <set />
+    </option>
+    <expand />
+    <select />
+  </component>
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
@@ -31,83 +113,50 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/MyUserController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="379">
-              <caret line="385" column="36" selection-start-line="385" selection-start-column="36" selection-end-line="385" selection-end-column="36" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/MyUserService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="575">
-              <caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WechatPayValidator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="189">
-              <caret line="264" column="9" lean-forward="true" selection-start-line="264" selection-start-column="9" selection-end-line="264" selection-end-column="9" />
+            <state relative-caret-position="300">
+              <caret line="29" column="7" lean-forward="true" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="7" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/weChatConfig.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-5663">
-              <caret line="46" column="46" lean-forward="true" selection-start-line="46" selection-start-column="46" selection-end-line="46" selection-end-column="46" />
+            <state relative-caret-position="175">
+              <caret line="7" column="16" lean-forward="true" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/CouponEntity.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/enums/WxApiType.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="319">
-              <caret line="83" column="28" selection-start-line="83" selection-start-column="28" selection-end-line="83" selection-end-column="28" />
+            <state relative-caret-position="-506">
+              <caret line="7" column="12" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/CouponHistoryController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/enums/WxNotifyType.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="125">
-              <caret line="39" column="25" lean-forward="true" selection-start-line="39" selection-start-column="25" selection-end-line="39" selection-end-column="25" />
+            <state relative-caret-position="300">
+              <caret line="13" column="21" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/CouponHistoryService.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
-              <caret line="25" column="45" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="45" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/CouponHistoryServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="522">
-              <caret line="82" column="34" lean-forward="true" selection-start-line="82" selection-start-column="34" selection-end-line="82" selection-end-column="34" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/CouponHistoryEntity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="650">
-              <caret line="60" column="20" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
+            <state>
+              <caret column="52" selection-start-column="52" selection-end-column="52" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -118,42 +167,45 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Interface" />
+        <option value="FxmlFile" />
+        <option value="Enum" />
+        <option value="AnnotationType" />
         <option value="Class" />
       </list>
     </option>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>params</find>
+      <find>prepay_id</find>
+      <find>log4j</find>
+      <find>getPrivateKey</find>
+      <find>decryptFromResource</find>
+      <find>授权</find>
+      <find>getInputStream</find>
+      <find>access_token</find>
+      <find>TokenHolder</find>
       <find>login</find>
-      <find>mapzhuan</find>
-      <find>转list</find>
-      <find>@RequestBody</find>
-      <find>precent</find>
-      <find>appGetOrderInfo</find>
-      <find>productList</find>
-      <find>sms_coupon_product_category_relation</find>
-      <find>appGetCoupon</find>
-      <find>PayZfbOrderEntity</find>
-      <find>hui</find>
-      <find>支付宝异步回调</find>
-      <find>orderStatus</find>
-      <find>update</find>
-      <find>优惠券</find>
-      <find>sms_coupon</find>
-      <find>CouponEntity</find>
-      <find>useCount</find>
-      <find>shopProductEntities</find>
-      <find>积分</find>
-      <find>vip</find>
-      <find>vipValidtime</find>
-      <find>appGetUserCoupon</find>
-      <find>是否购买</find>
-      <find>boo</find>
-      <find>products</find>
-      <find>查看后操作</find>
-      <find>currentState</find>
-      <find>runCouponsUserStatusTimeOutToExpired</find>
+      <find>sysUserTokenService</find>
+      <find>filter</find>
+      <find>subject</find>
+      <find>BuyOrderId</find>
+      <find>wechat</find>
+      <find>vo</find>
+      <find>new PayWechatOrderEntity()</find>
+      <find>aliNotifyDto</find>
+      <find>money</find>
+      <find>bookBuyConfigEntity</find>
+      <find>new</find>
+      <find>PayWechatOrderEntity</find>
+      <find>order</find>
+      <find>wechatEntity</find>
+      <find>1000</find>
+      <find>WeChatRefundParam</find>
+      <find>WechatPayValidatorForRequest</find>
+      <find>Query</find>
+      <find>Util</find>
+      <find>queryPage1</find>
+      <find>WeChatBasePayData</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -161,61 +213,62 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="WARN_ABOUT_CRLF" value="false" />
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/config/ShiroConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/BuyOrderDetailDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BuyOrderDetailService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderDetailController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BuyOrderDetailServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/FmsOrderDetailService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/FMSOrderDetailService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/FMSOrderDetailDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/FMSOrderDetailServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/book/FMSOrderDetailDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/FMSOrderDetailEntity.java" />
-        <option value="$PROJECT_DIR$/2020年8月中华人民共和国县以上行政区划代码.json" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/common/utils/MD5Utils.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/OrderCartController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/alipay/config/AliPayConfig.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProductController.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/book/ShopProductDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BuyOrderDetailEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/book/BuyOrderDetailDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/productVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/vo/ProductVo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BuyOrderEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/book/BuyOrderDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/PayZfbOrderController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BuyOrderService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/CouponServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ActivityService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/ActivityDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ActivityServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ActivityController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ActivityCouponEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/book/ActivityDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ActivityEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/book/CouponDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/CouponController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/failure/service/impl/FailureDtoServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/failure/service/FailureDtoService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/failure/entity/FailureDtoEntity.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/failure/controller/FailureController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/constant/VerifyReceiptConstant.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/model/dto/UpdateDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/model/dto/UpdateVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/sys/service/impl/SysMenuServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/service/OrderService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookBuyConfigEntity.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/common/utils/PageUtils.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/weChatConfig.yml" />
+        <option value="$PROJECT_DIR$/src/test/java/com/VxApiTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/PayWechatOrderDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/service/WxpayService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/model/dto/IapRequestDTO.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/common/utils/Query.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/common/utils/Constant.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/book/PayWechatOrderDao.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/PeanutBookApplication.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/dto/WeChatBasePayData.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/config/MyBatisPlusConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WxPaySearchOrderUtil.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/enums/WxApiType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/config/ScheduledUpdateCertificatesVerifier.java" />
+        <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/PayWechatOrderEntity.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/WechatVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WxPayCallbackUtil.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/UUID.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/OrderGenerator.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BuyOrderService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/common/Interface/KdApiEOrder.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/CouponHistoryServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/CouponHistoryService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/CouponHistoryEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/book/CouponHistoryDao.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/CouponHistoryController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/MyUserService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/MyUserController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/CouponEntity.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/enums/WxNotifyType.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WechatPayValidator.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WxPayUtil.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/config/ShiroConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/WechatDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/service/impl/OrderServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/model/entities/IosPayOrderEntity.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/vo/FailureVo.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/dto/WxchatCallbackSuccessData.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/dto/WxchatCallbackRefundData.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/weChatConfig.properties" />
       </list>
     </option>
   </component>
@@ -234,7 +287,17 @@
   </component>
   <component name="MavenProjectNavigator">
     <treeState>
-      <expand />
+      <expand>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="peanut_book" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+        </path>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="peanut_book" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+          <item name="Dependencies" type="f4be9f2a:MavenProjectsStructure$DependenciesNode" />
+        </path>
+      </expand>
       <select />
     </treeState>
   </component>
@@ -242,11 +305,14 @@
     <option name="delegateBuildToMaven" value="true" />
     <option name="jreName" value="1.8" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="924" />
-    <option name="y" value="27" />
-    <option name="width" value="1729" />
-    <option name="height" value="1000" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="241" />
+    <option name="y" value="46" />
+    <option name="width" value="1342" />
+    <option name="height" value="966" />
+  </component>
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="1" id="Add" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -254,8 +320,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -263,6 +329,106 @@
               <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
               <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="peanut" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="peanut" type="462c0819:PsiDirectoryNode" />
+              <item name="modules" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="peanut" type="462c0819:PsiDirectoryNode" />
+              <item name="modules" type="462c0819:PsiDirectoryNode" />
+              <item name="pay" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="peanut" type="462c0819:PsiDirectoryNode" />
+              <item name="modules" type="462c0819:PsiDirectoryNode" />
+              <item name="pay" type="462c0819:PsiDirectoryNode" />
+              <item name="weChatPay" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="peanut" type="462c0819:PsiDirectoryNode" />
+              <item name="modules" type="462c0819:PsiDirectoryNode" />
+              <item name="pay" type="462c0819:PsiDirectoryNode" />
+              <item name="weChatPay" type="462c0819:PsiDirectoryNode" />
+              <item name="util" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="peanut_book" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="cent" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="peanut_book" type="b2602c69:ProjectViewProjectNode" />
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -271,7 +437,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
-    <property name="MyBatisLogPluginindexNum" value="8543" />
+    <property name="MyBatisLogPluginindexNum" value="10752" />
     <property name="MyBatisLogPluginparameters" value="Parameters:" />
     <property name="MyBatisLogPluginpreparing" value="Preparing:" />
     <property name="MyBatisLogPluginrunning" value="true" />
@@ -283,7 +449,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="ignore_missing_gitignore" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mapper/book" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/config" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -297,33 +463,53 @@
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="project.propCompiler" />
+    <property name="settings.editor.selected.configurable" value="vcs.Git" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\resources\mapper\book" />
-      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\book\entity" />
-      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\book\controller" />
-      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\book\service\impl" />
-      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\book\service" />
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="com.peanut.modules.pay.weChatPay.config" />
+      <recent name="com.peanut.modules.pay.IOSPay.controller" />
+      <recent name="com.peanut.modules.pay.applePay.utils" />
+      <recent name="com.peanut.modules.pay.wechat.util" />
     </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="com.peanut" />
     </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.peanut.modules.book.entity" />
-      <recent name="com.peanut.modules.book.controller" />
-      <recent name="com.peanut.modules.book.dao" />
-      <recent name="com.peanut.modules.book.service.impl" />
-      <recent name="com.peanut.modules.book.service" />
-    </key>
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\resources\mapper\book" />
-      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\common" />
-      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\book\controller" />
-      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\book\service\impl" />
-      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\book\service" />
+      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\pay\weChatPay\config" />
+      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\pay\weChatPay\service\impl" />
+      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\resources\cent" />
+      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book" />
+      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\pay\IOSPay" />
     </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.peanut.modules.sys.controller" />
+      <recent name="com.peanut.modules.sys.dao" />
+      <recent name="com.peanut.modules.sys.service.impl" />
+      <recent name="com.peanut.modules.sys.service" />
+      <recent name="com.peanut.modules.book.dao" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\pay\applePay\utils" />
+      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\java\com\peanut\modules\pay\applePay\Entity" />
+      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\resources\static\image\upload\ueditor\1665295915369" />
+      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\resources\static\swagger\images" />
+      <recent name="C:\Users\Administrator\IdeaProjects\peanut_book\src\main\resources\mapper\book" />
+    </key>
+  </component>
+  <component name="RestServicesNavigator">
+    <treeState>
+      <expand>
+        <path>
+          <item name="Found 275 services " type="fcff1e1b:RestServiceStructure$RootNode" />
+        </path>
+        <path>
+          <item name="Found 275 services " type="fcff1e1b:RestServiceStructure$RootNode" />
+          <item name="peanut_book" type="c588b436:RestServiceStructure$ProjectNode" />
+        </path>
+      </expand>
+      <select />
+    </treeState>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -338,25 +524,65 @@
     </option>
   </component>
   <component name="RunManager" selected="Spring Boot.PeanutBookApplication">
-    <configuration name="All in peanut_book" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="VxApiTest.getWxPayConfig" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="peanut_book" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="TEST_OBJECT" value="package" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="com" />
+      <option name="MAIN_CLASS_NAME" value="com.VxApiTest" />
+      <option name="METHOD_NAME" value="getWxPayConfig" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ZZTest.readDoc" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="VxApiTest.textgetPrivateKey" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="peanut_book" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="com.peanut.*" />
+          <option name="PATTERN" value="com.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="com.peanut" />
-      <option name="MAIN_CLASS_NAME" value="com.peanut.ZZTest" />
-      <option name="METHOD_NAME" value="readDoc" />
+      <option name="PACKAGE_NAME" value="com" />
+      <option name="MAIN_CLASS_NAME" value="com.VxApiTest" />
+      <option name="METHOD_NAME" value="textgetPrivateKey" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="WeChatPayController.getWxPayConfig" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="peanut_book" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.peanut.modules.pay.weChatPay.controller.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="com.peanut.modules.pay.weChatPay.controller" />
+      <option name="MAIN_CLASS_NAME" value="com.peanut.modules.pay.weChatPay.controller.WeChatPayController" />
+      <option name="METHOD_NAME" value="getWxPayConfig" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="WeChatPayController.textgetPrivateKey" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="peanut_book" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.peanut.modules.pay.weChatPay.controller.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="com.peanut.modules.pay.weChatPay.controller" />
+      <option name="MAIN_CLASS_NAME" value="com.peanut.modules.pay.weChatPay.controller.WeChatPayController" />
+      <option name="METHOD_NAME" value="textgetPrivateKey" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -378,18 +604,25 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="JUnit.ZZTest.readDoc" />
-      <item itemvalue="JUnit.All in peanut_book" />
+      <item itemvalue="JUnit.WeChatPayController.textgetPrivateKey" />
+      <item itemvalue="JUnit.VxApiTest.textgetPrivateKey" />
+      <item itemvalue="JUnit.VxApiTest.getWxPayConfig" />
+      <item itemvalue="JUnit.WeChatPayController.getWxPayConfig" />
       <item itemvalue="Spring Boot.PeanutBookApplication" />
     </list>
     <recent_temporary>
       <list>
         <item itemvalue="Spring Boot.PeanutBookApplication" />
-        <item itemvalue="JUnit.All in peanut_book" />
-        <item itemvalue="JUnit.ZZTest.readDoc" />
+        <item itemvalue="JUnit.VxApiTest.textgetPrivateKey" />
+        <item itemvalue="JUnit.WeChatPayController.textgetPrivateKey" />
+        <item itemvalue="JUnit.VxApiTest.getWxPayConfig" />
+        <item itemvalue="JUnit.WeChatPayController.getWxPayConfig" />
       </list>
     </recent_temporary>
   </component>
+  <component name="SpringBootOptions">
+    <option name="showAdditionalConfigNotification" value="false" />
+  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -532,42 +765,70 @@
       <workItem from="1677546094424" duration="18963000" />
       <workItem from="1677632886995" duration="4072000" />
       <workItem from="1677640955962" duration="8727000" />
-      <workItem from="1677718946384" duration="19130000" />
-    </task>
-    <task id="LOCAL-00001" summary="初始化">
-      <created>1660010527491</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1660010527491</updated>
-    </task>
-    <task id="LOCAL-00002" summary="图书">
-      <created>1660189604867</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1660189604867</updated>
-    </task>
-    <task id="LOCAL-00003" summary="图书">
-      <created>1660189830977</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1660189830977</updated>
-    </task>
-    <task id="LOCAL-00004" summary="近期提交">
-      <created>1660727626676</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1660727626676</updated>
-    </task>
-    <task id="LOCAL-00005" summary="1">
-      <created>1663056077449</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1663056077449</updated>
+      <workItem from="1677718946384" duration="28098000" />
+      <workItem from="1677804661565" duration="47850000" />
+      <workItem from="1678171071975" duration="10056000" />
+      <workItem from="1678236227755" duration="41869000" />
+      <workItem from="1678409205387" duration="33097000" />
+      <workItem from="1678754344022" duration="20008000" />
+      <workItem from="1678841525913" duration="12663000" />
+      <workItem from="1678928287837" duration="13387000" />
+      <workItem from="1679361738508" duration="839000" />
+      <workItem from="1679362601059" duration="25548000" />
+      <workItem from="1679449183897" duration="33714000" />
+      <workItem from="1679557721117" duration="24051000" />
+      <workItem from="1679879529049" duration="5115000" />
+      <workItem from="1679965251641" duration="714000" />
+      <workItem from="1679965986830" duration="4928000" />
+      <workItem from="1679971066830" duration="14244000" />
+      <workItem from="1679988891787" duration="9100000" />
+      <workItem from="1680051508956" duration="13122000" />
+      <workItem from="1680138125353" duration="3315000" />
+      <workItem from="1680225457632" duration="25356000" />
+      <workItem from="1680483388239" duration="3806000" />
+      <workItem from="1680570009792" duration="27118000" />
+      <workItem from="1680743000216" duration="8712000" />
+      <workItem from="1680829265760" duration="17704000" />
+      <workItem from="1681088518638" duration="24830000" />
+      <workItem from="1681174461039" duration="21991000" />
+      <workItem from="1681261349318" duration="19504000" />
+      <workItem from="1681347707403" duration="8541000" />
+      <workItem from="1681434399851" duration="17622000" />
+      <workItem from="1681693334564" duration="19508000" />
+      <workItem from="1681779597639" duration="8660000" />
+      <workItem from="1681865964737" duration="2431000" />
+      <workItem from="1681869137774" duration="10957000" />
+      <workItem from="1681952539493" duration="23279000" />
+      <workItem from="1682039219635" duration="16160000" />
+      <workItem from="1682212257338" duration="19078000" />
+      <workItem from="1682297946399" duration="14454000" />
+      <workItem from="1682389842463" duration="22204000" />
+      <workItem from="1682470778589" duration="29061000" />
+      <workItem from="1682557462973" duration="27726000" />
+      <workItem from="1682646766258" duration="25448000" />
+      <workItem from="1683162205075" duration="17055000" />
+      <workItem from="1683183485872" duration="855000" />
+      <workItem from="1683184367102" duration="10538000" />
+      <workItem from="1683248523253" duration="21811000" />
+      <workItem from="1683335004986" duration="3188000" />
+      <workItem from="1683342498593" duration="23264000" />
+      <workItem from="1683507422427" duration="14693000" />
+      <workItem from="1683525365047" duration="15591000" />
+      <workItem from="1683594395013" duration="28089000" />
+      <workItem from="1683680609461" duration="25844000" />
+      <workItem from="1683766961272" duration="29240000" />
+      <workItem from="1683853574228" duration="27644000" />
+      <workItem from="1684112906874" duration="9969000" />
+      <workItem from="1684123190327" duration="18773000" />
+      <workItem from="1684199244315" duration="26404000" />
+      <workItem from="1684229671150" duration="2468000" />
+      <workItem from="1684284952345" duration="29225000" />
+      <workItem from="1684371834316" duration="33384000" />
+      <workItem from="1684457649913" duration="28186000" />
+      <workItem from="1684544507606" duration="27177000" />
+      <workItem from="1684640524793" duration="247000" />
+      <workItem from="1684803953258" duration="24561000" />
+      <workItem from="1684889848850" duration="29084000" />
     </task>
     <task id="LOCAL-00006" summary="1">
       <created>1663124293206</created>
@@ -877,43 +1138,78 @@
       <option name="project" value="LOCAL" />
       <updated>1677744202054</updated>
     </task>
-    <option name="localTasksCounter" value="50" />
+    <task id="LOCAL-00050" summary="支付">
+      <created>1677747671132</created>
+      <option name="number" value="00050" />
+      <option name="presentableId" value="LOCAL-00050" />
+      <option name="project" value="LOCAL" />
+      <updated>1677747671133</updated>
+    </task>
+    <task id="LOCAL-00051" summary="修改">
+      <created>1677749670963</created>
+      <option name="number" value="00051" />
+      <option name="presentableId" value="LOCAL-00051" />
+      <option name="project" value="LOCAL" />
+      <updated>1677749670963</updated>
+    </task>
+    <task id="LOCAL-00052" summary="修改">
+      <created>1677749841418</created>
+      <option name="number" value="00052" />
+      <option name="presentableId" value="LOCAL-00052" />
+      <option name="project" value="LOCAL" />
+      <updated>1677749841418</updated>
+    </task>
+    <task id="LOCAL-00053" summary="修改">
+      <created>1677751401724</created>
+      <option name="number" value="00053" />
+      <option name="presentableId" value="LOCAL-00053" />
+      <option name="project" value="LOCAL" />
+      <updated>1677751401724</updated>
+    </task>
+    <task id="LOCAL-00054" summary="修改请求接口无需token">
+      <created>1677811917087</created>
+      <option name="number" value="00054" />
+      <option name="presentableId" value="LOCAL-00054" />
+      <option name="project" value="LOCAL" />
+      <updated>1677811917087</updated>
+    </task>
+    <option name="localTasksCounter" value="55" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="ZZTest_readDoc - 2022.10.25 at 14h 08m 13s.xml">
-      <configuration name="ZZTest.readDoc" configurationId="JUnit" />
+    <history-entry file="WeChatPayController_textgetPrivateKey - 2023.05.17 at 14h 59m 41s.xml">
+      <configuration name="WeChatPayController.textgetPrivateKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ZZTest_readDoc - 2022.10.25 at 14h 09m 51s.xml">
-      <configuration name="ZZTest.readDoc" configurationId="JUnit" />
+    <history-entry file="WeChatPayController_textgetPrivateKey - 2023.05.17 at 15h 04m 20s.xml">
+      <configuration name="WeChatPayController.textgetPrivateKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ZZTest_readDoc - 2022.10.25 at 14h 11m 28s.xml">
-      <configuration name="ZZTest.readDoc" configurationId="JUnit" />
+    <history-entry file="WeChatPayController_textgetPrivateKey - 2023.05.17 at 15h 07m 39s.xml">
+      <configuration name="WeChatPayController.textgetPrivateKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ZZTest_readDoc - 2022.10.25 at 14h 13m 05s.xml">
-      <configuration name="ZZTest.readDoc" configurationId="JUnit" />
+    <history-entry file="WeChatPayController_textgetPrivateKey - 2023.05.17 at 15h 08m 18s.xml">
+      <configuration name="WeChatPayController.textgetPrivateKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ZZTest_readDoc - 2022.10.25 at 14h 13m 22s.xml">
-      <configuration name="ZZTest.readDoc" configurationId="JUnit" />
+    <history-entry file="WeChatPayController_textgetPrivateKey - 2023.05.17 at 15h 12m 07s.xml">
+      <configuration name="WeChatPayController.textgetPrivateKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ZZTest_readDoc - 2022.10.25 at 14h 17m 45s.xml">
-      <configuration name="ZZTest.readDoc" configurationId="JUnit" />
+    <history-entry file="WeChatPayController_textgetPrivateKey - 2023.05.17 at 15h 13m 48s.xml">
+      <configuration name="WeChatPayController.textgetPrivateKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ZZTest_readDoc - 2022.10.25 at 14h 20m 45s.xml">
-      <configuration name="ZZTest.readDoc" configurationId="JUnit" />
+    <history-entry file="WeChatPayController_textgetPrivateKey - 2023.05.17 at 15h 15m 01s.xml">
+      <configuration name="WeChatPayController.textgetPrivateKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ZZTest_readDoc - 2022.10.25 at 14h 31m 08s.xml">
-      <configuration name="ZZTest.readDoc" configurationId="JUnit" />
+    <history-entry file="VxApiTest_textgetPrivateKey - 2023.05.17 at 15h 43m 51s.xml">
+      <configuration name="VxApiTest.textgetPrivateKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="ZZTest_readDoc - 2022.10.25 at 14h 31m 51s.xml">
-      <configuration name="ZZTest.readDoc" configurationId="JUnit" />
+    <history-entry file="VxApiTest_textgetPrivateKey - 2023.05.17 at 15h 44m 45s.xml">
+      <configuration name="VxApiTest.textgetPrivateKey" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="All_in_peanut_book - 2023.01.13 at 15h 37m 17s.xml">
-      <configuration name="All in peanut_book" configurationId="JUnit" />
+    <history-entry file="VxApiTest_textgetPrivateKey - 2023.05.17 at 15h 46m 15s.xml">
+      <configuration name="VxApiTest.textgetPrivateKey" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1289382000" />
+    <option name="totallyTimeSpent" value="2453410000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -926,91 +1222,103 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4983108" visible="true" weight="0.24786781" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Designer" order="2" />
-      <window_info id="Image Layers" order="3" />
-      <window_info id="Capture Tool" order="4" />
-      <window_info id="UI Designer" order="5" />
-      <window_info id="Favorites" order="6" sideWeight="0.5016892" side_tool="true" weight="0.22547974" />
-      <window_info id="Web" order="7" sideWeight="0.50089127" side_tool="true" weight="0.29264393" />
+      <window_info id="Structure" order="0" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="1" />
+      <window_info id="Image Layers" order="2" />
+      <window_info id="Capture Tool" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" sideWeight="0.5016892" side_tool="true" weight="0.22547974" />
+      <window_info id="Web" order="6" sideWeight="0.50089127" side_tool="true" weight="0.29264393" />
+      <window_info active="true" content_ui="combo" id="Project" order="7" sideWeight="0.4983108" visible="true" weight="0.23306666" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.329718" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.25813448" />
-      <window_info anchor="bottom" x="22" y="339" width="1876" height="361" id="Debug" order="3" sideWeight="0.4989339" weight="0.35791758" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.329718" />
-      <window_info anchor="bottom" id="Spring" order="7" weight="0.329718" />
-      <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" />
-      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5010661" side_tool="true" weight="0.30043384" />
-      <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.329718" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" weight="0.329718" />
-      <window_info anchor="bottom" id="Database Changes" order="13" />
-      <window_info active="true" anchor="bottom" id="Version Control" order="14" visible="true" weight="0.54772234" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.3286334" />
-      <window_info anchor="bottom" id="Build" order="16" weight="0.3286334" />
-      <window_info anchor="bottom" id="SVN Repositories" order="17" weight="0.329718" />
-      <window_info anchor="bottom" id="Problems" order="18" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.159436" />
+      <window_info anchor="bottom" x="22" y="339" width="1876" height="361" id="Debug" order="2" sideWeight="0.49840087" weight="0.5119306" />
+      <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="5" sideWeight="0.49946696" weight="0.329718" />
+      <window_info anchor="bottom" id="Spring" order="6" weight="0.329718" />
+      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.49946696" weight="0.73752713" />
+      <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50186664" side_tool="true" weight="0.1778742" />
+      <window_info anchor="bottom" id="MyBatis Log" order="10" weight="0.6724512" />
+      <window_info anchor="bottom" id="Java Enterprise" order="11" weight="0.329718" />
+      <window_info anchor="bottom" id="Database Changes" order="12" />
+      <window_info anchor="bottom" id="Version Control" order="13" visible="true" weight="0.3470716" />
+      <window_info anchor="bottom" id="Messages" order="14" weight="0.3286334" />
+      <window_info anchor="bottom" id="Build" order="15" weight="0.69522774" />
+      <window_info anchor="bottom" id="SVN Repositories" order="16" weight="0.329718" />
+      <window_info anchor="bottom" id="Problems" order="17" weight="0.28850326" />
+      <window_info anchor="bottom" id="thief-book" order="18" weight="0.329718" />
+      <window_info anchor="bottom" id="Sequence Diagram" order="19" weight="0.9229935" />
+      <window_info anchor="bottom" id="Run" order="20" sideWeight="0.49813333" weight="0.2494577" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.2496" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" sideWeight="0.49920255" weight="0.12100213" />
-      <window_info anchor="right" id="Palette" order="4" />
-      <window_info anchor="right" id="Capture Analysis" order="5" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Json Parser" order="7" weight="0.32995737" />
-      <window_info anchor="right" id="aiXcoder" order="8" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Maven" order="5" sideWeight="0.49920255" weight="0.31306666" />
+      <window_info anchor="right" id="Database" order="6" weight="0.3296" />
+      <window_info anchor="right" id="Json Parser" order="7" weight="0.3296" />
+      <window_info anchor="right" id="aiXcoder" order="8" weight="0.3296" />
       <window_info anchor="right" id="Palette&#9;" order="9" />
       <window_info anchor="right" id="Theme Preview" order="10" />
-      <window_info anchor="right" id="RestServices" order="11" />
-      <window_info anchor="right" id="Bean Validation" order="12" weight="0.32995737" />
+      <window_info anchor="right" id="RestServices" order="11" weight="0.3296" />
+      <window_info anchor="right" id="Bean Validation" order="12" weight="0.3296" />
       <window_info anchor="right" id="Coverage" order="13" sideWeight="0.50079745" side_tool="true" weight="0.12153518" />
+      <window_info anchor="right" id="Word Book" order="14" side_tool="true" />
+      <window_info anchor="right" id="Translation Assistant" order="15" weight="0.32995737" />
+      <window_info anchor="right" id="Read" order="16" />
+      <window_info anchor="right" id="开发助手" order="17" weight="0.32906666" />
     </layout>
     <layout-to-restore>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49910873" weight="0.26012793" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Designer" order="2" />
-      <window_info id="Image Layers" order="3" />
-      <window_info id="Capture Tool" order="4" />
-      <window_info id="UI Designer" order="5" />
-      <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info id="Web" order="7" sideWeight="0.50089127" side_tool="true" weight="0.29264393" />
+      <window_info id="Structure" order="0" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="1" />
+      <window_info id="Image Layers" order="2" />
+      <window_info id="Capture Tool" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Favorites" order="5" sideWeight="0.5016892" side_tool="true" weight="0.22547974" />
+      <window_info id="Web" order="6" sideWeight="0.50089127" side_tool="true" weight="0.29264393" />
+      <window_info active="true" content_ui="combo" id="Project" order="7" sideWeight="0.4983108" visible="true" weight="0.30826667" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.329718" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.25813448" />
-      <window_info active="true" anchor="bottom" x="22" y="339" width="1876" height="361" id="Debug" order="3" sideWeight="0.4989339" visible="true" weight="0.40347072" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.329718" />
-      <window_info anchor="bottom" id="Spring" order="7" weight="0.329718" />
-      <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" />
-      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5010661" side_tool="true" weight="0.30043384" />
-      <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.329718" />
-      <window_info anchor="bottom" id="Java Enterprise" order="12" weight="0.329718" />
-      <window_info anchor="bottom" id="Database Changes" order="13" />
-      <window_info anchor="bottom" id="Version Control" order="14" weight="0.3275488" />
-      <window_info anchor="bottom" id="Messages" order="15" weight="0.3286334" />
-      <window_info anchor="bottom" id="Build" order="16" weight="0.3286334" />
-      <window_info anchor="bottom" id="SVN Repositories" order="17" weight="0.329718" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.159436" />
+      <window_info anchor="bottom" x="22" y="339" width="1876" height="361" id="Debug" order="2" sideWeight="0.49840087" weight="0.29609543" />
+      <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="5" sideWeight="0.49946696" weight="0.329718" />
+      <window_info anchor="bottom" id="Spring" order="6" weight="0.329718" />
+      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.49946696" weight="0.73752713" />
+      <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50133336" side_tool="true" weight="0.87744033" />
+      <window_info anchor="bottom" id="MyBatis Log" order="10" weight="0.6724512" />
+      <window_info anchor="bottom" id="Java Enterprise" order="11" weight="0.329718" />
+      <window_info anchor="bottom" id="Database Changes" order="12" />
+      <window_info anchor="bottom" id="Version Control" order="13" weight="0.3470716" />
+      <window_info anchor="bottom" id="Messages" order="14" weight="0.3286334" />
+      <window_info anchor="bottom" id="Build" order="15" weight="0.5715835" />
+      <window_info anchor="bottom" id="SVN Repositories" order="16" weight="0.329718" />
+      <window_info anchor="bottom" id="Problems" order="17" weight="0.28850326" />
+      <window_info anchor="bottom" id="thief-book" order="18" weight="0.329718" />
+      <window_info anchor="bottom" id="Sequence Diagram" order="19" weight="0.9229935" />
+      <window_info anchor="bottom" id="Run" order="20" sideWeight="0.49866667" visible="true" weight="0.20173536" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.2496" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" sideWeight="0.49920255" weight="0.12100213" />
+      <window_info anchor="right" id="Maven" order="3" sideWeight="0.49920255" weight="0.31306666" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Json Parser" order="7" weight="0.32995737" />
-      <window_info anchor="right" id="aiXcoder" order="8" />
+      <window_info anchor="right" id="Database" order="6" weight="0.32995737" />
+      <window_info anchor="right" id="Json Parser" order="7" weight="0.3296" />
+      <window_info anchor="right" id="aiXcoder" order="8" weight="0.3296" />
       <window_info anchor="right" id="Palette&#9;" order="9" />
       <window_info anchor="right" id="Theme Preview" order="10" />
-      <window_info anchor="right" id="RestServices" order="11" />
-      <window_info anchor="right" id="Bean Validation" order="12" weight="0.32995737" />
+      <window_info anchor="right" id="RestServices" order="11" weight="0.3296" />
+      <window_info anchor="right" id="Bean Validation" order="12" weight="0.3296" />
       <window_info anchor="right" id="Coverage" order="13" sideWeight="0.50079745" side_tool="true" weight="0.12153518" />
+      <window_info anchor="right" id="Word Book" order="14" side_tool="true" />
+      <window_info anchor="right" id="Translation Assistant" order="15" weight="0.32995737" />
+      <window_info anchor="right" id="Read" order="16" />
+      <window_info anchor="right" id="开发助手" order="17" weight="0.32906666" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1073,24 +1381,34 @@
     <MESSAGE value="2" />
     <MESSAGE value="1" />
     <MESSAGE value="支付 库存  运费" />
-    <MESSAGE value="支付" />
     <MESSAGE value="1 优惠券&#10;2 阅读进度" />
-    <option name="LAST_COMMIT_MESSAGE" value="1 优惠券&#10;2 阅读进度" />
+    <MESSAGE value="支付" />
+    <MESSAGE value="修改" />
+    <MESSAGE value="修改请求接口无需token" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改请求接口无需token" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/UserEbookBuyController.java</url>
-          <line>62</line>
-          <properties />
-          <option name="timeStamp" value="1" />
+        <line-breakpoint enabled="true" type="java-method">
+          <url>file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/alipay/controller/AliPayController.java</url>
+          <line>42</line>
+          <properties class="com.peanut.modules.pay.alipay.controller.AliPayController" method="notify_url">
+            <option name="EMULATED" value="true" />
+          </properties>
+          <option name="timeStamp" value="6" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/peanut/common/utils/MD5Utils.java</url>
-          <line>218</line>
+          <url>jar://$MAVEN_REPOSITORY$/com/github/wechatpay-apiv3/wechatpay-apache-httpclient/0.4.9/wechatpay-apache-httpclient-0.4.9.jar!/com/wechat/pay/contrib/apache/httpclient/auth/WechatPay2Validator.class</url>
+          <line>36</line>
           <properties />
-          <option name="timeStamp" value="7" />
+          <option name="timeStamp" value="10" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>jar://$MAVEN_REPOSITORY$/com/github/wechatpay-apiv3/wechatpay-apache-httpclient/0.4.9/wechatpay-apache-httpclient-0.4.9.jar!/com/wechat/pay/contrib/apache/httpclient/auth/WechatPay2Validator.class</url>
+          <line>46</line>
+          <properties />
+          <option name="timeStamp" value="11" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
@@ -1110,380 +1428,383 @@
     </SUITE>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopCategoryEntity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/wx/controller/WeixinApiController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        <state relative-caret-position="1575">
+          <caret line="119" lean-forward="true" selection-start-line="26" selection-start-column="3" selection-end-line="119" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/FMSOrderDetailServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="16" column="13" lean-forward="true" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/app/entity/UserEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/FMSCommodity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-256">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/FMSOrderEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/BuyOrderDetailDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="16" column="17" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/book/BuyOrderDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="750">
-          <caret line="30" column="8" selection-start-line="30" selection-start-column="8" selection-end-line="30" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/AuthorController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="597">
-          <caret line="99" column="35" lean-forward="true" selection-start-line="99" selection-start-column="8" selection-end-line="99" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/ActivityService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="21" column="14" selection-start-line="21" selection-start-column="14" selection-end-line="21" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/dao/ActivityDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="17" column="28" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/CouponService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="313">
-          <caret line="19" column="14" selection-start-line="19" selection-start-column="14" selection-end-line="19" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BuyOrderEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="125" column="7" lean-forward="true" selection-start-line="125" selection-start-column="7" selection-end-line="125" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/ActivityServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="625">
-          <caret line="39" column="9" lean-forward="true" selection-start-line="39" selection-start-column="9" selection-end-line="39" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ActivityController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1425">
-          <caret line="75" selection-start-line="75" selection-end-line="75" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/book/ActivityDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="11" column="78" selection-start-line="11" selection-start-column="78" selection-end-line="11" selection-end-column="78" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/MyUserEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1650">
-          <caret line="70" column="11" lean-forward="true" selection-start-line="70" selection-start-column="11" selection-end-line="70" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ActivityCouponEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ActivityEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="644">
-          <caret line="96" column="34" selection-start-line="96" selection-start-column="34" selection-end-line="96" selection-end-column="34" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/ShopProductController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/common/utils/ConstantPropertiesUtil.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="425">
-          <caret line="37" column="28" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/CouponServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="26" column="27" lean-forward="true" selection-start-line="26" selection-start-column="27" selection-end-line="26" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/common/utils/R.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="693">
-          <caret line="59" column="13" selection-start-line="59" selection-start-column="13" selection-end-line="59" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.3.1/mybatis-plus-extension-3.3.1.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="31" column="20" selection-start-line="31" selection-start-column="20" selection-end-line="31" selection-end-column="20" />
-          <folding>
-            <element signature="e#1318#1319#0" expanded="true" />
-            <element signature="e#1395#1396#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/ShopProductEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="37" column="22" selection-start-line="37" selection-start-column="12" selection-end-line="37" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/5.3.18/spring-beans-5.3.18.jar!/org/springframework/beans/BeanUtils.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
-          <caret line="378" column="23" selection-start-line="378" selection-start-column="23" selection-end-line="378" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookReadRateEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="19" column="26" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="25">
-          <caret line="62" column="24" lean-forward="true" selection-start-line="62" selection-start-column="24" selection-end-line="62" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/common/utils/DateUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="214">
-          <caret line="15" column="26" selection-start-line="15" selection-start-column="26" selection-end-line="15" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/AuthorEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BookShelfService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="17" column="56" lean-forward="true" selection-start-line="17" selection-start-column="56" selection-end-line="17" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookShelfEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="16" column="22" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/PublisherEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/TransactionDetailsEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="20" column="31" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/BuyOrderService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-788">
-          <caret line="268" column="66" lean-forward="true" selection-start-line="268" selection-start-column="66" selection-end-line="268" selection-end-column="66" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="method#queryPage1#0;class#BuyOrderServiceImpl#0" />
-            <element signature="method#sendFMS#0;class#BuyOrderServiceImpl#0" />
-            <element signature="method#checkOrder#0;class#BuyOrderServiceImpl#0" />
-            <element signature="method#checkOrder#1;class#BuyOrderServiceImpl#0" />
-            <element signature="method#blendSendFMS#0;class#BuyOrderServiceImpl#0" />
-            <element signature="method#getTransPrice#0;class#BuyOrderServiceImpl#0" />
-            <element signature="method#getTransPrice#1;class#BuyOrderServiceImpl#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="413" column="38" selection-start-line="413" selection-start-column="38" selection-end-line="413" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/common/Interface/KdApiEOrder.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="89" column="65" lean-forward="true" selection-start-line="89" selection-start-column="65" selection-end-line="89" selection-end-column="65" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/book/CouponDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="21" column="8" lean-forward="true" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/book/CouponHistoryDao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="18" column="74" selection-start-line="18" selection-start-column="74" selection-end-line="18" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/UserEbookBuyEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="19" column="26" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/CouponController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="89" lean-forward="true" selection-start-line="89" selection-end-line="89" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BookController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5663">
-          <caret line="46" column="46" lean-forward="true" selection-start-line="46" selection-start-column="46" selection-end-line="46" selection-end-column="46" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/CouponHistoryController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="39" column="25" lean-forward="true" selection-start-line="39" selection-start-column="25" selection-end-line="39" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/CouponHistoryServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="522">
-          <caret line="82" column="34" lean-forward="true" selection-start-line="82" selection-start-column="34" selection-end-line="82" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/CouponHistoryEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="650">
-          <caret line="60" column="20" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/CouponHistoryService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="25" column="45" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/CouponEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="319">
-          <caret line="83" column="28" selection-start-line="83" selection-start-column="28" selection-end-line="83" selection-end-column="28" />
+          <caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/MyUserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="379">
-          <caret line="385" column="36" selection-start-line="385" selection-start-column="36" selection-end-line="385" selection-end-column="36" />
+        <state relative-caret-position="172">
+          <caret line="305" column="22" lean-forward="true" selection-start-line="305" selection-start-column="22" selection-end-line="305" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/config/ShiroConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="197">
+          <caret line="57" column="59" lean-forward="true" selection-start-line="57" selection-start-column="59" selection-end-line="57" selection-end-column="59" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.3.1/mybatis-plus-extension-3.3.1.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="93" column="14" selection-start-line="93" selection-start-column="14" selection-end-line="93" selection-end-column="14" />
+          <folding>
+            <element signature="e#3364#3365#0" expanded="true" />
+            <element signature="e#3422#3423#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/MyUserEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="159">
+          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/MyUserService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="575">
-          <caret line="28" column="11" selection-start-line="28" selection-start-column="11" selection-end-line="28" selection-end-column="11" />
+        <state relative-caret-position="300">
+          <caret line="18" column="56" lean-forward="true" selection-start-line="18" selection-start-column="56" selection-end-line="18" selection-end-column="56" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookEntity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/TransactionDetailsEntity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
+        <state relative-caret-position="151">
+          <caret line="32" column="24" lean-forward="true" selection-start-line="32" selection-start-column="24" selection-end-line="32" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/applePay/service/impl/ApplePayServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-286">
+          <caret line="140" column="39" selection-start-line="140" selection-start-column="39" selection-end-line="140" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/common/xss/XssFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="29" column="14" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15.jar!/org/apache/http/entity/StringEntity.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="118" column="65" lean-forward="true" selection-start-line="118" selection-start-column="65" selection-end-line="118" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.79/fastjson-1.2.79.jar!/com/alibaba/fastjson/TypeReference.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="197">
+          <caret line="23" column="14" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BookBuyConfigEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="277">
           <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/PayWechatOrderEntity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="264" column="9" lean-forward="true" selection-start-line="264" selection-start-column="9" selection-end-line="264" selection-end-column="9" />
+        <state relative-caret-position="269">
+          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/entity/BuyOrderEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="328">
+          <caret line="74" column="26" lean-forward="true" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WxPayUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-794">
+          <caret line="75" column="26" selection-start-line="75" selection-start-column="26" selection-end-line="75" selection-end-column="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WxPaySearchOrderUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WxPayCommon.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="843">
+          <caret line="138" column="28" selection-start-line="138" selection-start-column="28" selection-end-line="138" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WxPayCallbackUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="23" column="19" selection-start-line="23" selection-start-column="8" selection-end-line="23" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WeChatRefundParam.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="8" column="30" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/common/utils/Query.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-17">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/common/utils/PageUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="367">
+          <caret line="50" column="20" selection-start-line="50" selection-start-column="11" selection-end-line="50" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2795">
+          <caret line="138" column="61" selection-start-line="138" selection-start-column="61" selection-end-line="138" selection-end-column="61" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/service/impl/OrderServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1119">
+          <caret line="133" column="76" selection-start-line="133" selection-start-column="76" selection-end-line="133" selection-end-column="76" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2467">
+          <caret line="257" column="36" selection-start-line="257" selection-start-column="22" selection-end-line="257" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/service/impl/IapVerifyReceiptServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="16" column="7" lean-forward="true" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/service/IapVerifyReceiptService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/service/OrderService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="94">
+          <caret line="12" column="18" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/vo/FailureVo.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="14" column="24" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/Result.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/utils/IapRequestUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="50">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/IOSPay/model/entities/IosPayOrderEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="6" selection-start-column="6" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3506">
+          <caret line="25" selection-start-line="25" selection-end-line="25" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/dto/WxchatCallbackSuccessData.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="12" selection-start-line="12" selection-end-line="17" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/dto/WxchatCallbackRefundData.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-856">
+          <caret line="14" column="5" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/dto/WechatDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="12" selection-end-column="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/dto/WeChatBasePayData.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="25">
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WechatPayValidatorForRequest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="16" column="41" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WechatRefundCallback.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="13" column="21" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/enums/WxTradeState.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="52" selection-start-column="52" selection-end-column="52" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/enums/WxNotifyType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="13" column="21" selection-start-line="13" selection-start-column="21" selection-end-line="13" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/enums/WxApiType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-506">
+          <caret line="7" column="12" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/service/WxpayService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/HttpUtils.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="394">
+          <caret line="76" column="15" lean-forward="true" selection-start-line="76" selection-start-column="15" selection-end-line="76" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-600" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/weChatConfig.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="7" column="16" lean-forward="true" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/peanut/modules/pay/weChatPay/util/WechatPayValidator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="29" column="7" lean-forward="true" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="7" />
         </state>
       </provider>
     </entry>
@@ -1504,7 +1825,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Spring</last-edited>
+          <last-edited>Spring (peanut_book)|Spring</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/src/main/java/com/peanut/common/utils/ExcludeEmptyQueryWrapper.java b/src/main/java/com/peanut/common/utils/ExcludeEmptyQueryWrapper.java
new file mode 100644
index 00000000..3d4f793d
--- /dev/null
+++ b/src/main/java/com/peanut/common/utils/ExcludeEmptyQueryWrapper.java
@@ -0,0 +1,104 @@
+package com.peanut.common.utils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import java.util.Objects;
+
+/**
+ * 继承QueryWrapper，重写其构造条件方法，使条件为null的查询条件，不再执行。
+ * @since Mybatis+ version: 3.x.x
+ * @author firewolf
+ */
+public class ExcludeEmptyQueryWrapper<T> extends QueryWrapper<T> {
+    @Override
+    public QueryWrapper<T> eq(boolean condition, String column, Object val) {
+        if("".equals(val) || Objects.isNull(val)){
+            condition = false;
+        }else{
+            condition = true;
+        }
+        return super.eq(condition, column, val);
+    }
+
+    @Override
+    public QueryWrapper<T> ne(boolean condition, String column, Object val) {
+        condition = !Objects.isNull(val);
+        return super.ne(condition, column, val);
+    }
+
+    @Override
+    public QueryWrapper<T> gt(boolean condition, String column, Object val) {
+        condition = !Objects.isNull(val);
+        return super.gt(condition, column, val);
+    }
+
+    @Override
+    public QueryWrapper<T> ge(boolean condition, String column, Object val) {
+        condition = !Objects.isNull(val);
+        return super.ge(condition, column, val);
+    }
+
+    @Override
+    public QueryWrapper<T> lt(boolean condition, String column, Object val) {
+        condition = !Objects.isNull(val);
+        return super.lt(condition, column, val);
+    }
+
+    @Override
+    public QueryWrapper<T> le(boolean condition, String column, Object val) {
+        condition = !Objects.isNull(val);
+        return super.le(condition, column, val);
+    }
+
+    @Override
+    public QueryWrapper<T> like(boolean condition, String column, Object val) {
+        if("".equals(val) || Objects.isNull(val)){
+            condition = false;
+        }else{
+            condition = true;
+        }
+        return super.like(condition, column, val);
+    }
+
+    @Override
+    public QueryWrapper<T> notLike(boolean condition, String column, Object val) {
+        condition = !Objects.isNull(val);
+        return super.notLike(condition, column, val);
+    }
+
+    @Override
+    public QueryWrapper<T> likeLeft(boolean condition, String column, Object val) {
+        condition = !Objects.isNull(val);
+        return super.likeLeft(condition, column, val);
+    }
+
+    @Override
+    public QueryWrapper<T> likeRight(boolean condition, String column, Object val) {
+        condition = !Objects.isNull(val);
+        return super.likeRight(condition, column, val);
+    }
+
+    @Override
+    public QueryWrapper<T> between(boolean condition, String column, Object val1, Object val2) {
+        if(Objects.isNull(val1) && Objects.isNull(val2)){
+            condition = false;
+        }else if(Objects.isNull(val1)){
+            return super.lt(true,column,val2);
+        }else if(Objects.isNull(val2)){
+            return super.ge(true,column,val1);
+        }
+        return super.between(condition, column, val1, val2);
+    }
+
+    @Override
+    public QueryWrapper<T> notBetween(boolean condition, String column, Object val1, Object val2) {
+        if(Objects.isNull(val1) && Objects.isNull(val2)){
+            condition = false;
+        }else if(Objects.isNull(val1)){
+            return super.lt(true,column,val2);
+        }else if(Objects.isNull(val2)){
+            return super.ge(true,column,val1);
+        }
+        return super.notBetween(condition, column, val1, val2);
+    }
+}
diff --git a/src/main/java/com/peanut/modules/book/dao/PayWechatOrderDao.java b/src/main/java/com/peanut/modules/book/dao/PayWechatOrderDao.java
new file mode 100644
index 00000000..33b5526e
--- /dev/null
+++ b/src/main/java/com/peanut/modules/book/dao/PayWechatOrderDao.java
@@ -0,0 +1,19 @@
+package com.peanut.modules.book.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.peanut.modules.book.entity.PayWechatOrderEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 微信订单表
+ * 
+ * @author yl
+ * @email yl328572838@163.com
+ * @date 2022-08-29 15:27:44
+ */
+@Repository
+@Mapper
+public interface PayWechatOrderDao extends BaseMapper<PayWechatOrderEntity> {
+	
+}
diff --git a/src/main/java/com/peanut/modules/book/entity/PayWechatOrderEntity.java b/src/main/java/com/peanut/modules/book/entity/PayWechatOrderEntity.java
new file mode 100644
index 00000000..8ca7bcde
--- /dev/null
+++ b/src/main/java/com/peanut/modules/book/entity/PayWechatOrderEntity.java
@@ -0,0 +1,75 @@
+package com.peanut.modules.book.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 微信订单表
+ * 
+ * @author yl
+ * @email yl328572838@163.com
+ * @date 2022-08-29 15:27:44
+ */
+@Data
+@TableName("pay_wechat_order")
+public class PayWechatOrderEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Long id;
+
+	/**
+	 *  预支付交易会话标识
+	 */
+	private String prepayId;
+
+	/**
+	 * 用户Id
+	 */
+	private Integer customerId;
+
+	/**
+	 * 订单编号
+	 */
+	private String orderSn;
+
+	/**
+	 * 支付金额
+	 */
+	private BigDecimal totalAmount;
+
+	/**
+	 * 创建订单时间
+	 */
+	private Date createTime;
+
+	/**
+	 * 系统日志
+	 */
+	private String systemLog;
+
+	/**
+	 * 交易类型
+	 */
+	private String payType;
+
+	/**
+	 * 订单Id
+	 */
+	private String orderId;
+
+	/**
+	 * 购买配置id
+	 */
+	private Integer buyOrderId;
+
+
+}
diff --git a/src/main/java/com/peanut/modules/book/service/PayWechatOrderService.java b/src/main/java/com/peanut/modules/book/service/PayWechatOrderService.java
new file mode 100644
index 00000000..2fcbfdbe
--- /dev/null
+++ b/src/main/java/com/peanut/modules/book/service/PayWechatOrderService.java
@@ -0,0 +1,20 @@
+package com.peanut.modules.book.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.peanut.common.utils.PageUtils;
+import com.peanut.modules.book.entity.PayWechatOrderEntity;
+
+import java.util.Map;
+
+/**
+ * 微信订单表
+ *
+ * @author yl
+ * @email yl328572838@163.com
+ * @date 2022-08-29 15:27:44
+ */
+public interface PayWechatOrderService extends IService<PayWechatOrderEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+
diff --git a/src/main/java/com/peanut/modules/book/service/impl/PayWechatOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PayWechatOrderServiceImpl.java
new file mode 100644
index 00000000..d0ef42a4
--- /dev/null
+++ b/src/main/java/com/peanut/modules/book/service/impl/PayWechatOrderServiceImpl.java
@@ -0,0 +1,30 @@
+package com.peanut.modules.book.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.common.utils.PageUtils;
+import com.peanut.common.utils.Query;
+import com.peanut.modules.book.dao.PayWechatOrderDao;
+import com.peanut.modules.book.entity.PayWechatOrderEntity;
+import com.peanut.modules.book.service.PayWechatOrderService;
+import com.peanut.modules.book.service.PayZfbOrderService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+@Service("payWechatOrderService")
+public class PayWechatOrderServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOrderEntity> implements PayWechatOrderService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<PayWechatOrderEntity> page = this.page(
+                new Query<PayWechatOrderEntity>().getPage(params),
+                new QueryWrapper<PayWechatOrderEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java b/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java
new file mode 100644
index 00000000..b763190f
--- /dev/null
+++ b/src/main/java/com/peanut/modules/pay/IOSPay/controller/AppController.java
@@ -0,0 +1,278 @@
+package com.peanut.modules.pay.IOSPay.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.peanut.common.utils.*;
+import com.peanut.modules.book.entity.*;
+import com.peanut.modules.book.service.*;
+import com.peanut.modules.pay.IOSPay.Result;
+import com.peanut.modules.pay.IOSPay.constant.VerifyReceiptConstant;
+import com.peanut.modules.pay.IOSPay.model.dto.IapRequestDTO;
+import com.peanut.modules.pay.IOSPay.model.dto.IapResponseDTO;
+import com.peanut.modules.pay.IOSPay.model.entities.IosPayOrderEntity;
+
+import com.peanut.modules.pay.IOSPay.service.IapVerifyReceiptService;
+import com.peanut.modules.pay.IOSPay.service.OrderService;
+import com.peanut.modules.pay.IOSPay.vo.FailureVo;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@RestController
+@RequestMapping(value = "/Ipa")
+@RequiredArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+@Configuration
+public class AppController {
+    @Autowired
+    IapVerifyReceiptService iapVerifyReceiptService;
+    @Autowired
+    OrderService orderService;
+    @Autowired
+    private MyUserService userService;
+    @Autowired
+    private BookBuyConfigService bookBuyConfigService;
+    @Autowired
+    private TransactionDetailsService transactionDetailsService;
+    @Autowired
+    private PayPaymentOrderService payPaymentOrderService;
+    @Autowired
+    private BuyOrderService buyOrderService;
+
+
+    @RequestMapping(value = "/text", method = RequestMethod.POST)
+    public String verif() {
+        return "test";
+    }
+
+    /**
+     * 苹果内购二次校验
+     *
+     * @param dto 入参: 订单id, 苹果凭证
+     * @return 验证结果
+     */
+
+
+    @RequestMapping(value = "/veri", method = RequestMethod.POST)
+    public Result verifyIap(@RequestBody IapRequestDTO dto) {
+
+
+        Lock lock = new ReentrantLock();
+        lock.lock();
+
+        try {
+
+
+            System.out.println("==============veri=================================" + dto);
+            // 1. 校验入参
+            if (dto == null)
+                return Result.error("入参不能为空");
+            if (dto.getOrderId().isEmpty()) {
+                return Result.error("订单id不能为空");
+            }
+            if (dto.getProductId().isEmpty()) {
+                return Result.error("订单号不能为空");
+            }
+            if (dto.getTransactionId().isEmpty())
+                return Result.error("内购订单号不能为空");
+            if (dto.getReceiptData().isEmpty())
+                return Result.error("凭证不能为空");
+
+            IapResponseDTO receipt = iapVerifyReceiptService.verifyIapReceipt(dto.getReceiptData(), dto.isSandBox());
+            BuyOrderEntity order2 = this.buyOrderService.getOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", dto.getOrderId()).eq("del_flag", "0"));
+            order2.setPaymentDate(new Date());
+            System.out.println("============order2=================" + order2);
+            this.buyOrderService.updateById(order2);
+
+            IosPayOrderEntity order = new IosPayOrderEntity();
+
+            //todo  判断状态 订单状态  0-未付款 1-待发货 2-已发货 3-交易成功 4-交易失败
+            System.out.println("============保存中=================" + order);
+            String order01 = order.getOrderid();
+            String order02 = order2.getOrderSn();
+            if (order01 == order02) {
+
+                return Result.ok();
+
+            }
+            else
+            if (order01 == null ) {
+
+
+
+
+
+                // 3.1 校验bundle id
+                if (!receipt.getReceipt().getBundle_id().equals(VerifyReceiptConstant.APP_BUNDLE_IDENTIFIER)) {
+                    return Result.error1();
+                }
+
+
+
+                if (receipt.getStatus().equals("0")) {
+                    for (IapResponseDTO.AppleOrder appleOrder : receipt.getReceipt().getIn_app()) {
+                        if (appleOrder.getTransaction_id().equals(dto.getTransactionId()) &&
+                                appleOrder.getProduct_id().equals(dto.getProductId())) {
+                            System.out.println("开始进入判断3"+appleOrder.getTransaction_id()+"====="+dto.getTransactionId()+"====="+
+                                    appleOrder.getProduct_id()+"====="+dto.getProductId());
+
+
+                            order.setOrderid(dto.getOrderId());
+                            order.setReceiptData(dto.getReceiptData());
+                            order.setProductID(dto.getProductId());
+                            order.setTransactionId(dto.getTransactionId());
+                            order.setCustomerOid(dto.getCustomerOid());
+                            order.setOrderStatus(order2.getOrderStatus());
+                            order.setDelFlag(order2.getDelFlag());
+                            order.setCloseOrder(0);
+                            order.setCreateTime(new Date());
+                            order.setFailureflag(dto.getFailureflag());
+                            orderService.saveOrUpdate(order);
+                            String customerid = dto.getCustomerOid();
+                            String subject = "point";
+                            String body = dto.getProductId();
+                            if ("point".equals(subject)) {
+                                // 插入花生币  变动记录
+                                System.out.printf("body====:" + body);
+                                BookBuyConfigEntity bookBuyConfigEntity = this.bookBuyConfigService.getById(Integer.valueOf(body));
+                                String realMoney = bookBuyConfigEntity.getMoney();
+                                Integer money = Integer.valueOf(realMoney);
+                                userService.rechargeHSPoint(Integer.valueOf(customerid), money);
+                                TransactionDetailsEntity transactionDetailsEntity = new TransactionDetailsEntity();
+                                transactionDetailsEntity.setUserId(Integer.valueOf(customerid));
+                                transactionDetailsEntity.setChangeAmount(new BigDecimal(money));
+                                transactionDetailsEntity.setOrderType("充值");
+                                transactionDetailsEntity.setRelationId(order.getId());
+                                transactionDetailsEntity.setRemark("充值");
+                                System.out.println("===============进入了point获取ID=========================" + order.getId());
+                                MyUserEntity user = userService.getById(Integer.valueOf(customerid));
+                                BigDecimal peanutCoin = user.getPeanutCoin();
+                                transactionDetailsEntity.setUserBalance(peanutCoin);
+                                transactionDetailsEntity.setUserName(user.getNickname());
+                                transactionDetailsEntity.setTel(user.getTel());
+                                transactionDetailsService.save(transactionDetailsEntity);
+                                // 插入 花生币 充值记录
+                                PayPaymentOrderEntity payPaymentOrderEntity = new PayPaymentOrderEntity();
+                                payPaymentOrderEntity.setUserId(Integer.valueOf(customerid));
+                                payPaymentOrderEntity.setOrderId(order.getTransactionId());
+                                payPaymentOrderEntity.setRealAmount(new BigDecimal(bookBuyConfigEntity.getRealMoney()));
+                                payPaymentOrderEntity.setRechargeAmount(new BigDecimal(bookBuyConfigEntity.getMoney()));
+                                payPaymentOrderEntity.setRechargeChannel(bookBuyConfigEntity.getQudao());
+                                payPaymentOrderEntity.setRechargeStatus("success");
+                                payPaymentOrderEntity.setSuccessTime(new Date());
+                                payPaymentOrderEntity.setUserName(user.getNickname());
+                                payPaymentOrderEntity.setTel(user.getTel());
+                                payPaymentOrderService.save(payPaymentOrderEntity);
+                                buyOrderService.updateOrderStatus(Integer.valueOf(customerid), dto.getOrderId(), "2");
+                                order.setMoney(Integer.valueOf(bookBuyConfigEntity.getRealMoney()));
+                                order.setUsername(user.getName());
+                                orderService.saveOrUpdate(order);
+                                System.out.println("==========ok================================================================================================================================================");
+
+
+                            }
+                                orderService.update();
+                            System.out.println("==========ok================================================================================================================================================");
+
+
+
+
+                        }
+                    }
+                    return Result.ok0();
+                }
+
+                return Result.ok("第一次付款成功");
+
+
+            }
+            return Result.nook(500,"订单加载失败");
+        } finally {
+            lock.unlock();
+
+        }
+//        return null;
+    }
+
+
+
+    /**
+     * 修改
+     */
+
+    @RequestMapping(value = "/failure")
+//    @RequestBody
+    public Result update(@Validated @RequestBody IapRequestDTO vo) {
+        System.out.println("=========entity1111================"+vo);
+
+        IosPayOrderEntity order = new IosPayOrderEntity();
+
+        order.setOrderid(vo.getOrderId());
+        order.setReceiptData(vo.getReceiptData());
+        order.setProductID(vo.getProductId());
+        order.setTransactionId(vo.getTransactionId());
+        System.out.println("=========dto.getTransactionId()============" + vo.getTransactionId());
+        order.setCustomerOid(vo.getCustomerOid());
+        order.setCloseOrder(0);
+        order.setCreateTime(new Date());
+        order.setFailureflag(vo.getFailureflag());
+        System.out.println("============v0===================================================================================="+vo.getFailureflag());
+        orderService.saveOrUpdate(order);
+        System.out.println("=======order================"+order);
+
+
+
+
+        return Result.updateok();
+
+
+    }
+
+
+
+    /**
+     * 查询失败数据接口
+     */
+//    @Transactional
+    @RequestMapping(value = "/showFailure")
+    public R showFailure(@RequestParam Map<String, Object> params  )throws Exception{
+
+        PageUtils pageUtils = orderService.queryPage1(params);
+
+        return R.ok().put("page",pageUtils);
+
+
+
+    }
+
+    /**
+     * 列表
+     */
+    @RequestMapping(value = "/list",method = RequestMethod.GET)
+    public R list(@RequestParam Map<String, Object> params)throws Exception  {
+
+
+        PageUtils pageUtils = orderService.queryPage1(params);
+
+        return R.ok().put("page", pageUtils);
+    }
+
+}
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/peanut/modules/pay/applePay/controller/ApplePayController.java b/src/main/java/com/peanut/modules/pay/applePay/controller/ApplePayController.java
new file mode 100644
index 00000000..8ab8a955
--- /dev/null
+++ b/src/main/java/com/peanut/modules/pay/applePay/controller/ApplePayController.java
@@ -0,0 +1,150 @@
+package com.peanut.modules.pay.applePay.controller;
+
+
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.peanut.common.utils.R;
+import com.peanut.modules.pay.applePay.service.ApplePayService;
+import com.peanut.modules.pay.applePay.utils.ApplePayUtil;
+import com.peanut.modules.pay.applePay.utils.IPayNotifyPo;
+import com.peanut.modules.pay.IOSPay.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@Api(tags = {"苹果内购"})
+@RequestMapping(value = "/apple")
+public class ApplePayController {
+    @Autowired
+    ApplePayService applePayService;
+    @Autowired
+    ApplePayUtil applePayUtil;
+
+    /**
+     * @param :TransactionID订单号
+         * @param :receipt订单加密收据
+     * @Description: Ios客户端内购支付
+     */
+//    @PostMapping  文档显示都是post请求
+    @RequestMapping("/applePay")
+
+    public R doIosRequest(@RequestParam("receipt") String receipt, @RequestParam("TransactionID") String TransactionID) {
+        String verifyResult = applePayUtil.buyAppVerify(receipt, 0);
+        //苹果服务器没有返回验证结果
+        if (verifyResult == null) {
+            return R.error(500,"服务器未接收到验证结果！");
+//            return Result.failed(ResultCode.APPLE_NULL);
+        } else {
+            //
+            return applePayService.getAppPay(verifyResult, TransactionID);
+
+//            return  applePayService.doIosRequest(TransactionID,receipt,userId);
+
+        }
+    }
+
+
+    /**
+     * IOS支付成功后通过APP回调服务器
+     *
+     * @param iPayNotifyPo
+     * @return
+     */
+    @ApiOperation("ios支付成功后验证结果")
+    @RequestMapping(value = "iPayNotify/", method = RequestMethod.POST)
+    @ResponseBody
+    public Result<Object> iPayNotify(@RequestBody IPayNotifyPo iPayNotifyPo) {
+        log.info("ios支付成功后验证结果[前端传递的ios支付参数:{}]", iPayNotifyPo.toString());
+        System.out.println("支付");
+        String receipt = iPayNotifyPo.getTransactionReceipt();
+        // 拿到收据的MD5
+        String receiptMd5 = SecureUtil.md5(receipt);
+        // 查询数据库，看是否是己经验证过的该支付收据
+//        boolean existsIOSReceipt = paymentService.isExistsIOSReceipt(receiptMd5);
+//        if (existsIOSReceipt) {
+//            return Result.error("该充值已完成");
+//        }
+
+        // 1.先线上测试    发送平台验证
+
+
+        String verifyResult =	ApplePayUtil.buyAppVerify(receipt, 0);
+
+
+        log.info("1，苹果返回的参数:{}]", verifyResult);
+        if (verifyResult == null) {
+            // 苹果服务器没有返回验证结果
+            log.info("苹果服务器没有返回验证结果");
+            return Result.error("订单没有找到");
+        } else {
+            // 苹果验证有返回结果
+            JSONObject job = JSONUtil.parseObj(verifyResult);
+            log.info("2，[苹果验证返回的json串:{}]", job.toString());
+            String states = job.getStr("status");
+
+            if ("21007".equals(states)) {
+                log.debug("是沙盒环境，应沙盒测试，否则执行下面");
+                // 是沙盒环境，应沙盒测试，否则执行下面
+                // 2.再沙盒测试  发送平台验证
+                verifyResult = ApplePayUtil.buyAppVerify(receipt, 0);
+                job = JSONUtil.parseObj(verifyResult);
+                log.debug("3，沙盒环境验证返回的json字符串=" + job.toString());
+                states = job.getStr("status");
+            }
+            if ("0".equals(states)) { // 前端所提供的收据是有效的    验证成功
+                log.debug("前端所提供的收据是有效的    验证成功");
+                String r_receipt = job.getStr("receipt");
+                JSONObject returnJson = JSONUtil.parseObj(r_receipt);
+                String in_app = returnJson.getStr("in_app");
+
+                /**
+                 * in_app说明：
+                 * 验证票据返回的receipt里面的in_app字段，这个字段包含了所有你未完成交易的票据信息。也就是在上面说到的APP完成交易之后，这个票据信息，就会从in_app中消失。
+                 * 如果APP不完成交易，这个票据信息就会在in_app中一直保留。(这个情况可能仅限于你的商品类型为消耗型)
+                 *
+                 * 知道了事件的原委，就很好优化解决了，方案有2个
+                 * 1.对票据返回的in_app数据全部进行处理，没有充值的全部进行充值
+                 * 2.仅对最新的充值信息进行处理（我们采取的方案）
+                 *
+                 * 因为采用一方案：
+                 * 如果用户仅进行了一次充值，该充值未到账，他不再进行充值了，那么会无法导致。
+                 * 如果他通过客服的途径已经进行了补充充值，那么他在下一次充值的时候依旧会把之前的产品票据带回，这时候有可能出现重复充值的情况
+                 *
+                 * 以上说明是我在网上找到的，可以查看原文
+                 * https://www.cnblogs.com/widgetbox/p/8241333.html
+                 */
+
+                JSONArray jsonArray = JSONUtil.parseArray(in_app);
+                if (jsonArray.size() > 0) {
+                    int index = 0;
+                    JSONObject o = JSONUtil.parseObj(jsonArray.get(index));
+                    String transaction_id = o.getStr("transaction_id"); // 订单号
+                    String product_id = o.getStr("product_id"); // 产品id，也就是支付金额
+                    String purchase_date_ms = o.getStr("purchase_date_ms"); // 支付时间
+//
+//                    // 添加支付金额
+//                    Result<Object> iosChargeSuccess = paymentService.iosChargeSuccess(transaction_id, product_id, purchase_date_ms, receiptMd5, iPayNotifyPo.getMoneyId(), iPayNotifyPo.getUserId());
+//                    int i =0;
+//                    int a = 0;
+//                    if (iosChargeSuccess.getCode().equals(200)){
+//                        i = paymentService.updateCurrentState(iPayNotifyPo.getPayId(),iPayNotifyPo.getUserId(),a);
+//                    }else {
+//                        a = 1;
+//                        i = paymentService.updateCurrentState(iPayNotifyPo.getPayId(),iPayNotifyPo.getUserId(),a);
+//                    }
+//
+//                    return iosChargeSuccess;
+                }
+            } else {
+                return Result.error("收到数据有误");
+            }
+        }
+        return Result.ok();
+    }
+}
diff --git a/src/main/java/com/peanut/modules/pay/applePay/controller/IapController.java b/src/main/java/com/peanut/modules/pay/applePay/controller/IapController.java
new file mode 100644
index 00000000..a9a664ac
--- /dev/null
+++ b/src/main/java/com/peanut/modules/pay/applePay/controller/IapController.java
@@ -0,0 +1,133 @@
+package com.peanut.modules.pay.applePay.controller;
+
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author :
+ * @date :
+ * @Version: 1.0
+ * @Desc : 苹果支付 参考地址：https://www.cnblogs.com/shoshana-kong/p/10991753.html
+ * sendHttpsCoon 方法里面包含了增加的业务逻辑
+ * 本类引入多种的Json序列化工具，选择了Hutool
+ */
+
+
+
+
+@RestController
+@RequestMapping("iap")
+public class IapController {
+
+    //购买凭证验证地址
+    private static final String certificateUrl = "https://buy.itunes.apple.com/verifyReceipt";
+
+    //测试的购买凭证验证地址
+    private static final String certificateUrlTest = "https://sandbox.itunes.apple.com/verifyReceipt";
+
+    /**
+     * 重写X509TrustManager
+     */
+    private static TrustManager myX509TrustManager = new X509TrustManager() {
+
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+            return null;
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+
+        }
+
+        @Override
+        public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+
+        }
+    };
+
+    /**
+     * 接收iOS端发过来的购买凭证
+     * @param userId
+     * @param receipt
+     * @param chooseEnv
+     */
+    @RequestMapping("/setIapCertificate")
+    public String setIapCertificate(String userId, String receiptData, boolean chooseEnv){
+        if(StringUtils.isEmpty(userId) || StringUtils.isEmpty(receiptData)){
+            return null;
+
+        }
+        String url = null;
+        url = chooseEnv == true? certificateUrl:certificateUrlTest;
+        final String certificateCode = receiptData;
+        if(StringUtils.isNotEmpty(certificateCode)){
+            return sendHttpsCoon(url, certificateCode);
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * 发送请求
+     * @param url
+     * @param strings
+     * @return
+     */
+    private String sendHttpsCoon(String url, String code){
+        if(url.isEmpty()){
+            return null;
+        }
+        try {
+            //设置SSLContext
+            SSLContext ssl = SSLContext.getInstance("SSL");
+            ssl.init(null, new TrustManager[]{myX509TrustManager}, null);
+
+            //打开连接
+            HttpsURLConnection conn = (HttpsURLConnection) new URL(url).openConnection();
+            //设置套接工厂
+            conn.setSSLSocketFactory(ssl.getSocketFactory());
+            //加入数据
+            conn.setRequestMethod("POST");
+            conn.setDoOutput(true);
+            conn.setRequestProperty("Content-type","application/json");
+
+            JSONObject obj = new JSONObject();
+            obj.put("receipt-data", code);
+
+            BufferedOutputStream buffOutStr = new BufferedOutputStream(conn.getOutputStream());
+            buffOutStr.write(obj.toString().getBytes());
+            buffOutStr.flush();
+            buffOutStr.close();
+
+            //获取输入流
+            BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+
+            String line = null;
+            StringBuffer sb = new StringBuffer();
+            while((line = reader.readLine())!= null){
+                sb.append(line);
+            }
+            return sb.toString();
+
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}
+
diff --git a/src/main/java/com/peanut/modules/pay/applePay/service/ApplePayService.java b/src/main/java/com/peanut/modules/pay/applePay/service/ApplePayService.java
new file mode 100644
index 00000000..0cd2f4c4
--- /dev/null
+++ b/src/main/java/com/peanut/modules/pay/applePay/service/ApplePayService.java
@@ -0,0 +1,36 @@
+package com.peanut.modules.pay.applePay.service;
+
+import com.peanut.common.utils.R;
+import com.peanut.modules.pay.IOSPay.Result;
+import org.springframework.stereotype.Service;
+
+@Service
+public interface ApplePayService {
+
+  /**
+   * 看是否是己经验证过的该支付收据
+   * @param receiptMd5
+   * @return
+   */
+
+  public boolean isExistsIOSReceipt(String receiptMd5);
+
+
+  int  updateCurrentState(String payId, String userId, int a);
+
+  /**
+   * IOS支付
+   * @param transaction_id 订单号
+   * @param product_id 产品id，也就是支付金额
+   * @param purchase_date_ms 支付时间
+   * @param receiptMd5 拿到收据的MD5
+   * @param moneyId 金额id
+   */
+  Result<Object> iosChargeSuccess(String transaction_id, String product_id, String purchase_date_ms, String receiptMd5, String moneyId, String userId);
+
+
+
+  R getAppPay(String verifyResult, String transactionID);
+
+
+}
diff --git a/src/main/java/com/peanut/modules/pay/applePay/service/impl/ApplePayServiceImpl.java b/src/main/java/com/peanut/modules/pay/applePay/service/impl/ApplePayServiceImpl.java
new file mode 100644
index 00000000..c24ee432
--- /dev/null
+++ b/src/main/java/com/peanut/modules/pay/applePay/service/impl/ApplePayServiceImpl.java
@@ -0,0 +1,214 @@
+package com.peanut.modules.pay.applePay.service.impl;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.peanut.common.utils.DateUtils;
+import com.peanut.common.utils.R;
+import com.peanut.modules.book.entity.*;
+import com.peanut.modules.book.service.*;
+import com.peanut.modules.pay.IOSPay.Result;
+import com.peanut.modules.pay.applePay.service.ApplePayService;
+import com.peanut.modules.pay.applePay.utils.*;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+
+
+@Service("ApplePayService")
+@Slf4j
+@AllArgsConstructor
+public class ApplePayServiceImpl implements ApplePayService {
+
+//   日志记录，系统支付模块记录日志信息输出到sys-pay
+    private static final Logger logger = LoggerFactory.getLogger("sys-pay");
+
+    @Autowired
+    private MyUserService userService;
+    @Autowired
+    private BuyOrderService buyOrderService;
+    @Autowired
+    private TransactionDetailsService transactionDetailsService;
+    @Autowired
+    private  ApplePayUtil applePayUtil;
+    @Autowired
+    private BookBuyConfigService bookBuyConfigService;
+    @Autowired
+    private PayPaymentOrderService payPaymentOrderService;
+    @Autowired
+    public static final String TRADE_TYPE_APP = "APP";
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Override
+    public boolean isExistsIOSReceipt(String receiptMd5) {
+        return false;
+    }
+
+
+    @Resource
+    private TsBillMapper tsBillMapper;
+    /**
+     * 支付成功之后将当前订单的状态改为1
+     *
+     * @param payId
+     * @param userId
+     * @param a
+     * @return
+     */
+    @Override
+    public int updateCurrentState(String payId, String userId, int a) {
+        return 0;
+    }
+
+
+    /**
+     * IOS支付
+     * @param transaction_id 订单号
+     * @param product_id 产品id，也就是支付金额
+     * @param purchase_date_ms 支付时间
+     * @param receiptMd5 拿到收据的MD5
+     * @param moneyId 金额id
+     */
+    @Override
+    public Result<Object> iosChargeSuccess(String transaction_id, String product_id, String purchase_date_ms, String receiptMd5, String moneyId, String userId) {
+        /**
+         * IOS支付
+         * @param transaction_id 订单号
+         * @param product_id 产品id，也就是支付金额
+         * @param purchase_date_ms 支付时间
+         * @param receiptMd5 拿到收据的MD5
+         * @param moneyId 金额id
+         */
+
+        try {
+            List<Map<String, Object>> queryForList = jdbcTemplate.queryForList("SELECT id,showcoin_num,give_showcoin_num,rmb_price from tsm_payment_config_ios where product_id =? ",
+                    moneyId);
+
+            if (queryForList.size() > 0) {
+                String bill_content = "充值";//账单产生方式
+                int bill_state = 1;// 充值
+                int current_state = 1;// 支付成功
+                int payment_method = 3;// IOS
+                String date = DateUtils.DATE_TIME_PATTERN;// 当前时间
+                BigDecimal amountofmoney = new BigDecimal(queryForList.get(0).get("rmb_price").toString());// 金额
+                String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+                // 生成消费订单
+                //String sql = "insert into ts_bill (id,users_id,payment_config_id,bill_num,bill_content,bill_sumofmoney,bill_state,current_state,payment_method,receipt,createtdate) value(?,?,?,?,?,?,?,?,?,?,?);";
+                //jdbcTemplate.update(sql, uuid,userId,moneyId,transaction_id,bill_content,amountofmoney,bill_state,current_state,payment_method,receiptMd5,date);
+
+                String type = "1";// 加
+                long showcoin_num = Long.parseLong(queryForList.get(0).get("showcoin_num").toString()) + Long.parseLong(queryForList.get(0).get("give_showcoin_num").toString());
+
+
+                // 此操作为需求实际场景可根据用户产品需求更改
+                //commonServiceI.updShowcoinNum(type, userId, showcoin_num);
+
+                return Result.ok("支付成功");
+            } else {
+                return Result.error("操作异常，所选金额不存在");
+            }
+        } catch (Exception e) {
+            return Result.error("ios支付异常");
+        }
+
+
+    }
+
+    @Override
+    public R getAppPay(String verifyResult, String transactionID) {
+        log.info("##########################苹果支付验证！########################");
+        JSONObject jsonObject = JSONObject.parseObject(verifyResult);
+        String status = jsonObject.getString("status");
+        //判断是否验证成功
+        if ("0".equals(status)) {
+            //app端所提供的收据是有效的,验证成功
+            String receipt = jsonObject.getString("receipt");
+            JSONObject returnJson = JSONObject.parseObject(receipt);
+            String in_app = returnJson.getString("in_app");
+            JSONObject in_appJson = JSONObject.parseObject(in_app.substring(1, in_app.length() - 1));
+            String transactionId = in_appJson.getString("transaction_id");
+            String in_app_ownership_type = in_appJson.getString("in_app_ownership_type");
+            //如果验证后的订单号与app端传来的订单号一致并且状态为已支付状态则处理自己的业务
+            if (transactionID.equals(transactionId) && "PURCHASED".equals(in_app_ownership_type)) {
+                //===================处理自己的业务 ============================
+                BuyOrderEntity order = this.buyOrderService.getOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", transactionId ));
+                PayWechatOrderEntity wechat = new PayWechatOrderEntity();
+
+
+
+
+                if ("vip".equals(order.getOrderType())) {
+                    //会员记录
+                    BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(wechat.getBuyOrderId());
+                    String month = bookBuyConfigEntity.getMonth();
+                    userService.openMember(Integer.valueOf(transactionId),Integer.valueOf(month));
+                    buyOrderService.updateOrderStatus(Integer.valueOf(transactionId),order.getOrderSn(),"2");
+
+
+
+                }
+                if ("order".equals(order.getOrderType())) {
+
+                    BuyOrderEntity orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", wechat.getOrderId()));
+                    BigDecimal realMoney = orderEntity.getRealMoney();
+                    //更新 订单 记录
+
+                }
+                if ("point".equals(order.getOrderType())) {
+
+                    BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(wechat.getBuyOrderId());
+                    String realMoney = bookBuyConfigEntity.getRealMoney();
+                    Integer money = Integer.valueOf(realMoney);
+                    userService.rechargeHSPoint(Integer.valueOf(order.getUserId()),money);
+                    TransactionDetailsEntity transactionDetailsEntity = new TransactionDetailsEntity();
+                    transactionDetailsEntity.setUserId(Integer.valueOf(order.getUserId()));
+                    transactionDetailsEntity.setChangeAmount(new BigDecimal(money));
+                    transactionDetailsEntity.setOrderType("充值");
+                    transactionDetailsEntity.setRelationId(wechat.getId().intValue());
+                    transactionDetailsEntity.setRemark("充值");
+
+                    MyUserEntity user = userService.getById(Integer.valueOf(order.getUserId()));
+                    BigDecimal peanutCoin = user.getPeanutCoin();
+                    transactionDetailsEntity.setUserBalance(peanutCoin);
+                    transactionDetailsEntity.setUserName(user.getNickname());
+                    transactionDetailsEntity.setTel(user.getTel());
+                    transactionDetailsService.save(transactionDetailsEntity);
+                    // 插入 花生币 充值记录
+                    PayPaymentOrderEntity payPaymentOrderEntity = new PayPaymentOrderEntity();
+                    payPaymentOrderEntity.setUserId(Integer.valueOf(order.getUserId()));
+                    payPaymentOrderEntity.setOrderId(String.valueOf(wechat.getId()));
+                    payPaymentOrderEntity.setRealAmount(new BigDecimal(bookBuyConfigEntity.getRealMoney()));
+                    payPaymentOrderEntity.setRechargeAmount(new BigDecimal(bookBuyConfigEntity.getMoney()));
+                    payPaymentOrderEntity.setRechargeChannel(bookBuyConfigEntity.getQudao());
+                    payPaymentOrderEntity.setRechargeStatus("success");
+                    payPaymentOrderEntity.setSuccessTime(new Date());
+                    payPaymentOrderEntity.setUserName(user.getNickname());
+                    payPaymentOrderEntity.setTel(user.getTel());
+                    payPaymentOrderService.save(payPaymentOrderEntity);
+                    buyOrderService.updateOrderStatus(Integer.valueOf(order.getUserId()),order.getOrderSn(),"2");
+                    // 插入花生币  变动记录
+
+
+
+                }
+            }
+            return R.ok();
+        }
+        return R.error("苹果内购验证失败");
+    }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/peanut/modules/pay/applePay/utils/ApplePayUtil.java b/src/main/java/com/peanut/modules/pay/applePay/utils/ApplePayUtil.java
new file mode 100644
index 00000000..0d2cc6f1
--- /dev/null
+++ b/src/main/java/com/peanut/modules/pay/applePay/utils/ApplePayUtil.java
@@ -0,0 +1,159 @@
+package com.peanut.modules.pay.applePay.utils;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import sun.misc.BASE64Decoder;
+
+import javax.net.ssl.*;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Locale;
+
+@Component
+public class ApplePayUtil {
+
+
+    private static class TrustAnyTrustManager implements X509TrustManager {
+
+
+        @Override
+        public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+        }
+
+        @Override
+        public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+        }
+
+        @Override
+        public X509Certificate[] getAcceptedIssuers() {
+            return new X509Certificate[]{};
+        }
+    }
+
+    private static class TrustAnyHostnameVerifier implements HostnameVerifier {
+        @Override
+        public boolean verify(String hostname, SSLSession session) {
+            return true;
+        }
+    }
+
+    private static String  url_apple_pay = "https://buy.itunes.apple.com/verifyReceipt";
+
+
+
+    private static String test_url_apple_pay = "https://sandbox.itunes.apple.com/verifyReceipt";
+
+
+    /**
+     * 苹果服务器验证
+     *
+     * @param receipt 账单
+     * @return null 或返回结果
+     * @url 要验证的地址 沙盒 https://sandbox.itunes.apple.com/verifyReceipt
+     */
+    public static String buyAppVerify(String receipt, int type) {
+        //环境判断 线上/开发环境用不同的请求链接
+        try {
+            String url = null;
+            if (type == 0) {
+                url = test_url_apple_pay; //沙盒环境,测试
+            } else {
+                url = url_apple_pay; //线上环境
+            }
+
+            //String url = EnvUtils.isOnline() ?url_verify : url_sandbox;
+            SSLContext sc = SSLContext.getInstance("SSL");
+            sc.init(null, new TrustManager[]{new TrustAnyTrustManager()}, new java.security.SecureRandom());
+            URL console = new URL(url);
+            HttpsURLConnection conn = (HttpsURLConnection) console.openConnection();
+            conn.setSSLSocketFactory(sc.getSocketFactory());
+            conn.setHostnameVerifier(new TrustAnyHostnameVerifier());
+            conn.setRequestMethod("POST");
+            conn.setRequestProperty("content-type", "text/json");
+            conn.setRequestProperty("Proxy-Connection", "Keep-Alive");
+            conn.setDoInput(true);
+            conn.setDoOutput(true);
+            //r如果有错误就注释
+            conn.setConnectTimeout(3000);
+            BufferedOutputStream hurlBufOus = new BufferedOutputStream(conn.getOutputStream());
+            //拼成固定的格式传给平台
+            String str = String.format(Locale.CHINA, "{\"receipt-data\":\"" + receipt + "\"}");
+            // 直接将receipt当参数发到苹果验证就行，不用拼格
+            String str1 = String.format(Locale.CHINA, receipt);
+            hurlBufOus.write(str.getBytes());
+            hurlBufOus.flush();
+
+
+            InputStream is = conn.getInputStream();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+            String line = null;
+            StringBuilder sb = new StringBuilder();
+            while ((line = reader.readLine()) != null) {
+                sb.append(line);
+            }
+            return sb.toString();
+        } catch (Exception ex) {
+            System.out.println("苹果服务器异常");
+            ex.printStackTrace();
+        }
+        return null;
+
+    }
+
+
+
+
+
+
+
+
+
+
+  //视情况而定，苹果app进行支付，然后收到苹果的收据（一串很长的BASE64编码的字符串）
+    /**
+     * 用BASE64加密
+     *
+     * @param str
+     * @return
+     */
+    public static String getBASE64(String str) {
+        byte[] b = str.getBytes();
+        String s = null;
+        if (b != null) {
+            s = new sun.misc.BASE64Encoder().encode(b);
+        }
+        return s;
+    }
+
+
+    /**
+     * 解密BASE64字窜
+     * @param s
+     * @return
+     */
+    public static String getFromBASE64(String s) {
+        byte[] b = null;
+        if (s != null) {
+            BASE64Decoder decoder = new BASE64Decoder();
+            try {
+                b = decoder.decodeBuffer(s);
+                return new String(b);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return new String(b);
+    }
+
+
+
+
+
+
+
+}
diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java b/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java
new file mode 100644
index 00000000..b8431faa
--- /dev/null
+++ b/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java
@@ -0,0 +1,194 @@
+package com.peanut.modules.pay.weChatPay.config;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
+import com.wechat.pay.contrib.apache.httpclient.auth.*;
+import com.wechat.pay.contrib.apache.httpclient.cert.CertificatesManager;
+import com.wechat.pay.contrib.apache.httpclient.exception.HttpCodeException;
+import com.wechat.pay.contrib.apache.httpclient.exception.NotFoundException;
+import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
+import lombok.Data;
+import lombok.Value;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.junit.After;
+import org.junit.Before;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.security.GeneralSecurityException;
+import java.security.PrivateKey;
+
+
+/**
+ * @Author:
+ * @Description:
+ **/
+@Configuration
+@Data
+@Slf4j
+@ConfigurationProperties(prefix = "wxpay")     //读取wxpay节点
+@PropertySource(value = "classpath:weChatConfig.properties" ) //读取配置文件
+//@Component
+public class WechatPayConfig implements Serializable {
+
+
+    /**
+     * APPID
+     */
+
+    private String appId;
+    /**
+     * 商户号
+     */
+
+    private String mchId;
+    /**
+     * 服务商商户号
+     */
+
+    private String slMchId;
+    /**
+     * APIv2密钥
+     */
+
+    private String apiKey;
+    /**
+     * APIv3密钥
+     */
+
+    private String apiV3Key;
+    /**
+     * 支付通知回调地址
+     */
+
+    private String notifyUrl;
+    /**
+     * 退款回调地址
+     */
+
+    private String refundNotifyUrl;
+
+    /**
+     * API 证书中的 key.pem 商户私钥
+     */
+
+    private String keyPemPath;
+
+    /**
+     * 商户序列号
+     */
+
+    private String serialNo;
+
+    /**
+     * 微信支付V3-url前缀
+     */
+
+    private String baseUrl;
+
+    private String domain;
+
+    //获取私钥工具
+    public PrivateKey getPrivateKey(String keyPemPath) {
+
+        try {
+            return  PemUtil.loadPrivateKey(new FileInputStream(keyPemPath));
+
+        } catch (FileNotFoundException e) {
+            //抛出异常，并把错误文件继续向上抛出
+            throw new RuntimeException("私钥文件不存在",e);
+        }
+    }
+
+
+
+    /**
+     * 获取证书管理器实例 签名验证器
+     *
+     * @return
+     */
+    @Bean
+    public Verifier getVerifier() throws GeneralSecurityException, IOException, HttpCodeException, NotFoundException {
+
+        log.info("获取证书管理器实例");
+
+        //获取商户私钥
+//        PrivateKey privateKey = getPrivateKey(keyPemPath);
+        PrivateKey privateKey = getPrivateKey(keyPemPath);
+
+        //私钥签名对象
+        PrivateKeySigner privateKeySigner = new PrivateKeySigner(serialNo, privateKey);
+
+        //身份认证对象
+        WechatPay2Credentials wechatPay2Credentials = new WechatPay2Credentials(mchId, privateKeySigner);
+
+        // 使用定时更新的签名验证器，不需要传入证书
+
+
+        CertificatesManager certificatesManager = CertificatesManager.getInstance();
+        certificatesManager.putMerchant(
+                mchId, wechatPay2Credentials, apiV3Key.getBytes(StandardCharsets.UTF_8));
+
+        return certificatesManager.getVerifier(mchId);
+    }
+
+
+    /**
+     * 获取支付http请求对象
+     *
+     * @param verifier
+     * @return
+     */
+    @Bean(name = "wxPayClient")
+//    @Bean
+
+    public CloseableHttpClient getWxPayClient(Verifier verifier) {
+        log.info("获取HttpClient");
+
+        //获取商户私钥
+        PrivateKey privateKey = getPrivateKey(keyPemPath);
+
+        WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create()
+                .withMerchant(mchId, serialNo, privateKey)
+                .withValidator(new WechatPay2Validator(verifier));
+      CloseableHttpClient httpClient =builder.build();
+        // 通过WechatPayHttpClientBuilder构造的HttpClient，会自动的处理签名和验签，并进行证书自动更新
+        return httpClient;
+    }
+
+
+
+
+    /**
+     * 获取HttpClient，无需进行应答签名验证，跳过验签的流程
+     */
+    @Bean(name = "wxPayNoSignClient")
+    public CloseableHttpClient getWxPayNoSignClient() {
+
+        //获取商户私钥
+        PrivateKey privateKey = getPrivateKey(keyPemPath);
+
+        //用于构造HttpClient
+        WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create()
+                //设置商户信息
+                .withMerchant(mchId, serialNo, privateKey)
+                //无需进行签名验证、通过withValidator((response) -> true)实现
+                .withValidator((response) -> true);
+
+        // 通过WechatPayHttpClientBuilder构造的HttpClient，会自动的处理签名和验签，并进行证书自动更新
+        return builder.build();
+    }
+
+}
+
+
+
+
+
+
diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java b/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java
new file mode 100644
index 00000000..4ff980a9
--- /dev/null
+++ b/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java
@@ -0,0 +1,335 @@
+package com.peanut.modules.pay.weChatPay.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.peanut.common.utils.R;
+import com.peanut.modules.book.entity.*;
+import com.peanut.modules.book.service.*;
+import com.peanut.modules.pay.weChatPay.dto.WechatDto;
+import com.peanut.modules.pay.weChatPay.config.WechatPayConfig;
+import com.peanut.modules.pay.weChatPay.util.HttpUtils;
+import com.peanut.modules.book.entity.BookBuyConfigEntity;
+import com.peanut.modules.pay.weChatPay.util.WechatPayValidator;
+import com.peanut.modules.pay.weChatPay.util.WxPayUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.*;
+import java.util.concurrent.locks.ReentrantLock;
+
+@Slf4j
+@RestController
+@CrossOrigin //跨域
+@RequestMapping("/pay")
+@Configuration
+public class WeChatPayController {
+
+    @Autowired private MyUserService userService;
+
+    @Autowired private BuyOrderService buyOrderService;
+
+    @Autowired
+    @Lazy
+    private WechatPayConfig wechatPayConfig;
+
+    @Autowired private BookBuyConfigService bookBuyConfigService;
+
+    @Autowired private PayWechatOrderService payWechatOrderService;
+
+    @Autowired private PayPaymentOrderService payPaymentOrderService;
+
+    @Autowired private TransactionDetailsService transactionDetailsService;
+
+    @Autowired
+    private CloseableHttpClient wxPayNoSignClient; //无需应答签名
+    @Autowired
+    private CloseableHttpClient wxPayClient;
+    @Autowired
+    private WxPayUtil wxPayUtil;
+    private final ReentrantLock lock = new ReentrantLock();
+    //  由微信生成的应用ID，全局唯一。
+    public static final String appId= "wx47134a8f15083734";
+    // 直连商户的商户号，由微信支付生成并下发。
+    public static final String mchId = "1612860909";
+    // 商户证书序列号   7B5676E3CDF56680D0414A009CE501C844DBE2D6   679AECB2F7AC4183033F713828892BA640E4EEE3
+    public static final String mchSerialNo = "679AECB2F7AC4183033F713828892BA640E4EEE3";
+    // 微信下单Url
+    public static final String payUrl = "https://api.mch.weixin.qq.com/v3/pay/transactions/app";
+
+
+
+
+    @RequestMapping(value = "/Vxtext", method = RequestMethod.POST)
+    public String vxPAYtext(@RequestBody Integer user) {
+
+        return "=============================test============"+user;
+    }
+
+
+    /**
+     * App 微信下单
+     *
+     * @param
+     * @return
+     * @PathVariable
+     */
+
+    @RequestMapping(value = "/placeAnOrder/app")
+    @Transactional(rollbackFor = Exception.class)
+    public  R pay(@RequestBody  WechatDto dto )  throws Exception{
+        System.out.println("==========ordersn================"+dto.getOrderSn());
+        log.info("生成订单");
+        List<BuyOrderEntity> one = this.buyOrderService.getBaseMapper().selectList(new QueryWrapper<BuyOrderEntity>().eq("order_sn", dto.getOrderSn()));
+        BuyOrderEntity order = one.get(0);
+//         获取订单
+        Map<String,Object> paramMap = new HashMap<>();
+        paramMap.put("appid",appId);
+        paramMap.put("mchid",mchId);
+        paramMap.put("description","微信充值");
+//        订单编号
+        paramMap.put("out_trade_no",order.getOrderSn());
+//        paramMap.put("attach","");  //自定义数据 支付完成后才能显示 在查询API和支付通知中原样返回，可作为自定义参数使用
+        paramMap.put("notify_url",wechatPayConfig.getNotifyUrl());
+//        paramMap.put("time_expire","");
+//          实收金额0.38乘100=38
+        BigDecimal  realsmoney= order.getRealMoney();
+         BigDecimal hand=new BigDecimal("100");
+         realsmoney =realsmoney.multiply(hand)    ;
+        Map<String,Object> amountMap = new HashMap<>();
+        amountMap.put("total",realsmoney);
+        amountMap.put("currency","CNY");
+        paramMap.put("amount",amountMap);
+        JSONObject json = JSONObject.parseObject(JSON.toJSONString(paramMap));
+        log.info("请求参数"+paramMap);
+        com.alibaba.fastjson.JSONObject jsonObject1 = wxPayUtil.doPostWexinV3("https://api.mch.weixin.qq.com/v3/pay/transactions/app", json.toJSONString());
+        String prepayid = jsonObject1.getString("prepay_id");
+//       传入参数 payUrl  发送post请求
+        HttpPost httpPost = new HttpPost(payUrl);
+//       将json数据转换成字符串
+        StringEntity entity = new StringEntity(json.toString(),"utf-8");
+//        设置该请求的Content-Type为application/json 都是json格式
+        entity.setContentType("application/json");
+//        将实体对象设置到HttpPost表示要传递该数据到服务器端。
+        httpPost.setEntity(entity);
+//        设置请求头部的Accept属性为"application/json"表示客户端希望接收的为json。
+        httpPost.setHeader("Accept", "application/json");
+        CloseableHttpResponse response = wxPayClient.execute(httpPost);
+//        向微信支付平台发送请求，处理响应结果，并将订单信息保存到数据库中。
+        String bodyAsString =   EntityUtils.toString(response.getEntity());//响应体
+//         时间戳
+        Long timestamp = System.currentTimeMillis()/1000;
+//        随机串
+        String nonceStr = UUID.randomUUID().toString().replace("-","");
+
+        String sign = wxPayUtil.getSign(WxPayUtil.appId,timestamp,nonceStr,prepayid);
+        log.info("签名:"+sign);
+
+        Map Map = new HashMap();
+        Map.put("prepayid",prepayid);
+        Map.put("timestamp",timestamp+"");
+        Map.put("noncestr",nonceStr);
+        Map.put("sign",sign);
+        Map.put("appid",appId);
+        Map.put("package","Sign=WXPay");
+        Map.put("extData","sign");
+        Map.put("partnerid",mchId);
+        try {
+            int statusCode = response.getStatusLine().getStatusCode();  //响应状态码
+            if (statusCode == 200) { //处理成功
+                System.out.println("成功，返回结果 = " + bodyAsString); //返回响应体  EntityUtils.toString(response.getEntity())
+                // 添加微信支付订单信息
+                PayWechatOrderEntity wechat = new PayWechatOrderEntity();
+                wechat.setCustomerId(order.getUserId());  //用户id
+                wechat.setCreateTime(new Date());  //创建订单时间
+                wechat.setOrderSn(order.getOrderSn());  //订单编号
+                wechat.setPrepayId(prepayid);  //预支付回话标识  标识为响应体EntityUtils.toString(response.getEntity())
+                wechat.setTotalAmount(order.getRealMoney()); //支付实收金额
+                wechat.setSystemLog(response.toString());   //日志
+                wechat.setPayType(order.getOrderType());   //交易类型
+                wechat.setOrderId(order.getOrderSn());   //订单号
+                wechat.setBuyOrderId(dto.getBuyOrderId());    //购买配置id
+                this.payWechatOrderService.save(wechat);  //微信订单表拿到数据保存数据库
+            } else if (statusCode == 204) { //处理成功，无返回Body
+                System.out.println("成功");
+            } else {
+                System.out.println("下单失败 = " + statusCode + ",返回结果 = " + bodyAsString);
+                throw new IOException("request failed");
+            }
+        }finally {
+            response.close();
+        }
+//        返回url和订单号
+        return R.ok().put("paramMap" ,paramMap).put("Map",Map);
+
+    }
+    /**
+     * 获取私钥。
+     *
+     * @param filename 私钥文件路径  (required)
+     * @return 私钥对象
+     */
+    public static PrivateKey getPrivateKey(String filename) throws Exception {
+        String content = new String(Files.readAllBytes(Paths.get(filename)), "utf-8");
+        try {
+            String privateKey = content.replace("-----BEGIN PRIVATE KEY-----", "")
+                    .replace("-----END PRIVATE KEY-----", "")
+                    .replaceAll("\\s+", "");
+
+            KeyFactory kf = KeyFactory.getInstance("RSA");
+            return kf.generatePrivate(
+                    new PKCS8EncodedKeySpec(Base64.getDecoder().decode(privateKey)));
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("当前Java环境不支持RSA", e);
+        } catch (InvalidKeySpecException e) {
+            throw new RuntimeException("无效的密钥格式");
+        }
+    }
+    /**
+     *
+     * 微信支付回调
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @PostMapping("/payNotify")
+    public R payNotify(HttpServletRequest request, HttpServletResponse response) {
+        log.info("##############################微信支付回调#######################");
+        PayWechatOrderEntity wechatEntity = new PayWechatOrderEntity();
+//         处理通知参数
+        Map<String,Object> bodyMap = getNotifyBody(request);
+        if(bodyMap==null){
+            return null;
+        }
+        log.warn("=========== 在对业务数据进行状态检查和处理之前，要采用数据锁进行并发控制，以避免函数重入造成的数据混乱 ===========");
+        if(lock.tryLock()) {
+            try {
+//                 解密resource中的通知数据
+                String resource = bodyMap.get("resource").toString();
+                Map<String, Object> resourceMap = WechatPayValidator.decryptFromResource(resource, wechatPayConfig.getApiV3Key(),1);
+                String orderNo = resourceMap.get("out_trade_no").toString();
+                String transactionId = resourceMap.get("transaction_id").toString();
+                System.out.println("===================回调解密transactionId================================"+transactionId);
+//                根据订单号，做幂等处理，并且在对业务数据进行状态检查和处理之前，要采用数据锁进行并发控制，以避免函数重入造成的数据混乱
+                BuyOrderEntity order = this.buyOrderService.getOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", orderNo));
+                if(!ObjectUtils.isEmpty(order)){
+                    wechatEntity = this.payWechatOrderService.getOne(new QueryWrapper<PayWechatOrderEntity>().eq("order_id", order.getOrderId()));
+                }else{
+                    log.error("无效订单！");
+                    return R.error(500,"无效订单！");
+                }
+//                 1.根据订单id获取订单信息
+                log.warn("=========== 根据订单号，做幂等处理 ===========");
+                if("order".equals(order.getOrderType())){
+                    BuyOrderEntity orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderEntity>().eq("order_sn", wechatEntity.getOrderId()));
+                    BigDecimal realMoney = orderEntity.getRealMoney();
+
+                    //更新 订单 记录
+                    if (wechatEntity.getTotalAmount().compareTo(realMoney) == 0) {
+                        buyOrderService.updateOrderStatus(Integer.valueOf(order.getUserId()),order.getOrderSn(),"0");
+                    }
+
+                }
+                if("point".equals(order.getOrderType())){
+//                    List<BookBuyConfigEntity> bookBuyConfigEntity = bookBuyConfigService.getBaseMapper().selectList(new QueryWrapper<BookBuyConfigEntity>().eq("price_type_id", ""));
+//                     插入花生币  变动记录
+                    PayWechatOrderEntity buy_order_id = payWechatOrderService.getBaseMapper().selectOne(new QueryWrapper<PayWechatOrderEntity>().eq("order_sn", order.getOrderSn()));
+                      Integer buyorder= buy_order_id.getBuyOrderId();
+                    BookBuyConfigEntity bookBuyConfigEntity = bookBuyConfigService.getById(buyorder);
+
+
+                    String realMoney =bookBuyConfigEntity.getRealMoney();
+                    Integer money = Integer.valueOf(realMoney);
+                    userService.rechargeHSPoint(Integer.valueOf(order.getUserId()),money);
+                    TransactionDetailsEntity transactionDetailsEntity = new TransactionDetailsEntity();
+                    transactionDetailsEntity.setUserId(order.getUserId());
+                    transactionDetailsEntity.setChangeAmount(new BigDecimal(money));
+                    transactionDetailsEntity.setOrderType("充值");
+//                    transactionDetailsEntity.setRelationId(wechatEntity.getId().intValue());
+                    transactionDetailsEntity.setRelationId(buy_order_id.getId().intValue());
+                    transactionDetailsEntity.setRemark("充值");
+
+                    MyUserEntity user = userService.getById(Integer.valueOf(order.getUserId()));
+                    BigDecimal peanutCoin = user.getPeanutCoin();
+                    transactionDetailsEntity.setUserBalance(peanutCoin);
+                    transactionDetailsEntity.setUserName(user.getNickname());
+                    transactionDetailsEntity.setTel(user.getTel());
+                    transactionDetailsService.save(transactionDetailsEntity);
+//                     插入 花生币 充值记录
+                    PayPaymentOrderEntity payPaymentOrderEntity = new PayPaymentOrderEntity();
+                    payPaymentOrderEntity.setUserId(Integer.valueOf(order.getUserId()));
+                    payPaymentOrderEntity.setOrderId(String.valueOf(buy_order_id.getId()));
+                    payPaymentOrderEntity.setRealAmount(new BigDecimal(bookBuyConfigEntity.getRealMoney()));
+                    payPaymentOrderEntity.setRechargeAmount(new BigDecimal(bookBuyConfigEntity.getMoney()));
+                    payPaymentOrderEntity.setRechargeChannel(bookBuyConfigEntity.getQudao());
+                    payPaymentOrderEntity.setRechargeStatus("success");
+                    payPaymentOrderEntity.setSuccessTime(new Date());
+                    payPaymentOrderEntity.setUserName(user.getNickname());
+                    payPaymentOrderEntity.setTel(user.getTel());
+                    payPaymentOrderService.save(payPaymentOrderEntity);
+                    buyOrderService.updateOrderStatus(Integer.valueOf(order.getUserId()),order.getOrderSn(),"2");
+                }
+
+            } finally {
+//                要主动释放锁
+                lock.unlock();
+            }
+        }
+
+//        成功应答
+        return R.ok();
+    }
+
+
+
+
+    private Map<String,Object> getNotifyBody(HttpServletRequest request ){
+//        处理通知参数
+        String body = HttpUtils.readData(request);
+        log.info("zhifu回调参数：{}",body);
+
+//         转换为Map
+        Map<String, Object> bodyMap = JSONObject.parseObject(body, new TypeReference<Map<String, Object>>(){});
+//         微信的通知ID（通知的唯一ID）
+        String notifyId = bodyMap.get("id").toString();
+
+//         验证签名信息
+        try {
+            WechatPayValidator wechatPayValidator
+                    = new WechatPayValidator(wechatPayConfig.getVerifier(), notifyId, body);
+            if(!wechatPayValidator.validate(request)){
+
+                log.error("通知验签失败");
+                return null;
+            }
+            log.info("通知验签成功");
+        }catch (Exception e) {
+
+        }
+        return bodyMap;
+    }
+
+
+}
diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/dto/WxchatCallbackSuccessData.java b/src/main/java/com/peanut/modules/pay/weChatPay/dto/WxchatCallbackSuccessData.java
new file mode 100644
index 00000000..4591c905
--- /dev/null
+++ b/src/main/java/com/peanut/modules/pay/weChatPay/dto/WxchatCallbackSuccessData.java
@@ -0,0 +1,77 @@
+package com.peanut.modules.pay.weChatPay.dto;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * @author
+ * @version 1.0
+ * @description 微信支付成功回调返回的数据
+ * @date
+ */
+@Data
+@Slf4j
+public class WxchatCallbackSuccessData {
+
+    /**
+     * 商户订单号
+     */
+    private String orderId;
+
+    /**
+     * 微信支付系统生成的订单号
+     */
+    private String transactionId;
+
+    /**
+     * 交易状态
+     * SUCCESS：支付成功
+     * REFUND：转入退款
+     * NOTPAY：未支付
+     * CLOSED：已关闭
+     * REVOKED：已撤销（付款码支付）
+     * USERPAYING：用户支付中（付款码支付）
+     * PAYERROR：支付失败(其他原因，如银行返回失败)
+     */
+    private String tradestate;
+
+
+
+    /**
+     * 支付完成时间
+     */
+    private Date successTime;
+
+    /**
+     * 交易类型
+     * JSAPI：公众号支付
+     * NATIVE：扫码支付
+     * APP：APP支付
+     * MICROPAY：付款码支付
+     * MWEB：H5支付
+     * FACEPAY：刷脸支付
+     */
+    private String 	tradetype;
+
+    /**
+     * 订单总金额
+     */
+    private BigDecimal totalMoney;
+
+
+    public Date getSuccessTime() {
+        return successTime;
+    }
+
+    public void setSuccessTime(String successTime) {
+        // Hutool工具包的方法，自动识别一些常用格式的日期字符串
+        this.successTime = DateUtil.parse(successTime);
+    }
+}
diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/util/HttpUtils.java b/src/main/java/com/peanut/modules/pay/weChatPay/util/HttpUtils.java
new file mode 100644
index 00000000..9ff14579
--- /dev/null
+++ b/src/main/java/com/peanut/modules/pay/weChatPay/util/HttpUtils.java
@@ -0,0 +1,45 @@
+package com.peanut.modules.pay.weChatPay.util;
+
+import org.junit.rules.Verifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.IOException;
+
+public class HttpUtils {
+
+
+    /**
+     * 将通知参数转化为字符串
+     * @param request
+     * @return
+     *
+     * WechatPayValidatorForRequest
+     */
+    public static String readData(HttpServletRequest request) {
+        BufferedReader br = null;
+        try {
+            StringBuilder result = new StringBuilder();
+            br = request.getReader();
+            for (String line; (line = br.readLine()) != null; ) {
+                if (result.length() > 0) {
+                    result.append("\n");
+                }
+                result.append(line);
+            }
+            return result.toString();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            if (br != null) {
+                try {
+                    br.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }}}}
+
+
+
diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/util/WechatPayValidator.java b/src/main/java/com/peanut/modules/pay/weChatPay/util/WechatPayValidator.java
new file mode 100644
index 00000000..e736b984
--- /dev/null
+++ b/src/main/java/com/peanut/modules/pay/weChatPay/util/WechatPayValidator.java
@@ -0,0 +1,150 @@
+package com.peanut.modules.pay.weChatPay.util;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.wechat.pay.contrib.apache.httpclient.auth.Verifier;
+import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.util.EntityUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.time.DateTimeException;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Map;
+
+import static com.wechat.pay.contrib.apache.httpclient.constant.WechatPayHttpHeaders.*;
+
+/**
+ * @Author: 
+ * @Description:
+ **/
+@Slf4j
+public class WechatPayValidator {
+    /**
+     * 应答超时时间，单位为分钟
+     */
+    private static final long RESPONSE_EXPIRED_MINUTES = 5;
+    private final Verifier verifier;
+    private final String requestId;
+    private final String body;
+
+
+    public WechatPayValidator(Verifier verifier, String requestId, String body) {
+        this.verifier = verifier;
+        this.requestId = requestId;
+        this.body = body;
+    }
+
+    protected static IllegalArgumentException parameterError(String message, Object... args) {
+        message = String.format(message, args);
+        return new IllegalArgumentException("parameter error: " + message);
+    }
+
+    protected static IllegalArgumentException verifyFail(String message, Object... args) {
+        message = String.format(message, args);
+        return new IllegalArgumentException("signature verify fail: " + message);
+    }
+
+    public final boolean validate(HttpServletRequest request)  {
+        try {
+            //处理请求参数
+            validateParameters(request);
+
+            //构造验签名串
+            String message = buildMessage(request);
+
+            String serial = request.getHeader(WECHAT_PAY_SERIAL);
+            String signature = request.getHeader(WECHAT_PAY_SIGNATURE);
+
+            //验签
+            if (!verifier.verify(serial, message.getBytes(StandardCharsets.UTF_8), signature)) {
+                throw verifyFail("serial=[%s] message=[%s] sign=[%s], request-id=[%s]",
+                        serial, message, signature, requestId);
+            }
+        } catch (IllegalArgumentException e) {
+            log.warn(e.getMessage());
+            return false;
+        }
+
+        return true;
+    }
+
+    private  void validateParameters(HttpServletRequest request) {
+
+        // NOTE: ensure HEADER_WECHAT_PAY_TIMESTAMP at last
+        String[] headers = {WECHAT_PAY_SERIAL, WECHAT_PAY_SIGNATURE, WECHAT_PAY_NONCE, WECHAT_PAY_TIMESTAMP};
+
+        String header = null;
+        for (String headerName : headers) {
+            header = request.getHeader(headerName);
+            if (header == null) {
+                throw parameterError("empty [%s], request-id=[%s]", headerName, requestId);
+            }
+        }
+
+        //判断请求是否过期
+        String timestampStr = header;
+        try {
+            Instant responseTime = Instant.ofEpochSecond(Long.parseLong(timestampStr));
+            // 拒绝过期请求
+            if (Duration.between(responseTime, Instant.now()).abs().toMinutes() >= RESPONSE_EXPIRED_MINUTES) {
+                throw parameterError("timestamp=[%s] expires, request-id=[%s]", timestampStr, requestId);
+            }
+        } catch (DateTimeException | NumberFormatException e) {
+            throw parameterError("invalid timestamp=[%s], request-id=[%s]", timestampStr, requestId);
+        }
+    }
+
+    private  String buildMessage(HttpServletRequest request)  {
+        String timestamp = request.getHeader(WECHAT_PAY_TIMESTAMP);
+        String nonce = request.getHeader(WECHAT_PAY_NONCE);
+        return timestamp + "\n"
+                + nonce + "\n"
+                + body + "\n";
+    }
+
+    private  String getResponseBody(CloseableHttpResponse response) throws IOException {
+        HttpEntity entity = response.getEntity();
+        return (entity != null && entity.isRepeatable()) ? EntityUtils.toString(entity) : "";
+    }
+
+    /**
+     * 对称解密，异步通知的加密数据
+     * @param resource 加密数据
+     * @param apiV3Key apiV3密钥
+     * @param type 1-支付，2-退款
+     * @return
+     */
+    public static  Map<String, Object> decryptFromResource(String resource,String apiV3Key,Integer type) {
+
+        String msg = type==1?"支付成功":"退款成功";
+        log.info(msg+"，回调通知，密文解密");
+        try {
+        //通知数据
+        Map<String, Object> resourceMap = JSONObject.parseObject(resource, new TypeReference<Map<String, Object>>() {
+        });
+        //数据密文
+        String ciphertext = resourceMap.get("ciphertext").toString();
+        //随机串
+        String nonce = resourceMap.get("nonce").toString();
+        //附加数据
+        String associatedData = resourceMap.get("associated_data").toString();
+
+        log.info("密文： {}", ciphertext);
+        AesUtil aesUtil = new AesUtil(apiV3Key.getBytes(StandardCharsets.UTF_8));
+        String resourceStr = aesUtil.decryptToString(associatedData.getBytes(StandardCharsets.UTF_8),
+                nonce.getBytes(StandardCharsets.UTF_8),
+                ciphertext);
+
+        log.info(msg+"，回调通知，解密结果 明文： {}", resourceStr);
+        return JSONObject.parseObject(resourceStr, new TypeReference<Map<String, Object>>(){});
+    }catch (Exception e){
+        throw new RuntimeException("回调参数，解密失败！");
+        }
+    }
+}
diff --git a/src/main/java/com/peanut/modules/sys/controller/SysAgreementController.java b/src/main/java/com/peanut/modules/sys/controller/SysAgreementController.java
new file mode 100644
index 00000000..d0113064
--- /dev/null
+++ b/src/main/java/com/peanut/modules/sys/controller/SysAgreementController.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.peanut.modules.sys.controller;
+
+import com.peanut.common.utils.PageUtils;
+import com.peanut.common.utils.R;
+import com.peanut.modules.sys.entity.SysAgreementEntity;
+import com.peanut.modules.sys.service.SysAgreementService;
+import com.peanut.modules.sys.service.SysLogService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+
+/**
+ * 系统日志
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@RestController
+@RequestMapping("/sys/agreement")
+public class SysAgreementController {
+	@Autowired
+	private SysAgreementService sysAgreementService;
+	
+	/**
+	 * 列表
+	 */
+	@ResponseBody
+	@GetMapping("/list")
+	public R list(@RequestParam Map<String, Object> params){
+		PageUtils page = sysAgreementService.queryPage(params);
+
+		return R.ok().put("page", page);
+	}
+
+
+	/**
+	 * 保存
+	 * @param agre
+	 * @return
+	 */
+	@PostMapping("/save")
+	public R save(@RequestBody SysAgreementEntity agre){
+		sysAgreementService.save(agre);
+		return R.ok();
+	}
+
+
+	/**
+	 * 更新
+	 * @param agre
+	 * @return
+	 */
+	@PostMapping("/update")
+	public R update(@RequestBody SysAgreementEntity agre){
+		sysAgreementService.updateById(agre);
+		return R.ok();
+	}
+}
diff --git a/src/main/java/com/peanut/modules/sys/dao/SysAgreementDao.java b/src/main/java/com/peanut/modules/sys/dao/SysAgreementDao.java
new file mode 100644
index 00000000..f4631436
--- /dev/null
+++ b/src/main/java/com/peanut/modules/sys/dao/SysAgreementDao.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.peanut.modules.sys.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.peanut.modules.sys.entity.SysAgreementEntity;
+import com.peanut.modules.sys.entity.SysLogEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 协议
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@Mapper
+public interface SysAgreementDao extends BaseMapper<SysAgreementEntity> {
+	
+}
diff --git a/src/main/java/com/peanut/modules/sys/entity/SysAgreementEntity.java b/src/main/java/com/peanut/modules/sys/entity/SysAgreementEntity.java
new file mode 100644
index 00000000..db6cfc9d
--- /dev/null
+++ b/src/main/java/com/peanut/modules/sys/entity/SysAgreementEntity.java
@@ -0,0 +1,30 @@
+package com.peanut.modules.sys.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("sys_agreement")
+public class SysAgreementEntity {
+
+    @TableId
+    private Integer id;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 类型
+     * 会员：member
+     * 充值： pay
+     */
+    private String type;
+}
diff --git a/src/main/java/com/peanut/modules/sys/service/SysAgreementService.java b/src/main/java/com/peanut/modules/sys/service/SysAgreementService.java
new file mode 100644
index 00000000..64bcd331
--- /dev/null
+++ b/src/main/java/com/peanut/modules/sys/service/SysAgreementService.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.peanut.modules.sys.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.peanut.common.utils.PageUtils;
+import com.peanut.modules.sys.entity.SysAgreementEntity;
+import com.peanut.modules.sys.entity.SysLogEntity;
+
+import java.util.Map;
+
+
+/**
+ * 协议
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+public interface SysAgreementService extends IService<SysAgreementEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+
+}
diff --git a/src/main/java/com/peanut/modules/sys/service/impl/SysAgreementServiceImpl.java b/src/main/java/com/peanut/modules/sys/service/impl/SysAgreementServiceImpl.java
new file mode 100644
index 00000000..0f94d962
--- /dev/null
+++ b/src/main/java/com/peanut/modules/sys/service/impl/SysAgreementServiceImpl.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2016-2019 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.peanut.modules.sys.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.common.utils.PageUtils;
+import com.peanut.common.utils.Query;
+import com.peanut.modules.sys.dao.SysAgreementDao;
+import com.peanut.modules.sys.dao.SysLogDao;
+import com.peanut.modules.sys.entity.SysAgreementEntity;
+import com.peanut.modules.sys.entity.SysLogEntity;
+import com.peanut.modules.sys.service.SysAgreementService;
+import com.peanut.modules.sys.service.SysLogService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+
+@Service("sysAgreementService")
+public class SysAgreementServiceImpl extends ServiceImpl<SysAgreementDao, SysAgreementEntity> implements SysAgreementService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        String key = (String)params.get("key");
+
+        IPage<SysAgreementEntity> page = this.page(
+            new Query<SysAgreementEntity>().getPage(params),
+            new QueryWrapper<SysAgreementEntity>().like(StringUtils.isNotBlank(key),"type", key)
+        );
+
+        return new PageUtils(page);
+    }
+}
diff --git a/src/main/resources/mapper/book/PayWechatOrderDao.xml b/src/main/resources/mapper/book/PayWechatOrderDao.xml
new file mode 100644
index 00000000..7bc86131
--- /dev/null
+++ b/src/main/resources/mapper/book/PayWechatOrderDao.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.peanut.modules.book.dao.PayWechatOrderDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.peanut.modules.book.entity.PayWechatOrderEntity" id="payWechatOrderMap">
+        <result property="id" column="id"/>
+        <result property="prepayId" column="prepay_id"/>
+        <result property="customerId" column="customer_id"/>
+        <result property="orderSn" column="order_sn"/>
+        <result property="totalAmount" column="total_amount"/>
+        <result property="createTime" column="create_time"/>
+        <result property="systemLog" column="system_log"/>
+        <result property="payType" column="pay_type"/>
+        <result property="orderId" column="order_id"/>
+        <result property="buyOrderId" column="buy_order_id"/>
+    </resultMap>
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/sys/SysAgreementDao.xml b/src/main/resources/mapper/sys/SysAgreementDao.xml
new file mode 100644
index 00000000..081bdbec
--- /dev/null
+++ b/src/main/resources/mapper/sys/SysAgreementDao.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.peanut.modules.sys.dao.SysAgreementDao">
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/weChatConfig.properties b/src/main/resources/weChatConfig.properties
new file mode 100644
index 00000000..23173726
--- /dev/null
+++ b/src/main/resources/weChatConfig.properties
@@ -0,0 +1,21 @@
+wxpay:
+  #应用编号
+wxpay.appId: wx47134a8f15083734
+  #商户号
+wxpay.mchId: 1612860909
+  # APIv3密钥
+wxpay.apiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF
+  # 微信支付V3-url前缀
+wxpay.baseUrl: https://api.mch.weixin.qq.com/v3
+  #po9k1ezoyexk.ngrok.xiaomiqiu123.top 内网穿透地址 测试ok
+wxpay.notifyUrl: http://po9k1ezoyexk.ngrok.xiaomiqiu123.top/pb/pay/payNotify
+  # 退款通知回调, pjm6m9.natappfree.cc 为内网穿透地址
+wxpay.refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
+  # 密钥路径,resources下
+wxpay.keyPemPath:C:\\Users\\Administrator\\IdeaProjects\\peanut_book\\src\\main\\resources\\cent\\apiclient_key.pem
+  #商户证书序列号
+wxpay.serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
+  #微信服务器地址
+wxpay.domain:  https://api.mch.weixin.qq.com
+
+