From 6ce2e006b5722fbb2a5378f15df8d57a145dd615 Mon Sep 17 00:00:00 2001
From: net909 <net909@163.com>
Date: Fri, 27 Dec 2024 22:27:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=9B=E5=9F=9F=E5=90=8DCN?=
 =?UTF-8?q?AME=E4=BB=A3=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/Cert.php          | 1 +
 app/data/domain_root.txt         | 3 ++-
 app/service/CertOrderService.php | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controller/Cert.php b/app/controller/Cert.php
index 649f1f8..b367492 100644
--- a/app/controller/Cert.php
+++ b/app/controller/Cert.php
@@ -375,6 +375,7 @@ class Cert extends BaseController
             $mainDomain = getMainDomain($domain);
             $drow = Db::name('domain')->where('name', $mainDomain)->find();
             if (!$drow) {
+                if (substr($domain, 0, 2) == '*.') $domain = substr($domain, 2);
                 if (!$cname || !Db::name('cert_cname')->where('domain', $domain)->where('status', 1)->find()) {
                     return ['code' => -1, 'msg' => '域名'.$domain.'未在本系统添加'];
                 }
diff --git a/app/data/domain_root.txt b/app/data/domain_root.txt
index 991d7d4..2db22b1 100644
--- a/app/data/domain_root.txt
+++ b/app/data/domain_root.txt
@@ -1922,4 +1922,5 @@ com.za
 com.zw
 mil.cn
 edu.kg
-edu.cn
\ No newline at end of file
+edu.cn
+eu.org
\ No newline at end of file
diff --git a/app/service/CertOrderService.php b/app/service/CertOrderService.php
index 7b1717d..ecb7899 100644
--- a/app/service/CertOrderService.php
+++ b/app/service/CertOrderService.php
@@ -69,6 +69,7 @@ class CertOrderService
         foreach($this->domainList as $domain){
             $mainDomain = getMainDomain($domain);
             if (!Db::name('domain')->where('name', $mainDomain)->find()) {
+                if (substr($domain, 0, 2) == '*.') $domain = substr($domain, 2);
                 $cname_row = Db::name('cert_cname')->where('domain', $domain)->where('status', 1)->find();
                 if (!$cname || !$cname_row) {
                     $errmsg = '域名'.$domain.'未在本系统添加';