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

@@ -57,7 +57,8 @@ class WebsiteData extends Command
 
 
     public function post_data($data)
     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')));
     }
     }
 
 
 }
 }

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