合并分支 'zhl' 到 'master'

u



查看合并请求 !2

@@ -114,6 +114,7 @@ public function createSiteEvent($id, $param)
         $ssl_auto_day = $ssl_auto_day > 15 ? 15 : max($ssl_auto_day, 5);
         $ssl_auto_day = $ssl_auto_day > 15 ? 15 : max($ssl_auto_day, 5);
         if (empty($domain) || FALSE == filter_var($domain, FILTER_VALIDATE_URL)) {
         if (empty($domain) || FALSE == filter_var($domain, FILTER_VALIDATE_URL)) {
             if (FALSE == empty($callback) && filter_var($callback, FILTER_VALIDATE_URL)) {
             if (FALSE == empty($callback) && filter_var($callback, FILTER_VALIDATE_URL)) {
+                $param['result_status'] = 400;
                 $param['result_message'] = 'domain信息错误';
                 $param['result_message'] = 'domain信息错误';
                 BtEvents::createBtEvent(BtEvents::TYPE_EVENT_CALLBACK, json_encode($param));
                 BtEvents::createBtEvent(BtEvents::TYPE_EVENT_CALLBACK, json_encode($param));
             }
             }

@@ -61,17 +61,17 @@ public function handle()
 
 
             // 未生成ssl 申请ssl
             // 未生成ssl 申请ssl
             if ($val->ssl_status == 0) {
             if ($val->ssl_status == 0) {
-                $result = app(BtRepository::class)->applySsl($sites->domain);
+                $result = app(BtRepository::class)->applySsl($val->domain);
                 if (empty($result))
                 if (empty($result))
-                    BtEvents::createBtEvent(BtEvents::TYPE_CREATE_SSL, json_encode(['host' => $sites->domain]));
+                    BtEvents::createBtEvent(BtEvents::TYPE_CREATE_SSL, json_encode(['host' => $val->domain]));
                 continue;
                 continue;
             }
             }
 
 
             // 开启ssl续签 检查是否到期进行续签
             // 开启ssl续签 检查是否到期进行续签
             if ($val->ssl_auto) {
             if ($val->ssl_auto) {
-               $result = app(BtRepository::class)->renewalSsl($sites->domain);
+               $result = app(BtRepository::class)->renewalSsl($val->domain);
                if (empty($result))
                if (empty($result))
-                   BtEvents::createBtEvent(BtEvents::TYPE_RENEWAL_SSL, json_encode(['host' => $sites->domain]));
+                   BtEvents::createBtEvent(BtEvents::TYPE_RENEWAL_SSL, json_encode(['host' => $val->domain]));
                continue;
                continue;
             }
             }