diff --git a/pom.xml b/pom.xml
index 3b7d717..4b97e1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,8 @@
3.5.10.1
2.8.5
5.17.0
+ UTF-8
+ UTF-8
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());