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

@@ -82,12 +82,22 @@ class SyncSubmitTask extends Command
     public function getTaskId()
     public function getTaskId()
     {
     {
         $task_id = Redis::rpop('sync_submit_task');
         $task_id = Redis::rpop('sync_submit_task');
+        $lockKey = 'lock_sync_submit_task';
         if (empty($task_id)) {
         if (empty($task_id)) {
+            // 获取锁
+            if (Redis::setnx($lockKey, 1)) {
+                // 设置锁的过期时间，防止死锁
+                Redis::expire($lockKey, 10);
                 $ids = SyncSubmitTaskModel::where('status', 0)->limit(100)->pluck('id');
                 $ids = SyncSubmitTaskModel::where('status', 0)->limit(100)->pluck('id');
                 foreach ($ids as $id) {
                 foreach ($ids as $id) {
                     Redis::lpush('sync_submit_task', $id);
                     Redis::lpush('sync_submit_task', $id);
                 }
                 }
                 $task_id = Redis::rpop('sync_submit_task');
                 $task_id = Redis::rpop('sync_submit_task');
+                Redis::del($lockKey);
+            } else {
+                // 未获取到锁
+                return '';
+            }
         }
         }
         return $task_id;
         return $task_id;
     }
     }

@@ -6,6 +6,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Domain\DomainInfoLogic;
 use App\Http\Logic\Aside\Domain\DomainInfoLogic;
 use App\Http\Requests\Aside\Domain\DomainInfoRequest;
 use App\Http\Requests\Aside\Domain\DomainInfoRequest;
+use App\Models\Domain\CountryCode;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\JsonResponse;
@@ -203,4 +204,17 @@ class DomainInfoController extends BaseController
         $domainInfoLogic->sslSave();
         $domainInfoLogic->sslSave();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * 获取可屏蔽国家列表
+     * @author Akun
+     * @date 2024/07/01 16:41
+     */
+    public function getCountryCode()
+    {
+        $countryModel = new CountryCode();
+        $list = $countryModel->list([],'id',['id','c_name'],'asc');
+
+        $this->response('success',Code::SUCCESS,$list);
+    }
 }
 }

+<?php
+
+namespace App\Models\Domain;
+
+use App\Models\Base;
+
+class CountryCode extends Base
+{
+    protected $table = 'gl_country_code';
+}

@@ -247,6 +247,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/del', [Aside\Domain\DomainInfoController::class, 'del'])->name('admin.domain_del');
         Route::any('/del', [Aside\Domain\DomainInfoController::class, 'del'])->name('admin.domain_del');
         Route::any('/setSsl', [Aside\Domain\DomainInfoController::class, 'setSsl'])->name('admin.domain_setSsl');
         Route::any('/setSsl', [Aside\Domain\DomainInfoController::class, 'setSsl'])->name('admin.domain_setSsl');
         Route::any('/log', [Aside\Domain\DomainInfoLogController::class, 'lists'])->name('admin.domain_log_lists');     // 日志
         Route::any('/log', [Aside\Domain\DomainInfoLogController::class, 'lists'])->name('admin.domain_log_lists');     // 日志
+        Route::any('/getCountryCode', [Aside\Domain\DomainInfoController::class, 'getCountryCode'])->name('admin.get_country_code');
 
 
     });
     });
     //图片操作
     //图片操作