Просмотр исходного кода

[源码整理][修改]:重命名openService

release
Stormeye Wu 7 лет назад
Родитель
Сommit
0d5d90ff3c
16 измененных файлов: 38 добавлений и 45 удалений
  1. +0
    -0
      mallinkService/src/main/java/com/iformall/config/WechatOpenProperties.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/config/WechatRedisProperies.java
  3. +4
    -4
      mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java
  4. +6
    -6
      mallinkService/src/main/java/com/iformall/service/wechat/FmOpenService.java
  5. +0
    -12
      mlWechatOpen/pom.xml
  6. +2
    -2
      mlWechatOpen/src/main/java/com/iformall/controller/WechatAuthController.java
  7. +2
    -2
      mlWechatOpen/src/main/java/com/iformall/controller/WechatCalllbackController.java
  8. +2
    -3
      mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java
  9. +2
    -2
      mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java
  10. +2
    -2
      mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappMsgTemplateController.java
  11. +2
    -2
      mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappSetController.java
  12. +2
    -3
      mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java
  13. +2
    -2
      mlWechatOpen/src/main/java/com/iformall/mp/manager/WxMpManager.java
  14. +2
    -2
      mlWechatOpen/src/main/java/com/iformall/schedule/AppAccessTokenSchedule.java
  15. +2
    -2
      mlWechatOpen/src/main/java/com/iformall/schedule/UserUnionIdSchedule.java
  16. +7
    -0
      pom.xml

mlWechatOpen/src/main/java/com/iformall/config/WechatOpenProperties.java → mallinkService/src/main/java/com/iformall/config/WechatOpenProperties.java Просмотреть файл


mlWechatOpen/src/main/java/com/iformall/config/RedisProperies.java → 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;

mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenInRedisDBConfigStorage.java → 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<Jedis> jedisPool) {
public FmOpenInRedisDBConfigStorage(Pool<Jedis> jedisPool) {
this.jedisPool = jedisPool;
}

public WxOpenInRedisDBConfigStorage(Pool<Jedis> jedisPool, String keyPrefix) {
public FmOpenInRedisDBConfigStorage(Pool<Jedis> 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;

mlWechatOpen/src/main/java/com/iformall/service/wechat/WxOpenService.java → 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(),

+ 0
- 12
mlWechatOpen/pom.xml Просмотреть файл

@@ -13,8 +13,6 @@
<artifactId>mlWechatOpen</artifactId>

<properties>
<weixin-java-mp.version>3.3.0.A</weixin-java-mp.version>
<weixin-java-open.version>3.3.0.A</weixin-java-open.version>
</properties>

<dependencies>
@@ -23,16 +21,6 @@
<artifactId>mallinkService</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-open</artifactId>
<version>${weixin-java-open.version}</version>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-mp</artifactId>
<version>${weixin-java-mp.version}</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>


+ 2
- 2
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;


+ 2
- 2
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;


+ 2
- 3
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;


+ 2
- 2
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")


+ 2
- 2
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;


+ 2
- 2
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;


+ 2
- 3
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;


+ 2
- 2
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;


+ 2
- 2
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秒中一次


+ 2
- 2
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;


+ 7
- 0
pom.xml Просмотреть файл

@@ -27,6 +27,7 @@
<weixin-java-mp.version>3.3.0.A</weixin-java-mp.version>
<weixin-java-miniapp.version>3.3.0.A</weixin-java-miniapp.version>
<weixin-java-pay.version>3.3.0.A</weixin-java-pay.version>
<weixin-java-open.version>3.3.0.A</weixin-java-open.version>
<quartz.version>2.3.0</quartz.version>
</properties>

@@ -322,6 +323,12 @@
<version>${weixin-java-pay.version}</version>
</dependency>

<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-open</artifactId>
<version>${weixin-java-open.version}</version>
</dependency>

<dependency>
<groupId>com.github.ulisesbocchio</groupId>
<artifactId>jasypt-spring-boot</artifactId>


Загрузка…
Отмена
Сохранить