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

Master server



查看合并请求 !845

@@ -209,7 +209,6 @@ class KeywordVideoController extends BaseController
      */
      */
     public function get_template(){
     public function get_template(){
         $data = Cache::get('template_data');
         $data = Cache::get('template_data');
-        $data = null;
         if(empty($data)){
         if(empty($data)){
             $url = 'http://216.250.255.116:7866/get_template';
             $url = 'http://216.250.255.116:7866/get_template';
             $header = [
             $header = [

@@ -32,6 +32,9 @@ class CustomModuleCategoryController extends BaseController
         ],[
         ],[
             'module_id.required' => 'module_id不能为空',
             'module_id.required' => 'module_id不能为空',
         ]);
         ]);
+        //获取模块路由
+        $customModuleModel = new CustomModule();
+        $moduleInfo = $customModuleModel->read(['id'=>$this->param['module_id']]);
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['status'] = 0;
         $this->map['status'] = 0;
         $list = $customModuleCategory->list($this->map,'sort');
         $list = $customModuleCategory->list($this->map,'sort');
@@ -40,6 +43,11 @@ class CustomModuleCategoryController extends BaseController
             foreach ($list as $k => $v){
             foreach ($list as $k => $v){
                 $v['is_renovation']  =  $this->getIsRenovation($v['module_id'],BTemplate::IS_LIST,$template_id,$v['id'],BTemplate::IS_CUSTOM);
                 $v['is_renovation']  =  $this->getIsRenovation($v['module_id'],BTemplate::IS_LIST,$template_id,$v['id'],BTemplate::IS_CUSTOM);
                 $v['url'] = $this->user['domain'].$v['route'];
                 $v['url'] = $this->user['domain'].$v['route'];
+                if($this->user['is_upgrade'] == 1){
+                    if($v['route'] == $moduleInfo['route']){
+                        $v['url'] = $this->user['domain'].$moduleInfo['route']."_catalog/".$v['route'];
+                    }
+                }
                 $list[$k] = $v;
                 $list[$k] = $v;
             }
             }
         }
         }