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

@@ -54,12 +54,10 @@ class UpdateRoute extends Command
      */
     public function handle(){
         $projectModel = new Project();
-        $lists = $projectModel->list(['is_upgrade'=>0,'id'=>['<',166],'type'=>['!=',0]]);
+        $lists = $projectModel->list(['is_upgrade'=>0,'id'=>['>',167],'type'=>['!=',0]]);
         foreach ($lists as $k => $v){
             echo date('Y-m-d H:i:s') . ' start: 项目id为' . $v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
-            $routeMapModel = new RouteMap();
-            $routeMapModel->del(['source'=>'blog_category']);
 //            $this->setProductRoute($v['id']);
             $this->setProductKeywordRoute($v['id']);
 //            $this->setBlogRoute($v['id']);
@@ -198,11 +196,13 @@ class UpdateRoute extends Command
         $keywordList = $keywordModel->list([],'id',['id','route']);
         if(!empty($keywordList)){
             foreach ($keywordList as $v){
-                if(!ends_with($v['route'],'-tag')){
-                    $route = $v['route'].'-tag';
-                    $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-                    RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $project_id);
-                }
+//                if(!ends_with($v['route'],'-tag')){
+//                    $route = $v['route'].'-tag';
+//                    $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+//                }
+                $routeMapModel = new RouteMap();
+                $routeMapModel->edit(['route'=>$v['route']],['source_id'=>$v['id'],'source'=>RouteMap::SOURCE_PRODUCT_KEYWORD]);
+                RouteMap::setRoute($v['route'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $project_id);
             }
         }
         return true;

@@ -32,7 +32,7 @@ class BTemplateModuleController extends BaseController
         $moduleProjectModel = new BModuleProject();
         $module_list = $moduleProjectModel->list(['project_id'=>$this->user['project_id']]);
         $data['module_list'] = $module_list;
-        $this->response('success',Code::SUCCESS,$list);
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**

@@ -56,12 +56,10 @@ 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;
     }