diff --git a/mallinkAdmin/pom.xml b/mallinkAdmin/pom.xml index 4c0dfa3ed..781777ca8 100644 --- a/mallinkAdmin/pom.xml +++ b/mallinkAdmin/pom.xml @@ -13,8 +13,8 @@ mallinkAdmin - 3.3.0 - 3.3.0 + 3.6.0 + 3.6.0 diff --git a/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java index b0c0f57b3..4433386c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java @@ -1,9 +1,9 @@ package com.iformall.config; -import me.chanjar.weixin.mp.api.WxMpConfigStorage; -import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; +import me.chanjar.weixin.mp.config.WxMpConfigStorage; +import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; @@ -24,7 +24,7 @@ public class WechatMpConfig { } public WxMpConfigStorage wxConfigProvider(){ - WxMpInMemoryConfigStorage wxConfigProvider = new WxMpInMemoryConfigStorage(); + WxMpDefaultConfigImpl wxConfigProvider = new WxMpDefaultConfigImpl(); wxConfigProvider.setAppId(wechatWebProperties.getAppId()); wxConfigProvider.setSecret(wechatWebProperties.getSecret()); return wxConfigProvider; diff --git a/mallinkCallback/pom.xml b/mallinkCallback/pom.xml index 2a4dba723..1feccd436 100644 --- a/mallinkCallback/pom.xml +++ b/mallinkCallback/pom.xml @@ -13,8 +13,8 @@ mallinkCallback - 3.3.0 - 3.3.0 + 3.6.0 + 3.6.0 diff --git a/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java index eb5228cc1..fbdd5b7d4 100644 --- a/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java +++ b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java @@ -109,7 +109,7 @@ public class FmOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { } @Override - public void updateComponentAccessTokent(String componentAccessToken, int expiresInSeconds) { + public void updateComponentAccessToken(String componentAccessToken, int expiresInSeconds) { try (Jedis jedis = this.jedisPool.getResource()) { jedis.setex(this.componentAccessTokenKey, expiresInSeconds - 200, componentAccessToken); diff --git a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java index 83e813084..53e7fd1a2 100644 --- a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java @@ -2,7 +2,7 @@ package com.iformall.utils; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; -import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig; +import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl; import com.iformall.common.FmHttpClientBuilder; import com.iformall.domain.po.WxAppinfo; import org.apache.commons.lang3.StringUtils; @@ -10,7 +10,7 @@ import org.apache.commons.lang3.StringUtils; public class MaUtil { static public WxMaService getWeappService(WxAppinfo appinfo) { - WxMaInMemoryConfig config = new WxMaInMemoryConfig(); + WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl(); config.setAppid(appinfo.getAppId()); config.setSecret(appinfo.getSecret()); config.setToken(appinfo.getToken()); diff --git a/mallinkSysAdmin/pom.xml b/mallinkSysAdmin/pom.xml index e006b484e..f99b954fb 100644 --- a/mallinkSysAdmin/pom.xml +++ b/mallinkSysAdmin/pom.xml @@ -13,8 +13,8 @@ mallinkSysAdmin - 3.3.0 - 3.3.0 + 3.6.0 + 3.6.0 diff --git a/pom.xml b/pom.xml index efd02d83b..b8b442dcb 100644 --- a/pom.xml +++ b/pom.xml @@ -32,11 +32,11 @@ - 3.3.0 - 3.3.0 - 3.3.0 - 3.3.0 - 3.3.0 + 3.6.0 + 3.6.0 + 3.6.0 + 3.6.0 + 3.6.0 2.3.0