gx

@@ -28,6 +28,7 @@ class Count extends Command
      * @var string
      */
     protected $description = '统计昨日数据';
+
     /**
      * @name   :(定时执行生成昨日数据统计)handle
      * @author :lyh
@@ -39,36 +40,41 @@ class Count extends Command
         $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_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
-            ->select($this->selectParam())->get()->toArray();
-        if(!empty($list)){
-            $data = [];
-            $yesterday = Carbon::yesterday()->toDateString();
-            foreach ($list as $v){
-                $v = (array)$v;
-                if($v['domain'] != ''){
-                    $v['test_domain'] = $v['domain'];
+            ->select($this->selectParam())->get();
+        try {
+            if(!empty($list)){
+                $list = $list->toArray();
+                $data = [];
+                $yesterday = Carbon::yesterday()->toDateString();
+                foreach ($list as $v){
+                    $v = (array)$v;
+                    if($v['domain'] != ''){
+                        $v['test_domain'] = $v['domain'];
+                    }
+                    $arr = [];
+                    //统计时间
+                    $arr['date'] = $yesterday;
+                    //pv统计
+                    $arr['pv_num'] = $this->pv_num($yesterday,$v['test_domain']);
+                    //ip统计
+                    $arr['ip_num'] = $this->ip_num($yesterday,$v['test_domain']);
+                    //服务达标天数
+                    $arr['compliance_day'] = $this->compliance_day($v['test_domain']);
+                    //剩余服务时常
+                    $arr['service_day'] = ((int)$v['service_duration'] - (int)$arr['compliance_day']) > 0 ? ((int)$v['service_duration'] - (int)$arr['compliance_day']) : 0;
+                    //项目id
+                    $arr['project_id'] = $v['project_id'];
+                    $arr['created_at'] = date('Y-m-d H:i:s');
+                    $arr['updated_at'] = date('Y-m-d H:i:s');
+                    //询盘统计
+                    $arr = $this->inquiry($arr,$v['test_domain']);
+                    $data[] = $arr;
                 }
-                $arr = [];
-                //统计时间
-                $arr['date'] = $yesterday;
-                //pv统计
-                $arr['pv_num'] = $this->pv_num($yesterday,$v['test_domain']);
-                //ip统计
-                $arr['ip_num'] = $this->ip_num($yesterday,$v['test_domain']);
-                //服务达标天数
-                $arr['compliance_day'] = $this->compliance_day($v['test_domain']);
-                //剩余服务时常
-                $arr['service_day'] = ((int)$v['service_duration'] - (int)$arr['compliance_day']) > 0 ? ((int)$v['service_duration'] - (int)$arr['compliance_day']) : 0;
-                //项目id
-                $arr['project_id'] = $v['project_id'];
-                $arr['created_at'] = date('Y-m-d H:i:s');
-                $arr['updated_at'] = date('Y-m-d H:i:s');
-                //询盘统计
-                $arr = $this->inquiry($arr,$v['test_domain']);
-                $data[] = $arr;
+                //判断数据是否存在
+                DB::table('gl_count')->insert($data);
             }
-            //判断数据是否存在
-            DB::table('gl_count')->insert($data);
+        }catch (\Exception $e){
+
         }
         echo $this->error;
     }

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

@@ -31,9 +31,6 @@ class DomainInfoLogic extends BaseLogic
      */
     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']) ?? '');
         if(isset($this->param['id']) && !empty($this->param['id'])){

@@ -179,9 +179,6 @@ class ProjectLogic extends BaseLogic
     protected function saveProjectDeployOptimize($deploy_optimize){
         $deployOptimizeModel = new DeployOptimize();
         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'])){
                 $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
@@ -372,10 +369,10 @@ class ProjectLogic extends BaseLogic
         //先清空上一次所绑定的域名
         $info = $domainModel->read(['project_id'=>$project_id]);
         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();
     }
 

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

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

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