⬆️ 依赖升级

This commit is contained in:
ronger 2022-03-06 11:09:32 +08:00
parent 2500be0fc3
commit 8f7ddddc44
3 changed files with 25 additions and 20 deletions

36
pom.xml
View File

@ -17,7 +17,7 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<lucene.version>8.0.0</lucene.version> <lucene.version>8.11.1</lucene.version>
</properties> </properties>
<dependencies> <dependencies>
@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId> <artifactId>mybatis-spring-boot-starter</artifactId>
<version>2.2.0</version> <version>2.2.2</version>
</dependency> </dependency>
<dependency> <dependency>
@ -101,7 +101,7 @@
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>1.2.78</version> <version>1.2.79</version>
</dependency> </dependency>
<!-- shiro权限控制框架 --> <!-- shiro权限控制框架 -->
<dependency> <dependency>
@ -130,17 +130,17 @@
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.7</version> <version>2.11.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId> <artifactId>commons-text</artifactId>
<version>1.8</version> <version>1.9</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.14</version> <version>1.15</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
@ -197,12 +197,12 @@
<dependency> <dependency>
<groupId>org.jodd</groupId> <groupId>org.jodd</groupId>
<artifactId>jodd-http</artifactId> <artifactId>jodd-http</artifactId>
<version>6.0.6</version> <version>6.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.binarywang</groupId> <groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-open</artifactId> <artifactId>weixin-java-open</artifactId>
<version>4.0.0</version> <version>4.2.5.B</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
@ -221,7 +221,7 @@
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId> <artifactId>xstream</artifactId>
<version>1.4.18</version> <version>1.4.19</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.jedis-lock</groupId> <groupId>com.github.jedis-lock</groupId>
@ -231,7 +231,7 @@
<dependency> <dependency>
<groupId>com.baidu.aip</groupId> <groupId>com.baidu.aip</groupId>
<artifactId>java-sdk</artifactId> <artifactId>java-sdk</artifactId>
<version>4.16.2</version> <version>4.16.5</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -273,12 +273,24 @@
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId> <artifactId>hutool-core</artifactId>
<version>5.5.9</version> <version>5.7.20</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
<artifactId>hutool-http</artifactId> <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> </dependency>

View File

@ -45,18 +45,11 @@ public class WxUserServiceImpl extends AbstractService<WxUser> implements WxUser
} }
private WxUser copyWxUser(WxMpUser wxMpUser, WxUser 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.setSubscribe(wxMpUser.getSubscribe());
wxUser.setSubscribeTime(wxMpUser.getSubscribeTime()); wxUser.setSubscribeTime(wxMpUser.getSubscribeTime());
wxUser.setUnionId(wxMpUser.getUnionId()); wxUser.setUnionId(wxMpUser.getUnionId());
wxUser.setOpenId(wxMpUser.getOpenId()); wxUser.setOpenId(wxMpUser.getOpenId());
wxUser.setLanguage(wxMpUser.getLanguage()); wxUser.setLanguage(wxMpUser.getLanguage());
wxUser.setSexDesc(wxMpUser.getSexDesc());
return wxUser; return wxUser;
} }
} }

View File

@ -92,7 +92,7 @@ public class WxMaConfiguration {
service.getMsgService().sendSubscribeMsg(WxMaSubscribeMessage.builder() service.getMsgService().sendSubscribeMsg(WxMaSubscribeMessage.builder()
.templateId("此处更换为自己的模板id") .templateId("此处更换为自己的模板id")
.data(Lists.newArrayList( .data(Lists.newArrayList(
new WxMaSubscribeMessage.Data("keyword1", "339208499"))) new WxMaSubscribeMessage.MsgData("keyword1", "339208499")))
.toUser(wxMessage.getFromUser()) .toUser(wxMessage.getFromUser())
.build()); .build());
return null; return null;