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 d5f36fc..0be2132 100644
--- a/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java
+++ b/mallinkService/src/main/java/com/iformall/service/wechat/FmOpenInRedisDBConfigStorage.java
@@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Async;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
-import redis.clients.util.Pool;
+import redis.clients.jedis.util.Pool;
import java.util.Date;
diff --git a/mallinkService/src/main/java/com/iformall/service/wechat/handler/WeappAuditHandler.java b/mallinkService/src/main/java/com/iformall/service/wechat/handler/WeappAuditHandler.java
index 2ac1ae0..8d6c234 100644
--- a/mallinkService/src/main/java/com/iformall/service/wechat/handler/WeappAuditHandler.java
+++ b/mallinkService/src/main/java/com/iformall/service/wechat/handler/WeappAuditHandler.java
@@ -43,14 +43,14 @@ public class WeappAuditHandler extends AbstractHandler {
WxSessionManager sessionManager) {
String appId = wxMpService.getWxMpConfigStorage().getAppId();
if(wxMessage.getEvent().equalsIgnoreCase(WxConsts.EventType.WEAPP_AUDIT_SUCCESS)) {
- updateAuditStatus(appId, true, new Date(wxMessage.getSuccTime()*1000), null, null);
+ updateAuditStatus(appId, true, new Date(wxMessage.getSuccTime()*1000), null);
} else if(wxMessage.getEvent().equalsIgnoreCase(WxConsts.EventType.WEAPP_AUDIT_FAIL)) {
- updateAuditStatus(appId, false, new Date(wxMessage.getFailTime()*1000), wxMessage.getReason(), wxMessage.getScreenShot());
+ updateAuditStatus(appId, false, new Date(wxMessage.getFailTime()*1000), wxMessage.getReason());
}
return null;
}
- private void updateAuditStatus(String appId, boolean success, Date auditTime, String reason, String screenShot) {
+ private void updateAuditStatus(String appId, boolean success, Date auditTime, String reason) {
WxWeappAuditStatus auditStatus = weappAuditStatusService.getByAppId(appId);
if (auditStatus != null) {
if (success) {
@@ -59,7 +59,6 @@ public class WeappAuditHandler extends AbstractHandler {
} else {
auditStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode());
auditStatus.setAuditErrCode(reason);
- auditStatus.setScreenShot(screenShot);
}
auditStatus.setAuditTime(auditTime);
weappAuditStatusService.updateStatus(auditStatus);
diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java
index 7eac075..1673a27 100644
--- a/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java
+++ b/mlWechatOpen/src/main/java/com/iformall/controller/card/WxCardController.java
@@ -276,7 +276,7 @@ public class WxCardController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxCardController::getCardList");
try {
WxMpService mpService = openService.getWxOpenComponentService().getWxMpServiceByAppid(appId);
- WxMpCardUserGetCardListResult result = mpService.getCardService().getUserCardList(openId, null);
+ WxUserCardListResult result = mpService.getCardService().getUserCardList(openId, null);
logger.info(result.toString());
} catch (WxErrorException e) {
logger.error(e.getMessage());
diff --git a/pom.xml b/pom.xml
index b17842f..224378d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,16 +18,16 @@
org.springframework.boot
spring-boot-starter-parent
- 2.1.8.RELEASE
+ 2.2.5.RELEASE
- 3.6.0.A
- 3.6.0.A
- 3.6.0.A
- 3.6.0.A
- 3.6.0.A
+ 3.7.0.A
+ 3.7.0.A
+ 3.7.0.A
+ 3.7.0.A
+ 3.7.0.A
2.3.0
@@ -101,13 +101,7 @@
com.baomidou
mybatis-plus-boot-starter
- 3.1.0
-
-
-
- org.mybatis.spring.boot
- mybatis-spring-boot-starter
- 2.1.0
+ 3.3.1