Merge remote-tracking branch 'origin/master' into akun

@@ -4,6 +4,7 @@ namespace App\Console\Commands;
 
 
 
 
 use App\Exceptions\InquiryFilterException;
 use App\Exceptions\InquiryFilterException;
+use App\Models\Project\Project;
 use App\Services\SyncSubmitTaskService;
 use App\Services\SyncSubmitTaskService;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use App\Models\SyncSubmitTask\SyncSubmitTask as SyncSubmitTaskModel;
 use App\Models\SyncSubmitTask\SyncSubmitTask as SyncSubmitTaskModel;
@@ -48,6 +49,9 @@ class SyncSubmitTask extends Command
                 continue;
                 continue;
             }
             }
             try {
             try {
+                $project = Project::getProjectByDomain($task_info['data']['domain'] ?? '');
+                $task_info->project_id = $project->id;
+
                 SyncSubmitTaskService::handler($task_info);
                 SyncSubmitTaskService::handler($task_info);
                 $task_info->status = 1;
                 $task_info->status = 1;
                 $task_info->save();
                 $task_info->save();

@@ -11,6 +11,7 @@ use App\Models\Inquiry\InquiryFormData;
 use App\Models\Nav\BNav;
 use App\Models\Nav\BNav;
 use App\Models\Nav\BNavGroup;
 use App\Models\Nav\BNavGroup;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Models\SyncSubmitTask\SyncSubmitTask as SyncSubmitTaskModel;
 use App\Models\WebSetting\Translate as TranslateModel;
 use App\Models\WebSetting\Translate as TranslateModel;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
@@ -55,6 +56,25 @@ class Test extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
+
+        $i=0;
+        while (true){
+            $list = SyncSubmitTaskModel::where('project_id', 0)->limit(1000)->get();
+            if(!$list){
+                exit;
+            }
+            foreach ($list as $item){
+                $project = Project::getProjectByDomain($item['data']['domain'] ?? '');
+                $item->project_id = $project->id;
+                $item->save();
+            }
+            echo $i . PHP_EOL;
+            $i++;
+        }
+
+        exit;
+
+
         ProjectServer::useProject(3);
         ProjectServer::useProject(3);
         $data = [
         $data = [
             'c' => 'c',
             'c' => 'c',

@@ -14,6 +14,7 @@ use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\CustomModule\CustomModuleContentLogic;
 use App\Http\Logic\Bside\CustomModule\CustomModuleContentLogic;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleContent;
+use App\Models\RouteMap\RouteMap;
 use App\Models\User\User;
 use App\Models\User\User;
 
 
 class CustomModuleContentController extends BaseController
 class CustomModuleContentController extends BaseController
@@ -36,6 +37,7 @@ class CustomModuleContentController extends BaseController
         if(!empty($lists)){
         if(!empty($lists)){
             $data = $this->getAllCategoryName();
             $data = $this->getAllCategoryName();
             foreach ($lists['list'] as $k=>$v){
             foreach ($lists['list'] as $k=>$v){
+                $v['url'] = $this->getUrl($v);
                 $v['category_name'] = $this->categoryName($v['category_id'],$data);
                 $v['category_name'] = $this->categoryName($v['category_id'],$data);
                 $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
                 $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
                 $v['operator_name'] = (new User())->getName($v['operator_id']);
                 $v['operator_name'] = (new User())->getName($v['operator_id']);
@@ -46,6 +48,27 @@ class CustomModuleContentController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取连接
+     * @name   :getUrl
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/29 14:56
+     */
+    public function getUrl($v){
+        $routeMapModel = new RouteMap();
+        if(!empty($v) && !empty($v['category_id'])){
+            $categoryIdArr = $v['category_id'];
+            $cate_id = (int)array_shift($categoryIdArr);
+            $routeInfo = $routeMapModel->read(['source'=>RouteMap::SOURCE_MODULE_CATE,'source_id'=>$cate_id]);
+            $v['path'] = ($routeInfo['route'] ?? '');
+            if(!empty($v['path'])){
+                $v['path'] = $v['path'].'/';
+            }
+        }
+        return $this->user['domain'].$v['path'].$v['route'];
+    }
+
+    /**
      * @remark :获取所有分类名称
      * @remark :获取所有分类名称
      * @name   :getAllCategoryName
      * @name   :getAllCategoryName
      * @author :lyh
      * @author :lyh

@@ -311,15 +311,23 @@ class Project extends Base
      */
      */
     public static function getProjectByDomain($domain)
     public static function getProjectByDomain($domain)
     {
     {
-        $domain_parse = parse_url($domain);
-        $domain = $domain_parse['host'] ?? $domain;
-        //是否测试域名
-        $project_id = DeployBuild::where('test_domain', 'https://' . $domain . '/')->value('project_id');
-        //是否正式域名
-        if (!$project_id) {
-            $project_id = \App\Models\Domain\DomainInfo::where('domain', $domain)->value('project_id');
+        $cache_key = 'getProjectByDomain_' . $domain;
+        $project = Cache::get($cache_key);
+        if(!$project){
+            $domain_parse = parse_url($domain);
+            $domain = $domain_parse['host'] ?? $domain;
+            //是否测试域名
+            $project_id = DeployBuild::where('test_domain', 'https://' . $domain . '/')->value('project_id');
+            //是否正式域名
+            if (!$project_id) {
+                $project_id = \App\Models\Domain\DomainInfo::where('domain', $domain)->value('project_id');
+            }
+            $project = self::find($project_id ?: 0);
+            if($project){
+                Cache::put($cache_key, $project, 3600);
+            }
         }
         }
-        return self::find($project_id ?: 0);
+        return $project;
     }
     }
 
 
     /**
     /**