合并分支 'akun' 到 'master'

Akun



查看合并请求 !459

@@ -4,6 +4,7 @@ namespace App\Http\Logic\Aside\Domain;
 
 
 
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Jobs\EditCustomDomainBt;
 use App\Jobs\EditDomainBt;
 use App\Jobs\EditDomainBt;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
@@ -403,16 +404,18 @@ class DomainInfoLogic extends BaseLogic
         $info = $custom_model->read(['project_id'=>$project_id,'language_id'=>$this->param['language_id']]);
         $info = $custom_model->read(['project_id'=>$project_id,'language_id'=>$this->param['language_id']]);
         if($info === false){
         if($info === false){
             $this->param['project_id'] = $project_id;
             $this->param['project_id'] = $project_id;
-            $custom_model->add($this->param);
+            $id = $custom_model->addReturnId($this->param);
         }else{
         }else{
             $custom_model->edit($this->param,['id'=>$info['id']]);
             $custom_model->edit($this->param,['id'=>$info['id']]);
+            $id = $info['id'];
         }
         }
 
 
         if($this->param['is_create']){
         if($this->param['is_create']){
             //创建站点，设置证书
             //创建站点，设置证书
-            $this->param['key'] = $this->param['private_key'] ?? '';
-            $this->param['cert'] = $this->param['private_cert'] ?? '';
-            $this->setDomainSsl($server_info['init_domain'],$this->param['custom_domain'],[],[],1);
+            EditCustomDomainBt::dispatch($id);
+//            $this->param['key'] = $this->param['private_key'] ?? '';
+//            $this->param['cert'] = $this->param['private_cert'] ?? '';
+//            $this->setDomainSsl($server_info['init_domain'],$this->param['custom_domain'],[],[],1);
         }
         }
 
 
         return $this->success();
         return $this->success();

+<?php
+
+namespace App\Jobs;
+
+use App\Models\Devops\ServerConfig;
+use App\Models\Project\CountryCustom;
+use App\Models\Project\Project;
+use App\Utils\HttpUtils;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class EditCustomDomainBt implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 1; // 可配置任务重试次数
+
+    protected $domain_id;
+
+    /**
+     * Create a new job instance.
+     *
+     * @param  $domain_id
+     */
+    public function __construct($domain_id)
+    {
+        $this->domain_id = $domain_id;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return bool
+     */
+    public function handle()
+    {
+        //获取域名数据
+        $domain_model = new CountryCustom();
+        $domain_info = $domain_model->read(['id' => $this->domain_id]);
+        if ($domain_info === false) {
+            return $this->output($domain_info['custom_domain'] . ':获取域名数据失败');
+        }
+
+        //获取项目数据
+        $project_model = new Project();
+        $project_info = $project_model->read(['id' => $domain_info['project_id']], 'serve_id');
+        if ($project_info === false) {
+            return $this->output($domain_info['custom_domain'] . ':获取项目数据失败');
+        }
+
+        //获取服务器数据
+        $server_model = new ServerConfig();
+        $server_info = $server_model->read(['id' => $project_info['serve_id']], ['init_domain', 'host']);
+        if ($server_info === false) {
+            return $this->output($domain_info['custom_domain'] . ':获取服务器数据失败');
+        }
+
+        //编辑站点
+        if ($domain_info['type'] == 2) {
+            $api_url = 'http://' . $server_info['init_domain'] . '/api/setSsl';
+            $api_param = [
+                'domain' => $domain_info['custom_domain'],
+                'private_key' => $domain_info['private_key'],
+                'cert' => $domain_info['private_cert'],
+                'rewrite' => [],
+                'other_domain' => [],
+                'is_https' => 1
+            ];
+        } else {
+            $api_url = 'http://' . $server_info['init_domain'] . '/api/applySsl';
+            $api_param = [
+                'domain' => $domain_info['custom_domain'],
+                'rewrite' => [],
+                'other_domain' => [],
+                'is_https' => 1
+            ];
+        }
+        try {
+            $rs = HttpUtils::get($api_url, $api_param);
+            $rs = json_decode($rs, true);
+            if (isset($rs['status']) && $rs['status'] == 200) {
+                $this->output($domain_info['custom_domain'] . ':站点编辑成功');
+            } else {
+                $this->output($domain_info['custom_domain'] . ':站点编辑失败,原因:' . ($rs['message'] ?? ''));
+            }
+        } catch (\Exception | GuzzleException $e) {
+            $this->output($domain_info['custom_domain'] . ':站点编辑失败,原因:' . $e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * 输出处理日志
+     * @param $message
+     * @return bool
+     */
+    public function output($message)
+    {
+        echo date('Y-m-d H:i:s') . ' | ' . $message . PHP_EOL;
+        return true;
+    }
+
+    public function failed(\Exception $exception)
+    {
+        return $this->output($exception->getMessage());
+    }
+}