Pre Merge pull request !204 from wuKong/master-jdk17

yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/controller/admin/message/vo/message/MpMessagePageReqVO.java

@@ -28,6 +28,9 @@ public class MpMessagePageReqVO extends PageParam {
     @Schema(description = "公众号粉丝标识", example = "o6_bmjrPTlm6_2sgVt7hMZOPfL2M")
     private String openid;
 
+    @Schema(description = "公众号粉丝 UserId", example = "1")
+    private String userId;
+
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @Schema(description = "创建时间")
     private LocalDateTime[] createTime;

yudao-module-mp/yudao-module-mp-server/src/main/java/cn/iocoder/yudao/module/mp/dal/mysql/message/MpMessageMapper.java

@@ -15,6 +15,7 @@ public interface MpMessageMapper extends BaseMapperX<MpMessageDO> {
                 .eqIfPresent(MpMessageDO::getAccountId, reqVO.getAccountId())
                 .eqIfPresent(MpMessageDO::getType, reqVO.getType())
                 .eqIfPresent(MpMessageDO::getOpenid, reqVO.getOpenid())
+                .eqIfPresent(MpMessageDO::getUserId, reqVO.getUserId())
                 .betweenIfPresent(MpMessageDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(MpMessageDO::getId));
     }

yudao-module-pay/yudao-module-pay-server/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/alipay/AbstractAlipayPayClient.java

@@ -353,7 +353,7 @@ public abstract class AbstractAlipayPayClient extends AbstractPayClient<AlipayPa
         } else if (Objects.equals(config.getMode(), MODE_CERTIFICATE)) {
             // 由于 rsaCertCheckV1 的第二个参数是 path，所以不能这么调用！！！通过阅读源码，发现可以采用如下方式！
             X509Certificate cert = AntCertificationUtil.getCertFromContent(config.getAlipayPublicCertContent());
-            String publicKey = Base64.encodeBase64String(cert.getEncoded());
+            String publicKey = Base64.encodeBase64String(cert.getPublicKey().getEncoded());
             verify = AlipaySignature.rsaCheckV1(params, publicKey,
                     StandardCharsets.UTF_8.name(), config.getSignType());
         } else {