From 0d5d90ff3c56a01f2af7abe8b70733702e343ef8 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 9 Apr 2019 11:29:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=BA=90=E7=A0=81=E6=95=B4=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E9=87=8D=E5=91=BD=E5=90=8DopenService?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/config/WechatOpenProperties.java | 0 .../com/iformall/config/WechatRedisProperies.java | 2 +- .../service/wechat/FmOpenInRedisDBConfigStorage.java | 8 ++++---- .../com/iformall/service/wechat/FmOpenService.java | 12 ++++++------ mlWechatOpen/pom.xml | 12 ------------ .../iformall/controller/WechatAuthController.java | 4 ++-- .../controller/WechatCalllbackController.java | 4 ++-- .../controller/WechatWeappCodeController.java | 5 ++--- .../WechatWeappDraftTemplateController.java | 4 ++-- .../controller/WechatWeappMsgTemplateController.java | 4 ++-- .../controller/WechatWeappSetController.java | 4 ++-- .../iformall/controller/WxWeappInfoController.java | 5 ++--- .../java/com/iformall/mp/manager/WxMpManager.java | 4 ++-- .../iformall/schedule/AppAccessTokenSchedule.java | 4 ++-- .../com/iformall/schedule/UserUnionIdSchedule.java | 4 ++-- pom.xml | 7 +++++++ 16 files changed, 38 insertions(+), 45 deletions(-) rename {mlWechatOpen => mallinkService}/src/main/java/com/iformall/config/WechatOpenProperties.java (100%) rename mlWechatOpen/src/main/java/com/iformall/config/RedisProperies.java => mallinkService/src/main/java/com/iformall/config/WechatRedisProperies.java (97%) rename mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenInRedisDBConfigStorage.java => mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java (97%) rename mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenService.java => mallinkService/src/main/java/com/iformall/service/wechat/FmOpenService.java (88%) diff --git a/mlWechatOpen/src/main/java/com/iformall/config/WechatOpenProperties.java b/mallinkService/src/main/java/com/iformall/config/WechatOpenProperties.java similarity index 100% rename from mlWechatOpen/src/main/java/com/iformall/config/WechatOpenProperties.java rename to mallinkService/src/main/java/com/iformall/config/WechatOpenProperties.java diff --git a/mlWechatOpen/src/main/java/com/iformall/config/RedisProperies.java b/mallinkService/src/main/java/com/iformall/config/WechatRedisProperies.java similarity index 97% rename from mlWechatOpen/src/main/java/com/iformall/config/RedisProperies.java rename to mallinkService/src/main/java/com/iformall/config/WechatRedisProperies.java index 21602ae..1a84a34 100644 --- a/mlWechatOpen/src/main/java/com/iformall/config/RedisProperies.java +++ b/mallinkService/src/main/java/com/iformall/config/WechatRedisProperies.java @@ -12,7 +12,7 @@ import javax.net.ssl.SSLSocketFactory; * Stormeye */ @ConfigurationProperties(prefix = "wechat.redis") -public class RedisProperies extends JedisPoolConfig { +public class WechatRedisProperies extends JedisPoolConfig { private String host = Protocol.DEFAULT_HOST; private int port = Protocol.DEFAULT_PORT; private String password; diff --git a/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenInRedisDBConfigStorage.java b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java similarity index 97% rename from mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenInRedisDBConfigStorage.java rename to mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java index 90f340a..83f0f72 100644 --- a/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenInRedisDBConfigStorage.java +++ b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java @@ -19,7 +19,7 @@ import redis.clients.util.Pool; import java.util.Date; -public class WxOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { +public class FmOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { private final static String COMPONENT_VERIFY_TICKET_KEY = "wechat_component_verify_ticket:"; private final static String COMPONENT_ACCESS_TOKEN_KEY = "wechat_component_access_token:"; @@ -47,16 +47,16 @@ public class WxOpenInRedisDBConfigStorage extends WxOpenInMemoryConfigStorage { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public WxOpenInRedisDBConfigStorage(Pool jedisPool) { + public FmOpenInRedisDBConfigStorage(Pool jedisPool) { this.jedisPool = jedisPool; } - public WxOpenInRedisDBConfigStorage(Pool jedisPool, String keyPrefix) { + public FmOpenInRedisDBConfigStorage(Pool jedisPool, String keyPrefix) { this.jedisPool = jedisPool; this.keyPrefix = keyPrefix; } - public WxOpenInRedisDBConfigStorage(JedisPool jedisPool, WxComponentVerifyTicketMapper componentVerifyTicketMapper, WxAuthorizerInfoMapper authorizerInfoMapper) { + public FmOpenInRedisDBConfigStorage(JedisPool jedisPool, WxComponentVerifyTicketMapper componentVerifyTicketMapper, WxAuthorizerInfoMapper authorizerInfoMapper) { this.jedisPool = jedisPool; this.wxComponentVerifyTicketMapper = componentVerifyTicketMapper; this.wxAuthorizerInfoMapper = authorizerInfoMapper; diff --git a/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenService.java b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenService.java similarity index 88% rename from mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenService.java rename to mallinkService/src/main/java/com/iformall/service/wechat/FmOpenService.java index 36aea95..b2f954f 100644 --- a/mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenService.java +++ b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenService.java @@ -1,6 +1,6 @@ package com.iformall.service.wechat; -import com.iformall.config.RedisProperies; +import com.iformall.config.WechatRedisProperies; import com.iformall.config.WechatOpenProperties; import com.iformall.mapper.WxAuthorizerInfoMapper; import com.iformall.mapper.WxComponentVerifyTicketMapper; @@ -19,13 +19,13 @@ import javax.annotation.PostConstruct; * Stormeye WU */ @Service -@EnableConfigurationProperties({WechatOpenProperties.class, RedisProperies.class}) -public class WxOpenService extends WxOpenServiceImpl { +@EnableConfigurationProperties({WechatOpenProperties.class, WechatRedisProperies.class}) +public class FmOpenService extends WxOpenServiceImpl { private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private WechatOpenProperties wechatProperties; @Autowired - private RedisProperies redisProperies; + private WechatRedisProperies redisProperies; @Autowired private WxComponentVerifyTicketMapper componentVerifyTicketMapper; @@ -38,7 +38,7 @@ public class WxOpenService extends WxOpenServiceImpl { @PostConstruct public void init() { - WxOpenInRedisDBConfigStorage configStorage = new WxOpenInRedisDBConfigStorage(getJedisPool(), componentVerifyTicketMapper, authorizerInfoMapper); + FmOpenInRedisDBConfigStorage configStorage = new FmOpenInRedisDBConfigStorage(getJedisPool(), componentVerifyTicketMapper, authorizerInfoMapper); configStorage.setComponentAppId(wechatProperties.getComponentAppId()); configStorage.setComponentAppSecret(wechatProperties.getComponentSecret()); configStorage.setComponentToken(wechatProperties.getComponentToken()); @@ -57,7 +57,7 @@ public class WxOpenService extends WxOpenServiceImpl { private JedisPool getJedisPool() { if (pool == null) { - synchronized (WxOpenService.class) { + synchronized (FmOpenService.class) { if (pool == null) { pool = new JedisPool(redisProperies, redisProperies.getHost(), redisProperies.getPort(), redisProperies.getConnectionTimeout(), diff --git a/mlWechatOpen/pom.xml b/mlWechatOpen/pom.xml index 64c0adf..7e559a6 100644 --- a/mlWechatOpen/pom.xml +++ b/mlWechatOpen/pom.xml @@ -13,8 +13,6 @@ mlWechatOpen - 3.3.0.A - 3.3.0.A @@ -23,16 +21,6 @@ mallinkService 1.0 - - com.github.binarywang - weixin-java-open - ${weixin-java-open.version} - - - com.github.binarywang - weixin-java-mp - ${weixin-java-mp.version} - com.google.zxing core diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatAuthController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatAuthController.java index 8aeb461..e3da84e 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatAuthController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatAuthController.java @@ -3,7 +3,7 @@ package com.iformall.controller; import com.iformall.domain.po.WxAuthorizerInfo; import com.iformall.enums.EnumWxAuthorizationStatus; import com.iformall.service.WxAuthorizerInfoService; -import com.iformall.service.wechat.WxOpenService; +import com.iformall.service.wechat.FmOpenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.error.WxErrorException; @@ -29,7 +29,7 @@ import java.util.Date; public class WechatAuthController { private final Logger logger = LoggerFactory.getLogger(getClass()); @Autowired - private WxOpenService openService; + private FmOpenService openService; @Autowired private WxAuthorizerInfoService authorizerInfoService; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java index 4e175af..410cd94 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java @@ -8,7 +8,7 @@ import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.mp.manager.WxMpManager; import com.iformall.service.*; -import com.iformall.service.wechat.WxOpenService; +import com.iformall.service.wechat.FmOpenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.error.WxErrorException; @@ -45,7 +45,7 @@ public class WechatCalllbackController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - protected WxOpenService openService; + protected FmOpenService openService; @Autowired private WxComponentVerifyTicketService componentVerifyTicketService; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java index dbe04c3..2a90e48 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java @@ -1,6 +1,5 @@ package com.iformall.controller; -import com.alibaba.fastjson.JSON; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; @@ -11,7 +10,7 @@ import com.iformall.domain.po.*; import com.iformall.domain.vo.WxWeappCodeStatusVo; import com.iformall.enums.*; import com.iformall.service.*; -import com.iformall.service.wechat.WxOpenService; +import com.iformall.service.wechat.FmOpenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -48,7 +47,7 @@ import java.util.Map; public class WechatWeappCodeController { private final Logger logger = LoggerFactory.getLogger(getClass()); @Autowired - private WxOpenService openService; + private FmOpenService openService; @Autowired private WxWeappCodeStatusService weappCodeStatusService; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java index 2c2a97e..6db9b9f 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java @@ -2,7 +2,7 @@ package com.iformall.controller; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.service.wechat.WxOpenService; +import com.iformall.service.wechat.FmOpenService; import io.swagger.annotations.Api; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.open.bean.WxOpenMaCodeTemplate; @@ -22,7 +22,7 @@ import java.util.List; public class WechatWeappDraftTemplateController { private final Logger logger = LoggerFactory.getLogger(getClass()); @Autowired - private WxOpenService openService; + private FmOpenService openService; @GetMapping("/tempDraftList") diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappMsgTemplateController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappMsgTemplateController.java index 36fbfe4..d92a73a 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappMsgTemplateController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappMsgTemplateController.java @@ -11,7 +11,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxAuthorizerInfo; import com.iformall.enums.EnumWxAuthorizationStatus; import com.iformall.service.WxAuthorizerInfoService; -import com.iformall.service.wechat.WxOpenService; +import com.iformall.service.wechat.FmOpenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -34,7 +34,7 @@ import java.util.List; public class WechatWeappMsgTemplateController { private final Logger logger = LoggerFactory.getLogger(getClass()); @Autowired - private WxOpenService openService; + private FmOpenService openService; @Autowired private WxAuthorizerInfoService authorizerInfoService; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java index 7b9506a..583a48c 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java @@ -8,7 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxAuthorizerInfo; import com.iformall.enums.EnumWxAuthorizationStatus; import com.iformall.service.WxAuthorizerInfoService; -import com.iformall.service.wechat.WxOpenService; +import com.iformall.service.wechat.FmOpenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.error.WxErrorException; @@ -33,7 +33,7 @@ import java.util.Map; public class WechatWeappSetController { private final Logger logger = LoggerFactory.getLogger(getClass()); @Autowired - private WxOpenService openService; + private FmOpenService openService; @Autowired private WxAuthorizerInfoService authorizerInfoService; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 39d492d..9e207b8 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -19,12 +19,11 @@ import com.iformall.domain.vo.WxWeappInfo; import com.iformall.domain.vo.WxWeappReleaseStatusVo; import com.iformall.enums.*; import com.iformall.service.*; -import com.iformall.service.wechat.WxOpenService; +import com.iformall.service.wechat.FmOpenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.open.api.WxOpenMaService; import me.chanjar.weixin.open.bean.ma.WxMaOpenCommitExtInfo; @@ -73,7 +72,7 @@ public class WxWeappInfoController extends BaseController { private WxWeappReleaseStatusService weappReleaseStatusService; @Autowired - private WxOpenService openService; + private FmOpenService openService; @Autowired private WxAppinfoService appinfoService; diff --git a/mlWechatOpen/src/main/java/com/iformall/mp/manager/WxMpManager.java b/mlWechatOpen/src/main/java/com/iformall/mp/manager/WxMpManager.java index 110562b..e8d8f9d 100644 --- a/mlWechatOpen/src/main/java/com/iformall/mp/manager/WxMpManager.java +++ b/mlWechatOpen/src/main/java/com/iformall/mp/manager/WxMpManager.java @@ -2,7 +2,7 @@ package com.iformall.mp.manager; import com.iformall.mp.handler.*; import com.iformall.service.WxAppinfoService; -import com.iformall.service.wechat.WxOpenService; +import com.iformall.service.wechat.FmOpenService; import me.chanjar.weixin.mp.api.WxMpMessageRouter; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.constant.WxMpEventConstants; @@ -21,7 +21,7 @@ public class WxMpManager { @Autowired - protected WxOpenService openService; + protected FmOpenService openService; @Autowired private WxAppinfoService appinfoService; diff --git a/mlWechatOpen/src/main/java/com/iformall/schedule/AppAccessTokenSchedule.java b/mlWechatOpen/src/main/java/com/iformall/schedule/AppAccessTokenSchedule.java index 377ea7b..b619063 100644 --- a/mlWechatOpen/src/main/java/com/iformall/schedule/AppAccessTokenSchedule.java +++ b/mlWechatOpen/src/main/java/com/iformall/schedule/AppAccessTokenSchedule.java @@ -2,7 +2,7 @@ package com.iformall.schedule; import com.iformall.domain.vo.WxWeappInfo; import com.iformall.mapper.WxAuthorizerInfoMapper; -import com.iformall.service.wechat.WxOpenService; +import com.iformall.service.wechat.FmOpenService; import me.chanjar.weixin.common.error.WxErrorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,7 +20,7 @@ public class AppAccessTokenSchedule { private WxAuthorizerInfoMapper authorizerInfoMapper; @Autowired - private WxOpenService openService; + private FmOpenService openService; @Scheduled(cron = "0 10 * * * *?") // 每小时更新一次 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 diff --git a/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java b/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java index bae4942..b8f5fe1 100644 --- a/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java +++ b/mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java @@ -11,7 +11,7 @@ import com.iformall.exception.MallinkException; import com.iformall.mapper.WxPayAccountMapper; import com.iformall.mapper.WxPayOrderMapper; import com.iformall.service.WxAppinfoService; -import com.iformall.service.wechat.WxOpenService; +import com.iformall.service.wechat.FmOpenService; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.open.api.WxOpenMaService; import org.apache.commons.lang3.StringUtils; @@ -37,7 +37,7 @@ public class UserUnionIdSchedule { WxPayOrderMapper payOrderMapper; @Autowired - private WxOpenService openService; + private FmOpenService openService; @Autowired private WxPayAccountMapper payAccountMapper; diff --git a/pom.xml b/pom.xml index 5196022..be988f6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ 3.3.0.A 3.3.0.A 3.3.0.A + 3.3.0.A 2.3.0 @@ -322,6 +323,12 @@ ${weixin-java-pay.version} + + com.github.binarywang + weixin-java-open + ${weixin-java-open.version} + + com.github.ulisesbocchio jasypt-spring-boot