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

刘锟
app/Console/Commands/UpdateRoute.php
app/Console/Commands/WebsiteData.php
app/Http/Controllers/Aside/Template/ATemplateController.php
app/Models/RouteMap/RouteMap.php
--- a/app/Console/Commands/UpdateRoute.php
查看文件 @93611d2
+++ b/app/Console/Commands/UpdateRoute.php
查看文件 @93611d2
@@ -54,7 +54,7 @@ class UpdateRoute extends Command
      */
     public function handle(){
         $projectModel = new Project();
-        $lists = $projectModel->list(['is_upgrade'=>0,'type'=>['!=',0]]);
+        $lists = $projectModel->list(['is_upgrade'=>0,'type'=>['!=',0],'id'=>44]);
         foreach ($lists as $k => $v){
             echo date('Y-m-d H:i:s') . ' start: 项目id为' . $v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
@@ -80,16 +80,46 @@ class UpdateRoute extends Command
         $productModel = new Product();
         $productList = $productModel->list(['status'=>['!=',2]],'id',['id','route']);
         foreach ($productList as $v){
-            $route = preg_replace('/-product.*/', '', $v['route']);
-            $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT, $v['id'], $project_id);
-            $route = $route.'-product';
+            $route = preg_replace('/-2-1-product.*/', '', $v['route']);
+            $route = preg_replace('/-1-1-product.*/', '', $route);
+            $route = preg_replace('/-2-product.*/', '', $route);
+            $route = preg_replace('/-1-product.*/', '', $route);
+            $route = preg_replace('/-product.*/', '', $route);
+            $i = 0;
+            echo date('Y-m-d H:i:s') . ' 计数:' . $i . PHP_EOL;
+            $routes = $this->productRoute($route,$v['id'],$i);
+            $route = RouteMap::setRoute($routes, RouteMap::SOURCE_PRODUCT, $v['id'], $project_id);
+            echo date('Y-m-d H:i:s') . ' 路由表返回的route:' . $route . PHP_EOL;
             $productModel->edit(['route'=>$route],['id'=>$v['id']]);
-            RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT, $v['id'], $project_id);
         }
         return true;
     }
     /**
+     * @remark :产品新增单独处理路由
+     * @name   :setProductRoute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/21 18:48
+     */
+    public function productRoute($route,$id,$i){
+        if($i == 0){
+            $routes = $route.'-product';
+        }else{
+            $routes = $route.'-'.$i.'-product';
+        }
+        $routeMapModel = new RouteMap();
+        $routeInfo = $routeMapModel->read(['route'=>$routes,'id'=>['!=',$id]]);
+        if($routeInfo === false){
+            echo date('Y-m-d H:i:s') . ' route:' . $routes . PHP_EOL;
+            return $routes;
+        }else{
+            $i = $i + 1;
+            return $this->productRoute($route,$id,$i);
+        }
+    }
+
+    /**
      * @remark :设置路由
      * @name   :setRoute
      * @author :lyh
--- a/app/Console/Commands/WebsiteData.php
查看文件 @93611d2
+++ b/app/Console/Commands/WebsiteData.php
查看文件 @93611d2
@@ -57,7 +57,8 @@ class WebsiteData extends Command
     public function post_data($data)
     {
-        return http_post("http://aicc-local.com/api/save_file_data", json_encode(compact('data')));
+        $url = env('AICC_URL');
+        return http_post("{$url}/api/save_file_data", json_encode(compact('data')));
     }
 }
--- a/app/Http/Controllers/Aside/Template/ATemplateController.php
查看文件 @93611d2
+++ b/app/Http/Controllers/Aside/Template/ATemplateController.php
查看文件 @93611d2
@@ -25,6 +25,7 @@ class ATemplateController extends BaseController
      */
     public function lists(ATemplateLogic $aTemplateLogic){
         $filed = ['id','name','image','url','status','sort','deleted_status','test_model','created_at','project_id'];
+        $this->map['project_id'] = 0;
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
--- a/app/Models/RouteMap/RouteMap.php
查看文件 @93611d2
+++ b/app/Models/RouteMap/RouteMap.php
查看文件 @93611d2
@@ -56,10 +56,12 @@ class RouteMap extends Base
         $i=1;
         $sign = generateRoute($title);
         $route = $sign;
+        if($source != BTemplate::SOURCE_PRODUCT){
             while(self::isExist($route, $source, $source_id, $project_id)){
                 $route = $sign .'-'.$i;
                 $i++;
             }
+        }
         return $route;
     }
@@ -110,12 +112,12 @@ class RouteMap extends Base
         try {
             $route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first();
             //上线项目 不能修改链接了
-            if($route_map){
-                $project = ProjectLogic::instance()->getInfo($project_id);
-                if($project['type'] !== Project::STATUS_ONE){
-                    return $route_map->route;
-                }
-            }
+//            if($route_map){
+//                $project = ProjectLogic::instance()->getInfo($project_id);
+//                if($project['type'] !== Project::STATUS_ONE){
+//                    return $route_map->route;
+//                }
+//            }
             if(!$route_map){
                 $route_map = new self();
                 $route_map->source = $source;
@@ -135,6 +137,7 @@ class RouteMap extends Base
                 $route_map->path = self::SOURCE_BLOG;
             }
             $route_map->route = $route;
+            echo date('Y-m-d H:i:s') . ' 保存时的route:' . $route . PHP_EOL;
             $route_map->save();
         }catch (\Exception $e){
             throw new \Exception('路由映射失败');