BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr
Fixed the issue where the domain list certificates were displayed incorrectly.
lotkcbe25ea7f1cb
diff --git a/core/internal/service/domains/domains.go b/core/internal/service/domains/domains.goindex 9712e47b..bc9a28ed 100644--- a/core/internal/service/domains/domains.go+++ b/core/internal/service/domains/domains.go@@ -202,7 +202,6 @@ func Get(ctx context.Context, keyword string, page, pageSize int) ([]v1.Domain,defaultDomain = val.String()}MultiIPDomainConfigs, err := multi_ip_domain.MultiIPDomainServiceInstance.GetConfigs(ctx)- g.Log().Debug(ctx, "多域名专属ip Multi IP Domain Configs:", MultiIPDomainConfigs)// 创建域名到专属IP配置的映射multiIPMap := make(map[string][]v1.MultiIPDomain)@@ -252,12 +251,7 @@ func Get(ctx context.Context, keyword string, page, pageSize int) ([]v1.Domain,wg.Add(1)go func(i int, domain v1.Domain) {defer wg.Done()- domains[i].CertInfo, err = crt.GetSSLInfo(domain.Domain)-- if err != nil {- err = nil- domains[i].CertInfo, _ = crt.GetSSLInfo(public.FormatMX(domain.Domain))- }+ domains[i].CertInfo, err = crt.GetSSLInfo(public.FormatMX(domain.Domain))}(i, domain)diff --git a/core/internal/service/mail_service/certificate.go b/core/internal/service/mail_service/certificate.goindex e4f9a6ac..c1f44264 100644--- a/core/internal/service/mail_service/certificate.go+++ b/core/internal/service/mail_service/certificate.go@@ -472,10 +472,10 @@ func (c *Certificate) GetSSLStatus(domain string) (bool, error) {func (c *Certificate) GetSSLInfo(domain string) (certInfo v1.CertInfo, err error) {// First try to get certificate from database (acme managed certificates)- certInfo, err = c.getSSLInfoFromDatabase(domain)- if err == nil && certInfo.Endtime > 0 {- return // Successfully got certificate info from database- }+ //certInfo, err = c.getSSLInfoFromDatabase(domain)+ //if err == nil && certInfo.Endtime > 0 {+ // return certInfo, err+ //}// Fallback to file system (legacy certificates)return c.getSSLInfoFromFiles(domain)@@ -551,7 +551,7 @@ func (c *Certificate) getSSLInfoFromFiles(domain string) (certInfo v1.CertInfo,}}- return+ return certInfo, err}// checkCertificateFiles verifies certificate files exist