合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2175

@@ -9,37 +9,17 @@
 
 namespace App\Console\Commands\LyhTest;
 
-use App\Console\Commands\Domain\DomainInfo;
-use App\Helper\OaGlobalsoApi;
-use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Models\Ai\AiBlog;
-use App\Models\Ai\AiBlogAuthor;
-use App\Models\Ai\AiCommand;
-use App\Models\Com\NoticeLog;
-use App\Models\Com\V6WeeklyReport;
 use App\Models\Product\Category;
 use App\Models\Project\AggregateKeywordAffix;
 use App\Models\Project\AiBlogTask;
-use App\Models\Project\DeployBuild;
-use App\Models\Project\DeployOptimize;
-use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Project\ProjectAiSetting;
-use App\Models\ProjectAssociation\ProjectAssociation;
-use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BTemplateMain;
 use App\Models\Template\TemplateTypeMain;
-use App\Models\Visit\Visit;
-use App\Models\WebSetting\TranslateBigProject;
-use App\Models\WebSetting\WebLanguage;
-use App\Models\WebSetting\WebSetting;
-use App\Models\Workchat\MessagePush;
 use App\Services\AiBlogService;
-use App\Services\AiCommandService;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 
 class lyhDemo extends Command
@@ -59,21 +39,6 @@ class lyhDemo extends Command
     protected $description = '更新路由';
 
     public function handle(){
-        $aggregateKeywordAffixModel = new AggregateKeywordAffix();
-        $info = $aggregateKeywordAffixModel->read(['project_id'=>3298]);
-        $projectModel = new Project();
-        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>2], 'id', ['id']);
-        foreach ($lists as $item){
-            if(in_array($item['id'],[467,110,3298])){
-                continue;
-            }
-            $data = [
-                'project_id'=>$item['id'],
-                'prefix'=>$info['prefix'],
-                'suffix'=>$info['suffix']
-            ];
-            $aggregateKeywordAffixModel->addReturnId($data);
-        }
         return true;
     }
 

@@ -836,6 +836,13 @@ function ends_with($string, $suffix)
     return substr($string, -strlen($suffix)) === $suffix;
 }
 
+/**
+ * @remark :扩展模块分类路由
+ * @name   :getCustomRouteMap
+ * @author :lyh
+ * @method :post
+ * @time   :2025/6/21 9:57
+ */
 function getCustomRouteMap($module_route,$route = '')
 {
     if($module_route == $route){

@@ -202,7 +202,7 @@ class BlogCategoryLogic extends BaseLogic
         RouteMap::delRoute(RouteMap::SOURCE_BLOG_CATE, $id, $this->user['project_id']);
         //生成一条删除路由记录
         $info = $this->model->read(['id'=>$id],['id','alias']);
-        $this->curlDelRoute(['old_route'=>$info['alias']]);
+        $this->curlDelRoute(['old_route'=>$info['alias'],'source'=>RouteMap::SOURCE_BLOG_CATE]);
         return $this->success();
     }
 

@@ -161,7 +161,7 @@ class BlogLogic extends BaseLogic
     public function delRoute($id){
         //生成一条删除路由记录
         $info = $this->model->read(['id'=>$id],['id','url']);
-        $this->curlDelRoute(['old_route'=>$info['url']]);
+        $this->curlDelRoute(['old_route'=>$info['url'],'source'=>RouteMap::SOURCE_BLOG]);
         return $this->success();
     }
 

@@ -11,6 +11,7 @@ namespace App\Http\Logic\Bside\CustomModule;
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Com\NoticeLog;
+use App\Models\CustomModule\CustomModule;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BTemplate;
@@ -221,7 +222,10 @@ class CustomModuleCategoryLogic extends BaseLogic
         }
         RouteMap::delRoute(RouteMap::SOURCE_MODULE_CATE, $id, $this->user['project_id']);
         //通知
-        $this->curlDelRoute(['old_route'=>$info['route']]);
+        //获取模块路由
+        $customModuleModel = new CustomModule();
+        $moduleInfo = $customModuleModel->read(['id'=>$info['module_id']]);
+        $this->curlDelRoute(['old_route'=>$info['route'],'path'=>getCustomRouteMap($moduleInfo['route'],$info['route'])]);
         return $this->success();
     }
 

@@ -355,8 +355,13 @@ class CustomModuleContentLogic extends BaseLogic
     {
         RouteMap::delRoute(RouteMap::SOURCE_MODULE, $id, $this->user['project_id']);
         //通知
-        $info = $this->model->read(['id' => $id], ['id', 'route']);
-        $this->curlDelRoute(['old_route'=>$info['route']]);
+        $info = $this->model->read(['id' => $id], ['id', 'route','category_id']);
+        $categoryIdArr = $info['category_id'];
+        $cate_id = (int)array_shift($categoryIdArr);
+        $routeMapModel = new RouteMap();
+        $routeInfo = $routeMapModel->read(['source'=>RouteMap::SOURCE_MODULE_CATE,'source_id'=>$cate_id]);
+        $path = ($routeInfo['route'] ?? '');
+        $this->curlDelRoute(['old_route'=>$info['route'],'path'=>$path]);
         return $this->success();
     }
 

@@ -216,7 +216,7 @@ class NewsCategoryLogic extends BaseLogic
         //删除路由映射
         RouteMap::delRoute(RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']);
         $info = $this->model->read(['id'=>$id],['id','alias']);
-        $this->curlDelRoute(['old_route'=>$info['alias']]);
+        $this->curlDelRoute(['old_route'=>$info['alias'],'source'=>RouteMap::SOURCE_NEWS_CATE]);
         return $this->success();
     }
 

@@ -357,7 +357,7 @@ class NewsLogic extends BaseLogic
     {
         //生成一条删除路由记录
         $info = $this->model->read(['id' => $id], ['id', 'url']);
-        $this->curlDelRoute(['old_route'=>$info['url']]);
+        $this->curlDelRoute(['old_route'=>$info['url'],'source'=>RouteMap::SOURCE_NEWS]);
         return $this->success();
     }
 

@@ -199,7 +199,7 @@ class CategoryLogic extends  BaseLogic
         //生成一条删除路由记录
         $info = $this->model->read(['id'=>$id],['id','route']);
         if($info !== false){
-            $this->curlDelRoute(['old_route'=>$info['route']]);
+            $this->curlDelRoute(['old_route'=>$info['route'],'source'=>RouteMap::SOURCE_PRODUCT_CATE]);
         }
         return $this->success();
     }

@@ -188,7 +188,7 @@ class KeywordLogic extends  BaseLogic
         //生成一条删除路由记录
         $info = $this->model->read(['id'=>$id],['id','route']);
         if($info !== false){
-            $this->curlDelRoute(['old_route'=>$info['route']]);
+            $this->curlDelRoute(['old_route'=>$info['route'],'source'=>RouteMap::SOURCE_PRODUCT_KEYWORD]);
         }
         return $this->success();
     }

@@ -472,7 +472,7 @@ class ProductLogic extends  BaseLogic
     public function delRoute($id){
         //生成一条删除路由记录
         $info = $this->model->read(['id'=>$id],['id','route']);
-        $this->curlDelRoute(['old_route'=>$info['route']]);
+        $this->curlDelRoute(['old_route'=>$info['route'],'source'=>RouteMap::SOURCE_PRODUCT]);
         return $this->success();
     }