| @@ -13,8 +13,8 @@ | |||||
| <artifactId>mallinkAdmin</artifactId> | <artifactId>mallinkAdmin</artifactId> | ||||
| <properties> | <properties> | ||||
| <weixin-java-mp.version>3.6.0</weixin-java-mp.version> | |||||
| <weixin-java-open.version>3.6.0</weixin-java-open.version> | |||||
| <weixin-java-mp.version>3.3.0</weixin-java-mp.version> | |||||
| <weixin-java-open.version>3.3.0</weixin-java-open.version> | |||||
| </properties> | </properties> | ||||
| <dependencies> | <dependencies> | ||||
| @@ -1,9 +1,9 @@ | |||||
| package com.iformall.config; | 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.WxMpService; | ||||
| import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; | 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.beans.factory.annotation.Autowired; | ||||
| import org.springframework.context.annotation.Bean; | import org.springframework.context.annotation.Bean; | ||||
| import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
| @@ -23,8 +23,9 @@ public class WechatMpConfig { | |||||
| return wxMpService; | return wxMpService; | ||||
| } | } | ||||
| @Bean | |||||
| public WxMpConfigStorage wxConfigProvider(){ | public WxMpConfigStorage wxConfigProvider(){ | ||||
| WxMpDefaultConfigImpl wxConfigProvider = new WxMpDefaultConfigImpl(); | |||||
| WxMpInMemoryConfigStorage wxConfigProvider = new WxMpInMemoryConfigStorage(); | |||||
| wxConfigProvider.setAppId(wechatWebProperties.getAppId()); | wxConfigProvider.setAppId(wechatWebProperties.getAppId()); | ||||
| wxConfigProvider.setSecret(wechatWebProperties.getSecret()); | wxConfigProvider.setSecret(wechatWebProperties.getSecret()); | ||||
| return wxConfigProvider; | return wxConfigProvider; | ||||
| @@ -91,7 +91,7 @@ fm: | |||||
| exception: true | exception: true | ||||
| exception_emails: houtaikaifa@iformall.com | exception_emails: houtaikaifa@iformall.com | ||||
| deploy: 2 | deploy: 2 | ||||
| open: true | |||||
| open: false | |||||
| upload_dir: /home/ec2-user/server/uploads/ | upload_dir: /home/ec2-user/server/uploads/ | ||||
| pos: | pos: | ||||
| @@ -13,8 +13,8 @@ | |||||
| <artifactId>mallinkCallback</artifactId> | <artifactId>mallinkCallback</artifactId> | ||||
| <properties> | <properties> | ||||
| <weixin-java-mp.version>3.6.0</weixin-java-mp.version> | |||||
| <weixin-java-open.version>3.6.0</weixin-java-open.version> | |||||
| <weixin-java-mp.version>3.3.0</weixin-java-mp.version> | |||||
| <weixin-java-open.version>3.3.0</weixin-java-open.version> | |||||
| </properties> | </properties> | ||||
| <dependencies> | <dependencies> | ||||
| @@ -8,7 +8,6 @@ import com.iformall.mapper.WxComponentVerifyTicketMapper; | |||||
| import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder; | import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder; | ||||
| import me.chanjar.weixin.open.api.impl.WxOpenInMemoryConfigStorage; | import me.chanjar.weixin.open.api.impl.WxOpenInMemoryConfigStorage; | ||||
| import me.chanjar.weixin.open.bean.WxOpenAuthorizerAccessToken; | import me.chanjar.weixin.open.bean.WxOpenAuthorizerAccessToken; | ||||
| import me.chanjar.weixin.open.bean.WxOpenComponentAccessToken; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| @@ -108,15 +107,16 @@ public class FmOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { | |||||
| jedis.expire(this.componentAccessTokenKey, 0); | jedis.expire(this.componentAccessTokenKey, 0); | ||||
| } | } | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void updateComponentAccessToken(WxOpenComponentAccessToken componentAccessToken) { | |||||
| public void updateComponentAccessTokent(String componentAccessToken, int expiresInSeconds) { | |||||
| try (Jedis jedis = this.jedisPool.getResource()) { | try (Jedis jedis = this.jedisPool.getResource()) { | ||||
| jedis.setex(this.componentAccessTokenKey, componentAccessToken.getExpiresIn() - 200, componentAccessToken.getComponentAccessToken()); | |||||
| jedis.setex(this.componentAccessTokenKey, expiresInSeconds - 200, componentAccessToken); | |||||
| WxComponentVerifyTicket ticket = new WxComponentVerifyTicket(); | WxComponentVerifyTicket ticket = new WxComponentVerifyTicket(); | ||||
| ticket.setComponentAppid(getComponentAppId()); | ticket.setComponentAppid(getComponentAppId()); | ||||
| ticket.setAccessToken(componentAccessToken.getComponentAccessToken()); | |||||
| ticket.setAccessTokenExpire(new Date(Long.valueOf(System.currentTimeMillis() + (componentAccessToken.getExpiresIn() * 1000)))); | |||||
| ticket.setAccessToken(componentAccessToken); | |||||
| ticket.setAccessTokenExpire(new Date(Long.valueOf(System.currentTimeMillis() + (expiresInSeconds * 1000)))); | |||||
| int num = wxComponentVerifyTicketMapper.updateAccessToken(ticket); | int num = wxComponentVerifyTicketMapper.updateAccessToken(ticket); | ||||
| logger.info("updateComponentVerifyTicketAccessToken rows: " + num); | logger.info("updateComponentVerifyTicketAccessToken rows: " + num); | ||||
| } | } | ||||
| @@ -2,7 +2,7 @@ package com.iformall.utils; | |||||
| import cn.binarywang.wx.miniapp.api.WxMaService; | import cn.binarywang.wx.miniapp.api.WxMaService; | ||||
| import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; | import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; | ||||
| import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl; | |||||
| import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig; | |||||
| import com.iformall.common.FmHttpClientBuilder; | import com.iformall.common.FmHttpClientBuilder; | ||||
| import com.iformall.domain.po.WxAppinfo; | import com.iformall.domain.po.WxAppinfo; | ||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| @@ -10,7 +10,7 @@ import org.apache.commons.lang3.StringUtils; | |||||
| public class MaUtil { | public class MaUtil { | ||||
| static public WxMaService getWeappService(WxAppinfo appinfo) { | static public WxMaService getWeappService(WxAppinfo appinfo) { | ||||
| WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl(); | |||||
| WxMaInMemoryConfig config = new WxMaInMemoryConfig(); | |||||
| config.setAppid(appinfo.getAppId()); | config.setAppid(appinfo.getAppId()); | ||||
| config.setSecret(appinfo.getSecret()); | config.setSecret(appinfo.getSecret()); | ||||
| config.setToken(appinfo.getToken()); | config.setToken(appinfo.getToken()); | ||||
| @@ -13,8 +13,8 @@ | |||||
| <artifactId>mallinkSysAdmin</artifactId> | <artifactId>mallinkSysAdmin</artifactId> | ||||
| <properties> | <properties> | ||||
| <weixin-java-mp.version>3.6.0</weixin-java-mp.version> | |||||
| <weixin-java-open.version>3.6.0</weixin-java-open.version> | |||||
| <weixin-java-mp.version>3.3.0</weixin-java-mp.version> | |||||
| <weixin-java-open.version>3.3.0</weixin-java-open.version> | |||||
| </properties> | </properties> | ||||
| <dependencies> | <dependencies> | ||||
| @@ -32,11 +32,11 @@ | |||||
| </parent> | </parent> | ||||
| <properties> | <properties> | ||||
| <weixin-java-common.version>3.6.0</weixin-java-common.version> | |||||
| <weixin-java-mp.version>3.6.0</weixin-java-mp.version> | |||||
| <weixin-java-miniapp.version>3.6.0</weixin-java-miniapp.version> | |||||
| <weixin-java-pay.version>3.6.0</weixin-java-pay.version> | |||||
| <weixin-java-open.version>3.6.0</weixin-java-open.version> | |||||
| <weixin-java-common.version>3.3.0</weixin-java-common.version> | |||||
| <weixin-java-mp.version>3.3.0</weixin-java-mp.version> | |||||
| <weixin-java-miniapp.version>3.3.0</weixin-java-miniapp.version> | |||||
| <weixin-java-pay.version>3.3.0</weixin-java-pay.version> | |||||
| <weixin-java-open.version>3.3.0</weixin-java-open.version> | |||||
| <quartz.version>2.3.0</quartz.version> | <quartz.version>2.3.0</quartz.version> | ||||
| </properties> | </properties> | ||||