From b09808d7a5067ef809e77d611c1a5c9d59993a03 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Sun, 7 Aug 2022 12:32:58 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E7=94=A8=E6=88=B7=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E9=87=8D=E6=96=B0=E5=85=B3=E6=B3=A8=E6=8A=A5?=
 =?UTF-8?q?=E4=B8=BB=E9=94=AE=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-common/pigx-common-bom/pom.xml                        | 1 -
 .../com/pig4cloud/pigx/mp/handler/SubscribeHandler.java    | 5 ++---
 pom.xml                                                    | 7 +++++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 943dabf8f..efbdbd7a2 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -39,7 +39,6 @@
         <seata.version>1.4.2</seata.version>
         <asm.version>7.1</asm.version>
         <log4j2.version>2.17.1</log4j2.version>
-        <jaxb.version>2.3.5</jaxb.version>
         <javaformat.plugin.version>0.0.23</javaformat.plugin.version>
         <docker.plugin.version>0.33.0</docker.plugin.version>
         <cloud.plugin.version>1.0.0</cloud.plugin.version>
diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/SubscribeHandler.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/SubscribeHandler.java
index c5ec6dcc1..cbd254aeb 100755
--- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/SubscribeHandler.java
+++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/handler/SubscribeHandler.java
@@ -57,13 +57,12 @@ public class SubscribeHandler extends AbstractHandler {
 			WxAccountFans wxAccountFans = wxAccountFansMapper.selectOne(
 					Wrappers.<WxAccountFans>lambdaUpdate().eq(WxAccountFans::getOpenid, wxMessage.getFromUser()));
 
+			// 删除历史关注保存的信息
 			if (wxAccountFans != null) {
 				wxAccountFansMapper.deleteById(wxAccountFans);
 			}
-			else {
-				wxAccountFans = new WxAccountFans();
-			}
 
+			wxAccountFans = new WxAccountFans();
 			wxAccountFans.setOpenid(wxMpUser.getOpenId());
 			wxAccountFans.setSubscribeStatus(String.valueOf(BooleanUtil.toInt(wxMpUser.getSubscribe())));
 			wxAccountFans.setSubscribeTime(LocalDateTime
diff --git a/pom.xml b/pom.xml
index 6bb7208a5..4f041c777 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
         <velocity.tool.version>3.1</velocity.tool.version>
         <jasypt.version>3.0.4</jasypt.version>
         <ttl.version>2.12.6</ttl.version>
+        <jaxb.version>2.3.5</jaxb.version>
         <ureport.version>2.2.9</ureport.version>
         <jimu.version>1.5.0-beta</jimu.version>
         <aws.version>1.11.543</aws.version>
@@ -97,6 +98,12 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!-- JAVA 17 -->
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb.version}</version>
+        </dependency>
         <!--测试依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>