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

赵彬吉
app/Console/Commands/Domain/DomainInfo.php
app/Console/Kernel.php
app/Helper/helper.php
app/Http/Controllers/Bside/LoginController.php
app/Http/Controllers/Bside/Template/BTemplateController.php
--- a/app/Console/Commands/Domain/DomainInfo.php
查看文件 @347c0fb
+++ b/app/Console/Commands/Domain/DomainInfo.php
查看文件 @347c0fb
@@ -28,28 +28,80 @@ class DomainInfo extends Command
      */
     protected $description = '域名相关';
+    /**
+     * @remark :更新证书+证书有效时间
+     * @name   :handle
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/11 15:09
+     */
     public function handle(){
         $domainModel = new DomainInfoModel();
-        $map = [];
+        $map = ['status'=>['!=',2]];
         $list = $domainModel->list($map);
-        $context = stream_context_create([
-            'ssl' => [
-                'capture_peer_cert' => true,
-                'capture_peer_cert_chain' => false,
-            ],
-        ]);
-        $stream = stream_socket_client('ssl://oa.quanqiusou.cn:443', $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $context);
-        if(!$stream) {
-            die("Failed to connect: $errno - $errstr");
+        foreach ($list as $v){
+            $ssl = $this->updateDomainSsl($v['domain']);
+            $time = $this->updateDomain($v['domain']);
+            $data = [
+                'certificate_start_time'=>$ssl['from'],
+                'certificate_end_time'=>$ssl['to'],
+                'domain_start_time'=>$time['start'],
+                'domain_end_time'=>$time['end']
+            ];
+            $domainModel->edit($data,['id'=>$v['id']]);
         }
-        $remote_cert = stream_context_get_params($stream)['options']['ssl']['peer_certificate'];
-        if(!$remote_cert) {
-            die("Failed to retrieve certificate");
+        return 1;
+    }
+
+    /**
+     * @remark :更新域名证书
+     * @name   :updateDomainSsl
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/11 15:07
+     */
+    public function updateDomainSsl($domain){
+        try {
+            $context = stream_context_create([
+                'ssl' => [
+                    'capture_peer_cert' => true,
+                    'capture_peer_cert_chain' => false,
+                ],
+            ]);
+            $stream = stream_socket_client('ssl://'.$domain.':443', $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $context);
+            if(!$stream) {
+                die("Failed to connect: $errno - $errstr");
+            }
+            $remote_cert = stream_context_get_params($stream)['options']['ssl']['peer_certificate'];
+            if(!$remote_cert) {
+                die("Failed to retrieve certificate");
+            }
+            $valid_from = date('Y-m-d H:i:s', openssl_x509_parse($remote_cert)['validFrom_time_t']);
+            $valid_to = date('Y-m-d H:i:s', openssl_x509_parse($remote_cert)['validTo_time_t']);
+            fclose($stream);
+        }catch (\Exception $e){
+            $valid_from = date('Y-m-d H:i:s');
+            $valid_to = date('Y-m-d H:i:s');
+        }
+        return ['from'=>$valid_from,'to'=>$valid_to];
+    }
+
+    /**
+     * @remark :更新域名有限时间
+     * @name   :updateDomain
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/11 15:11
+     */
+    public function updateDomain($domain){
+        $url = 'http://openai.waimaoq.com/v1/whois_api?domain='.$domain;
+        $response = http_get($url);
+        $start = '';
+        $end = '';
+        if($response['code'] == 200){
+            $start = $response['text']['creation_date'];
+            $end = $response['text']['expiration_date'];
         }
-        $valid_from = date('Y-m-d H:i:s', openssl_x509_parse($remote_cert)['validFrom_time_t']);
-        $valid_to = date('Y-m-d H:i:s', openssl_x509_parse($remote_cert)['validTo_time_t']);
-        fclose($stream);
-        echo "Certificate Valid From: $valid_from<br>";
-        echo "Certificate Valid To: $valid_to<br>";
+        return ['start'=>$start,'end'=>$end];
     }
 }
--- a/app/Console/Kernel.php
查看文件 @347c0fb
+++ b/app/Console/Kernel.php
查看文件 @347c0fb
@@ -33,8 +33,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('forward_count')->monthlyOn(1,'01:00')->withoutOverlapping(1);//没月月初1号执行月统计转发询盘记录
         $schedule->command('inquiry_delay')->everyMinute()->withoutOverlapping(1);//TODO::上线放开，转发询盘,每分钟执行一次
         $schedule->command('inquiry_count')->dailyAt('01:00')->withoutOverlapping(1); // 询盘统计数据，每天凌晨执行一次
-//        // 更新域名|证书结束时间，每天凌晨1点执行一次
-//        $schedule->command('domain_time')->dailyAt('01:00')->withoutOverlapping(1);
+        $schedule->command('domain_info')->dailyAt('01:00')->withoutOverlapping(1);// 更新域名|证书结束时间，每天凌晨1点执行一次
     }
     /**
--- a/app/Helper/helper.php
查看文件 @347c0fb
+++ b/app/Helper/helper.php
查看文件 @347c0fb
@@ -88,16 +88,16 @@ if (!function_exists('http_get')) {
     function http_get($url, $header = [])
     {
         if (empty($header)) {
-            $header[] = "content-type: application/json;
-            charset = UTF-8";
+            $header[] = "content-type: application/json";
         }
         $ch1     = curl_init();
         $timeout = 0;
         curl_setopt($ch1, CURLOPT_URL, $url);
         curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch1, CURLOPT_ENCODING, '');
+        curl_setopt($ch1, CURLOPT_MAXREDIRS, 10);
         curl_setopt($ch1, CURLOPT_HTTPHEADER, $header);
         curl_setopt($ch1, CURLOPT_CONNECTTIMEOUT, $timeout);
-        curl_setopt($ch1, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($ch1, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($ch1, CURLOPT_CUSTOMREQUEST, 'GET');
         curl_setopt($ch1, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
--- a/app/Http/Controllers/Bside/LoginController.php
查看文件 @347c0fb
+++ b/app/Http/Controllers/Bside/LoginController.php
查看文件 @347c0fb
@@ -296,4 +296,7 @@ class LoginController extends BaseController
         }
         return $data;
     }
+
+    public function ceshi(){
+    }
 }
--- a/app/Http/Controllers/Bside/Template/BTemplateController.php
查看文件 @347c0fb
+++ b/app/Http/Controllers/Bside/Template/BTemplateController.php
查看文件 @347c0fb
@@ -72,9 +72,9 @@ class BTemplateController extends BaseController
      */
     public function save(TemplateRequest $templateRequest,BTemplateLogic $BTemplateLogic){
         //演示项目，不允许其他号码编辑
-//        if(($this->user['project_id'] == 1) && ($this->user['mobile'] != '15928018676') && ($this->param['source'] == 1)){
-//            $this->response('演示项目仅支持演示功能,无法更改首页',Code::USER_ERROR);
-//        }
+        if(($this->user['project_id'] == 1) && ($this->user['mobile'] != '15928018676' || $this->user['mobile'] != '15680871314') && ($this->param['source'] == 1)){
+            $this->response('演示项目仅支持演示功能,无法更改首页',Code::USER_ERROR);
+        }
         $templateRequest->validated();
         $BTemplateLogic->templateSave();
         $this->response('success');