Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

赵彬吉
app/Http/Controllers/Aside/Com/CNoticeController.php
app/Http/Controllers/Aside/Project/ProjectController.php
app/Http/Logic/Aside/Domain/DomainInfoLogic.php
app/Jobs/EditCustomDomainBt.php
routes/aside.php
--- a/app/Http/Controllers/Aside/Com/CNoticeController.php
查看文件 @bcb8380
+++ b/app/Http/Controllers/Aside/Com/CNoticeController.php
查看文件 @bcb8380
@@ -10,10 +10,14 @@
 namespace App\Http\Controllers\Aside\Com;
+use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Models\Domain\DomainInfo;
+use App\Models\Project\Country as CountryModel;
 use App\Models\Project\DeployBuild;
+use App\Models\WebSetting\WebLanguage;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 /**
@@ -55,4 +59,23 @@ class CNoticeController extends BaseController
         $this->response('更新中请稍后, 更新完成将会发送站内信通知更新结果！');
     }
+    /**
+     * @remark :获取当前项目选中的语种
+     * @name   :getCountry
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/12 15:20
+     */
+    public function getCountry(){
+        $countryModel = new CountryModel();
+        $info = $countryModel->read(['project_id'=>$this->param['project_id']],['id','country_lists']);
+        $ids = [];
+        if($info !== false){
+            $ids = explode(',',$info['country_lists']);
+        }
+        $languageModel = new WebLanguage();
+        //根据排序查询选中的小语种
+        $lists = $languageModel->whereIn('id', $ids)->orderByRaw(DB::raw("FIND_IN_SET(id,'" . implode(',', $ids) . "'" . ')'))->get()->toArray();
+        $this->response('success',Code::SUCCESS,$lists);
+    }
 }
--- a/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @bcb8380
+++ b/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @bcb8380
@@ -284,7 +284,7 @@ class ProjectController extends BaseController
             $info = $managerHr->read(['manage_id'=>$this->manage['id']]);
             //获取当前用户自己的项目
             $query->where(function ($subQuery) use ($info) {
-                $subQuery->whereIn('gl_project.id',[1,3])//项目1+项目3默认显示
+                $subQuery->whereIn('gl_project.id',[1])//项目1+项目3默认显示
                     ->orWhere('gl_project_deploy_build.leader_mid', $this->manage['id'])
                     ->orWhere('gl_project_deploy_build.manager_mid', $this->manage['id'])
                     ->orWhere('gl_project_deploy_build.designer_mid', $this->manage['id'])
--- a/app/Http/Logic/Aside/Domain/DomainInfoLogic.php
查看文件 @bcb8380
+++ b/app/Http/Logic/Aside/Domain/DomainInfoLogic.php
查看文件 @bcb8380
@@ -4,6 +4,7 @@ namespace App\Http\Logic\Aside\Domain;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Jobs\EditCustomDomainBt;
 use App\Jobs\EditDomainBt;
 use App\Models\Devops\ServerConfig;
 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']]);
         if($info === false){
             $this->param['project_id'] = $project_id;
-            $custom_model->add($this->param);
+            $id = $custom_model->addReturnId($this->param);
         }else{
             $custom_model->edit($this->param,['id'=>$info['id']]);
+            $id = $info['id'];
         }
         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();
--- a/app/Jobs/EditCustomDomainBt.php 0 → 100644
查看文件 @bcb8380
+++ b/app/Jobs/EditCustomDomainBt.php 0 → 100644
查看文件 @bcb8380
+<?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());
+    }
+}
--- a/routes/aside.php
查看文件 @bcb8380
+++ b/routes/aside.php
查看文件 @bcb8380
@@ -15,6 +15,7 @@ Route::middleware(['aloginauth'])->group(function () {
     Route::get('/logout', [Aside\LoginController::class, 'logout'])->name('admin.logout.white');
     Route::any('/getAccessAddress', [Aside\LoginController::class, 'getAccessAddress'])->name('admin.getAccessAddress');//获取B端地址
     Route::get('/sendNotify', [Aside\Com\CNoticeController::class, 'sendNotify'])->name('admin.sendNotify');
+    Route::get('/getCountry', [Aside\Com\CNoticeController::class, 'getCountry'])->name('admin.getCountry');
     //会员相关
     Route::prefix('user')->group(function () {