From 8f7ddddc448ed3beca45940b3642cec12f74f7ee Mon Sep 17 00:00:00 2001
From: ronger <ronger-x@outlook.com>
Date: Sun, 6 Mar 2022 11:09:32 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E4=BE=9D=E8=B5=96=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 36 ++++++++++++-------
 .../service/impl/WxUserServiceImpl.java       |  7 ----
 .../wx/miniapp/config/WxMaConfiguration.java  |  2 +-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d18bc8..8d90720 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <lucene.version>8.0.0</lucene.version>
+        <lucene.version>8.11.1</lucene.version>
     </properties>
 
     <dependencies>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.2.0</version>
+            <version>2.2.2</version>
         </dependency>
 
         <dependency>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.78</version>
+            <version>1.2.79</version>
         </dependency>
         <!-- shiro权限控制框架 -->
         <dependency>
@@ -130,17 +130,17 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.8</version>
+            <version>1.9</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.14</version>
+            <version>1.15</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
@@ -197,12 +197,12 @@
         <dependency>
             <groupId>org.jodd</groupId>
             <artifactId>jodd-http</artifactId>
-            <version>6.0.6</version>
+            <version>6.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-open</artifactId>
-            <version>4.0.0</version>
+            <version>4.2.5.B</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -221,7 +221,7 @@
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.4.18</version>
+            <version>1.4.19</version>
         </dependency>
         <dependency>
             <groupId>com.github.jedis-lock</groupId>
@@ -231,7 +231,7 @@
         <dependency>
             <groupId>com.baidu.aip</groupId>
             <artifactId>java-sdk</artifactId>
-            <version>4.16.2</version>
+            <version>4.16.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -273,12 +273,24 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-core</artifactId>
-            <version>5.5.9</version>
+            <version>5.7.20</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-http</artifactId>
-            <version>5.5.9</version>
+            <version>5.7.20</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.warrenstrange</groupId>
+            <artifactId>googleauth</artifactId>
+            <version>1.5.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 
diff --git a/src/main/java/com/rymcu/forest/service/impl/WxUserServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/WxUserServiceImpl.java
index 9a6c89a..f67d7d5 100644
--- a/src/main/java/com/rymcu/forest/service/impl/WxUserServiceImpl.java
+++ b/src/main/java/com/rymcu/forest/service/impl/WxUserServiceImpl.java
@@ -45,18 +45,11 @@ public class WxUserServiceImpl extends AbstractService<WxUser> implements WxUser
     }
 
     private WxUser copyWxUser(WxMpUser wxMpUser, WxUser wxUser) {
-        wxUser.setNickname(wxMpUser.getNickname());
-        wxUser.setHeadImgUrl(wxMpUser.getHeadImgUrl());
-        wxUser.setCountry(wxMpUser.getCountry());
-        wxUser.setProvince(wxMpUser.getProvince());
-        wxUser.setCity(wxMpUser.getCity());
-        wxUser.setSex(wxMpUser.getSex());
         wxUser.setSubscribe(wxMpUser.getSubscribe());
         wxUser.setSubscribeTime(wxMpUser.getSubscribeTime());
         wxUser.setUnionId(wxMpUser.getUnionId());
         wxUser.setOpenId(wxMpUser.getOpenId());
         wxUser.setLanguage(wxMpUser.getLanguage());
-        wxUser.setSexDesc(wxMpUser.getSexDesc());
         return wxUser;
     }
 }
diff --git a/src/main/java/com/rymcu/forest/wx/miniapp/config/WxMaConfiguration.java b/src/main/java/com/rymcu/forest/wx/miniapp/config/WxMaConfiguration.java
index 73f28e6..2c4ddd0 100644
--- a/src/main/java/com/rymcu/forest/wx/miniapp/config/WxMaConfiguration.java
+++ b/src/main/java/com/rymcu/forest/wx/miniapp/config/WxMaConfiguration.java
@@ -92,7 +92,7 @@ public class WxMaConfiguration {
         service.getMsgService().sendSubscribeMsg(WxMaSubscribeMessage.builder()
                 .templateId("此处更换为自己的模板id")
                 .data(Lists.newArrayList(
-                        new WxMaSubscribeMessage.Data("keyword1", "339208499")))
+                        new WxMaSubscribeMessage.MsgData("keyword1", "339208499")))
                 .toUser(wxMessage.getFromUser())
                 .build());
         return null;