From 0997ddbae2333721cf229c183ecb8233cad29585 Mon Sep 17 00:00:00 2001
From: cheney <qian.huang@sunyard.com>
Date: Wed, 6 May 2026 11:49:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E5=9F=BA=EF=BC=8C=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 2 ++
 .../cert/repository/impl/CertificateRepositoryImpl.java   | 5 +----
 .../cisd/tms/modules/cert/service/CertificateService.java | 8 ++++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b7d717..4b97e1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,8 @@
         <mybatis-plus.version>3.5.10.1</mybatis-plus.version>
         <springdoc.version>2.8.5</springdoc.version>
         <mockito.version>5.17.0</mockito.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
     <dependencies>
diff --git a/src/main/java/com/cisd/tms/modules/cert/repository/impl/CertificateRepositoryImpl.java b/src/main/java/com/cisd/tms/modules/cert/repository/impl/CertificateRepositoryImpl.java
index e9e1aed..b7876b4 100644
--- a/src/main/java/com/cisd/tms/modules/cert/repository/impl/CertificateRepositoryImpl.java
+++ b/src/main/java/com/cisd/tms/modules/cert/repository/impl/CertificateRepositoryImpl.java
@@ -87,10 +87,7 @@ public class CertificateRepositoryImpl implements CertificateRepository {
         if (StringUtils.hasText(request.getCertType())) {
             wrapper.eq(CertificateEntity::getCertType, request.getCertType());
         }
-        if (StringUtils.hasText(request.getKeyword())) {
-            wrapper.and(w -> w.like(CertificateEntity::getSubjectDn, request.getKeyword())
-                    .or().like(CertificateEntity::getIssuerDn, request.getKeyword()));
-        }
+
         wrapper.orderByDesc(CertificateEntity::getImportTime);
         long total = mapper.selectCount(wrapper);
         long offset = (long) (request.getPageNum() - 1) * request.getPageSize();
diff --git a/src/main/java/com/cisd/tms/modules/cert/service/CertificateService.java b/src/main/java/com/cisd/tms/modules/cert/service/CertificateService.java
index 69915fc..6807848 100644
--- a/src/main/java/com/cisd/tms/modules/cert/service/CertificateService.java
+++ b/src/main/java/com/cisd/tms/modules/cert/service/CertificateService.java
@@ -11,6 +11,7 @@ import com.cisd.tms.modules.cert.entity.CertificateEntity;
 import com.cisd.tms.modules.cert.repository.CertificateRepository;
 import com.cisd.tms.modules.cert.support.CertPemSupport;
 import com.cisd.tms.modules.cert.support.CertRuntimeStatusResolver;
+import com.cisd.tms.modules.cert.support.CertUtil;
 import org.bouncycastle.asn1.x509.KeyPurposeId;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -200,6 +201,13 @@ public class CertificateService {
                 .orElseThrow(() -> new BizException(ErrorCode.BAD_REQUEST.getCode(), "证书不存在"));
     }
 
+    public X509Certificate getBySubjectDn(String dn) {
+        CertificateEntity cert = certificateRepository.findBySubjectDn(dn)
+                .orElseThrow(() -> new BizException(ErrorCode.BAD_REQUEST.getCode(), "证书不存在"));
+        return CertUtil.convertToX509Cert( cert.getCertData() );
+    }
+
+
     private void assertValidTime(X509Certificate certificate) {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime notBefore = LocalDateTime.ofInstant(certificate.getNotBefore().toInstant(), ZoneId.systemDefault());