gx

@@ -28,6 +28,7 @@ class Count extends Command
      * @var string
      * @var string
      */
      */
     protected $description = '统计昨日数据';
     protected $description = '统计昨日数据';
+
     /**
     /**
      * @name   :(定时执行生成昨日数据统计)handle
      * @name   :(定时执行生成昨日数据统计)handle
      * @author :lyh
      * @author :lyh
@@ -39,8 +40,10 @@ class Count extends Command
         $list = DB::table('gl_project')->where('gl_project.extend_type','!=',5)
         $list = DB::table('gl_project')->where('gl_project.extend_type','!=',5)
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
-            ->select($this->selectParam())->get()->toArray();
+            ->select($this->selectParam())->get();
+        try {
             if(!empty($list)){
             if(!empty($list)){
+                $list = $list->toArray();
                 $data = [];
                 $data = [];
                 $yesterday = Carbon::yesterday()->toDateString();
                 $yesterday = Carbon::yesterday()->toDateString();
                 foreach ($list as $v){
                 foreach ($list as $v){
@@ -70,6 +73,9 @@ class Count extends Command
                 //判断数据是否存在
                 //判断数据是否存在
                 DB::table('gl_count')->insert($data);
                 DB::table('gl_count')->insert($data);
             }
             }
+        }catch (\Exception $e){
+
+        }
         echo $this->error;
         echo $this->error;
     }
     }
 
 

@@ -46,6 +46,8 @@ class Demo extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
+        $domain = parse_url('https//:dev.golbalso.site/');
+        dd($domain);
         echo time() . PHP_EOL;
         echo time() . PHP_EOL;
         $blogModel = new Image();
         $blogModel = new Image();
         $list = $blogModel->list();
         $list = $blogModel->list();

@@ -31,9 +31,6 @@ class DomainInfoLogic extends BaseLogic
      */
      */
     public function saveDomain()
     public function saveDomain()
     {
     {
-        if (!preg_match('/http/', $this->param['domain'])) {
-            $this->param['domain'] = 'https://'.trim($this->param['domain'],'/').'/';
-        }
         //验证域名
         //验证域名
         $this->verifyDomain($this->param['domain'],isset($this->param['id']) ?? '');
         $this->verifyDomain($this->param['domain'],isset($this->param['id']) ?? '');
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){

@@ -179,9 +179,6 @@ class ProjectLogic extends BaseLogic
     protected function saveProjectDeployOptimize($deploy_optimize){
     protected function saveProjectDeployOptimize($deploy_optimize){
         $deployOptimizeModel = new DeployOptimize();
         $deployOptimizeModel = new DeployOptimize();
         if(isset($deploy_optimize['domain']) && !empty($deploy_optimize['domain'])){
         if(isset($deploy_optimize['domain']) && !empty($deploy_optimize['domain'])){
-            if (!preg_match('/http/', $deploy_optimize['domain'])) {
-                $deploy_optimize['domain'] = 'https://'.trim($deploy_optimize['domain'],'/').'/';
-            }
             //更改域名
             //更改域名
             if(isset($deploy_optimize['domain']) && !empty($deploy_optimize['domain'])){
             if(isset($deploy_optimize['domain']) && !empty($deploy_optimize['domain'])){
                 $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
                 $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
@@ -372,10 +369,10 @@ class ProjectLogic extends BaseLogic
         //先清空上一次所绑定的域名
         //先清空上一次所绑定的域名
         $info = $domainModel->read(['project_id'=>$project_id]);
         $info = $domainModel->read(['project_id'=>$project_id]);
         if($info !== false){
         if($info !== false){
-            $domainModel->edit(['project_id'=>'','status'=>DomainInfo::STATUS_ZERO]);
+            $domainModel->edit(['project_id'=>'','status'=>DomainInfo::STATUS_ZERO],['id'=>$info['id']]);
         }
         }
         //重新设置域名
         //重新设置域名
-        $rs = $domainModel->edit(['status'=>DomainInfo::STATUS_ONE,'project_id'=>$project_id],['domain'=>$domain]);
+        $domainModel->edit(['status'=>DomainInfo::STATUS_ONE,'project_id'=>$project_id],['id'=>$domain]);
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -9,6 +9,8 @@
 
 
 namespace App\Models\ASide;
 namespace App\Models\ASide;
 
 
+use App\Helper\AyrShare as AyrShareHelper;
+use App\Models\AyrShare\AyrShare as AyrShareModel;
 use App\Models\Base;
 use App\Models\Base;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -38,5 +40,4 @@ class APublicModel extends Base
         return ['product'=>$productNumber,'blog'=>$blogNumber,'news'=>$newsNumber];
         return ['product'=>$productNumber,'blog'=>$blogNumber,'news'=>$newsNumber];
     }
     }
 
 
-
 }
 }

@@ -7,7 +7,4 @@ use App\Models\Base;
 class AyrRelease extends Base
 class AyrRelease extends Base
 {
 {
     protected $table = 'gl_ayr_release';
     protected $table = 'gl_ayr_release';
-    //连接数据库
-    protected $connection = 'custom_mysql';
-
 }
 }

@@ -7,9 +7,6 @@ use App\Models\Base;
 class AyrShare extends Base
 class AyrShare extends Base
 {
 {
     protected $table = 'gl_ayr_share';
     protected $table = 'gl_ayr_share';
-    //连接数据库
-    protected $connection = 'custom_mysql';
-
 
 
     const COUNT = 3;
     const COUNT = 3;