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

@@ -33,7 +33,7 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
     protected $description = '升级项目统计';
 
 
     public function handle(){
     public function handle(){
-        $project_id = 439;
+        $project_id = 450;
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);
         $this->count($project_id);
         $this->count($project_id);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');

@@ -10,6 +10,7 @@
 namespace App\Console\Commands\MonthlyCount;
 namespace App\Console\Commands\MonthlyCount;
 
 
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
+use App\Models\Com\UpdateOldInfo;
 use App\Models\HomeCount\MonthCount;
 use App\Models\HomeCount\MonthCount;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Visit\Visit;
 use App\Models\Visit\Visit;
@@ -35,8 +36,10 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
     protected $description = '升级项目统计';
 
 
     public function handle(){
     public function handle(){
-        $project_id = 439;
-        $url = 'www.cnzyl.com';
+        $project_id = 450;
+        $oldModel = new UpdateOldInfo();
+        $info = $oldModel->read(['project_id'=>$project_id]);
+        $url = $info['old_domain_online'];
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);
         $this->count($project_id,$url);
         $this->count($project_id,$url);
 
 

@@ -50,7 +50,7 @@ class UpdateProductCategory extends Command
     public function handle(){
     public function handle(){
         //获取所有项目
         //获取所有项目
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['type'=>['in',[1,2,3,4]]],'id',['id']);
+        $list = $projectModel->list(['id'=>['in',[218]]],'id',['id']);
         echo date('Y-m-d H:i:s') . ' start: ' . json_encode($list) . PHP_EOL;
         echo date('Y-m-d H:i:s') . ' start: ' . json_encode($list) . PHP_EOL;
         try {
         try {
             foreach ($list as $v) {
             foreach ($list as $v) {

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>708]);
+        $list = $projectModel->list(['id'=>426]);
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
@@ -95,7 +95,7 @@ class UpdateRoute extends Command
      */
      */
     public function setProductKeyword(){
     public function setProductKeyword(){
         $keywordModel = new Keyword();
         $keywordModel = new Keyword();
-        $lists = $keywordModel->list(['id'=>['>=',457]]);
+        $lists = $keywordModel->list();
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
                 if(!empty($v['route'])){
@@ -106,10 +106,10 @@ class UpdateRoute extends Command
                         $route = $v['route'].$tag;
                         $route = $v['route'].$tag;
                         $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
                         $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
                         $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                         $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-                    }else{
-                        $route = Translate::tran($v['title'], 'en').$tag;
-                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+//                    }else{
+//                        $route = Translate::tran($v['title'], 'en').$tag;
+//                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+//                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                     }
                     }
                 }else{
                 }else{
                     echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                     echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;

@@ -149,7 +149,7 @@ class BTemplateLogic extends BaseLogic
             return false;
             return false;
         }
         }
         //TODO::默认模块定制
         //TODO::默认模块定制
-        $html = $this->isCustomizedPage($source,$is_list);//获取定制页面的html
+        $html = $this->isCustomizedPage($source,$is_list,$is_custom);//获取定制页面的html
         if(!empty($html)){
         if(!empty($html)){
             return $this->success(['html'=>$html,'template_id'=>$template_id]);
             return $this->success(['html'=>$html,'template_id'=>$template_id]);
         }
         }

@@ -2,9 +2,10 @@
 
 
 namespace App\Models\Com;
 namespace App\Models\Com;
 
 
+use App\Models\Base;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Model;
 
 
-class UpdateOldInfo extends Model
+class UpdateOldInfo extends Base
 {
 {
     //设置关联表名
     //设置关联表名
     protected $table = 'gl_update_old_info';
     protected $table = 'gl_update_old_info';