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

张关杰
app/Console/Commands/DayCount/Count.php
app/Console/Commands/Domain/DomainInfo.php
app/Console/Commands/Update/ProjectUpdate.php
app/Http/Controllers/Bside/ProjectAssociation/ProjectAssociationController.php
app/Http/Logic/Aside/ProjectAssociation/ProjectAssociationLogic.php
app/Http/Logic/Bside/HomeCount/CountLogic.php
--- a/app/Console/Commands/DayCount/Count.php
查看文件 @cfee645
+++ b/app/Console/Commands/DayCount/Count.php
查看文件 @cfee645
@@ -73,7 +73,7 @@ class Count extends Command
                     $arr['ip_num'] = $this->ip_num($yesterday,$v['test_domain']);
                     DB::disconnect('custom_mysql');
                     //服务达标天数
-                    $arr['compliance_day'] = $this->compliance_day($v['id']);
+                    $arr['compliance_day'] = $v['finish_remain_day'];
                     //剩余服务时常
                     $arr['service_day'] = $v['remain_day'];
                     //项目id
@@ -193,6 +193,7 @@ class Count extends Command
             'gl_project.type AS type',
             'gl_project.extend_type AS extend_type',
             'gl_project.remain_day AS remain_day',
+            'gl_project.finish_remain_day AS finish_remain_day',
             'gl_project_deploy_build.test_domain AS test_domain',
             'gl_project_deploy_optimize.domain AS domain',
             'gl_project_deploy_build.project_id AS project_id',
--- a/app/Console/Commands/Domain/DomainInfo.php
查看文件 @cfee645
+++ b/app/Console/Commands/Domain/DomainInfo.php
查看文件 @cfee645
@@ -49,13 +49,19 @@ class DomainInfo extends Command
             }
             $ssl = $this->updateDomainSsl($v['domain']);
             $time = $this->updateDomain($v['domain']);
+            if(!empty($time['start']) && !!empty($time['end'])){
                 $data = [
                     'certificate_start_time'=>$ssl['from'],
                     'certificate_end_time'=>$ssl['to'],
                     'domain_start_time'=>$time['start'],
                     'domain_end_time'=>$time['end']
                 ];
-
+            }else{
+                $data = [
+                    'domain_start_time'=>$time['start'],
+                    'domain_end_time'=>$time['end']
+                ];
+            }
             $domainModel->edit($data,['id'=>$v['id']]);
         }
         return 1;
@@ -169,8 +175,8 @@ class DomainInfo extends Command
             $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');
+            $valid_from = '';
+            $valid_to = '';
         }
         return ['from'=>$valid_from,'to'=>$valid_to];
     }
--- a/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @cfee645
+++ b/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @cfee645
@@ -259,6 +259,7 @@ class ProjectUpdate extends Command
                                     }
                                     //分类
                                     $category_id = '';
+                                    $category_arr = [];
                                     if ($item['category'] ?? []) {
                                         $category_arr = $category_model->list(['original_id' => ['in', array_column($item['category'], 'id')]]);
                                         $category_id = $logic->getLastCategory(array_column($category_arr, 'id'));
@@ -291,7 +292,6 @@ class ProjectUpdate extends Command
                                                 'route' => $route
                                             ]);
                                             $this->set_map($route, RouteMap::SOURCE_PRODUCT, $id, $project_id);
-                                            CategoryRelated::saveRelated($id, array_column($category_arr, 'id'));
                                             CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PRODUCT, $id, $link_type, $language_list, $page_list);
                                         } else {
                                             $id = $product['id'];
@@ -309,6 +309,10 @@ class ProjectUpdate extends Command
                                                 ]),
                                                 'sort' => $item['sort'] ?? 0,
                                             ], ['id' => $id]);
+                                        }
+
+                                        //关联分类
+                                        if($category_arr){
                                             CategoryRelated::saveRelated($id, array_column($category_arr, 'id'));
                                         }
--- a/app/Http/Controllers/Bside/ProjectAssociation/ProjectAssociationController.php
查看文件 @cfee645
+++ b/app/Http/Controllers/Bside/ProjectAssociation/ProjectAssociationController.php
查看文件 @cfee645
@@ -53,7 +53,7 @@ class ProjectAssociationController extends BaseController
     /**
      * 获取aicc用户列表 并返回绑定的数据
-     * @return array|void
+     * @return void
      */
     public function check()
     {
@@ -65,55 +65,23 @@ class ProjectAssociationController extends BaseController
             $status = (int)$status ? ProjectAssociation::STATUS_NORMAL : ProjectAssociation::STATUS_DISABLED;
         }
         $isRes = $this->ProjectAssociationLogic->normal($project_id);
-        DB::beginTransaction();
-        try {
         // 当数据不存在时并开启状态，自动添加一条数据
         if (is_null($isRes) && (!is_null($status) && $status)) {
-                $isRes = $this->ProjectAssociationLogic->disabled($project_id);
-                if (is_null($isRes)) {
-                    $isRes = new ProjectAssociation();
+            $bool = $this->ProjectAssociationLogic->saveProject($project_id, $status);
+            if (empty($bool)) {
+                // 保存数据失败
+                $this->response('error', Code::SERVER_ERROR);
             }
-                $isRes->project_id = $project_id;
-                $isRes->user_id    = (int)env('AICC_WECHAT_USER_ID');
-                $isRes->status     = $status;
-                $isRes->save();
-                DB::commit();
         } // 关闭状态
         elseif (!is_null($isRes) && (!is_null($status) && empty($status))) {
-                $isRes->status = $status;
-                $isRes->save();
-                DB::commit();
-                return [
-                    'code'    => Code::SUCCESS,
-                    'data'    => [],
-                    'message' => '关闭AICC绑定成功!',
-                ];
-            }
-        } catch (\Exception $exception) {
-            DB::rollBack();
-            // 数据错误，请重试
-            $this->response('error', Code::SERVER_ERROR);
-        }
-        if (is_null($isRes)) {
+            $res = $this->ProjectAssociationLogic->closedState($isRes, $status);
+            $this->response($res['message'], $res['code']);
+        } elseif (is_null($isRes)) {
             // 请开启AICC绑定
-            $this->response('success', Code::SERVER_ERROR);
-        }
-        $redis_key = 'aicc_friend_lists_' . (int)env('AICC_WECHAT_USER_ID');
-        $result    = isset($cache) ? false : redis_get($redis_key);
-        if (empty($result)) {
-            $url    = env('AICC_URL') . env('AICC_WECHAT_FRIEND_API_URL');
-            $result = curlGet($url);
-            redis_set($redis_key, json_encode($result), 60);
-        } else {
-            $result = json_decode($result, true);
+            $this->response('error', Code::SERVER_ERROR);
         }
-
-        $result['info'] = [
-            'friend_id' => $isRes->friend_id ?? 0,
-            'nickname'  => $isRes->nickname ?? '',
-            'user_name' => $isRes->user_name ?? '',
-            'image'     => $isRes->image ?? '',
-        ];
+        $cache  = isset($cache);
+        $result = $this->ProjectAssociationLogic->getAiccWechatLists($isRes, $cache);
         $this->response('success', Code::SUCCESS, $result);
     }
 }
--- a/app/Http/Logic/Aside/ProjectAssociation/ProjectAssociationLogic.php
查看文件 @cfee645
+++ b/app/Http/Logic/Aside/ProjectAssociation/ProjectAssociationLogic.php
查看文件 @cfee645
@@ -47,4 +47,84 @@ class ProjectAssociationLogic extends Logic
     {
         return ProjectAssociation::query()->whereProjectId($project_id)->whereStatus(ProjectAssociation::STATUS_DISABLED)->first();
     }
+
+    /**
+     * 初始化数据/修改数据
+     * @param int $project_id
+     * @param int $status
+     * @return bool
+     */
+    public function saveProject($project_id, $status)
+    {
+        $bool = false;
+        DB::beginTransaction();
+        $isRes = $this->disabled($project_id);
+        if (is_null($isRes)) {
+            $isRes = new ProjectAssociation();
+        }
+        $isRes->project_id = $project_id;
+        $isRes->user_id    = (int)env('AICC_WECHAT_USER_ID');
+        $isRes->status     = $status;
+        try {
+            $bool = $isRes->save();
+            DB::commit();
+        } catch (\Exception $exception) {
+            DB::rollBack();
+        }
+        return $bool;
+    }
+
+    /**
+     * 获取AICC微信列表数据
+     * @param ProjectAssociation $res
+     * @param bool $cache
+     * @return mixed
+     */
+    public function getAiccWechatLists($res, $cache = false)
+    {
+        $redis_key = 'aicc_friend_lists_' . (int)env('AICC_WECHAT_USER_ID');
+        $result    = $cache ? false : redis_get($redis_key);
+        if (empty($result)) {
+            $url    = env('AICC_URL') . env('AICC_WECHAT_FRIEND_API_URL');
+            $result = curlGet($url);
+            redis_set($redis_key, json_encode($result), 60);
+        } else {
+            $result = json_decode($result, true);
+        }
+        $result['info'] = [
+            'friend_id' => $res->friend_id ?? 0,
+            'nickname'  => $res->nickname ?? '',
+            'user_name' => $res->user_name ?? '',
+            'image'     => $res->image ?? '',
+        ];
+        return $result;
+    }
+
+    /**
+     * 关闭状态
+     * @param ProjectAssociation $res
+     * @param int $status 1 - 正常， 0 - 禁用
+     * @return array
+     */
+    public function closedState($res, $status)
+    {
+        DB::beginTransaction();
+        try {
+            $res->status = $status;
+            $res->save();
+            DB::commit();
+            $code    = Code::SUCCESS;
+            $message = '关闭AICC绑定成功!';
+        } catch (\Exception $exception) {
+            DB::rollBack();
+            // 数据错误，请重试
+            $code    = Code::SERVER_ERROR;
+            $message = 'error';
+        }
+        return [
+            'code'    => $code,
+            'data'    => [],
+            'message' => $message,
+        ];
+    }
 }
--- a/app/Http/Logic/Bside/HomeCount/CountLogic.php
查看文件 @cfee645
+++ b/app/Http/Logic/Bside/HomeCount/CountLogic.php
查看文件 @cfee645
@@ -41,6 +41,11 @@ class CountLogic extends BaseLogic
             $info = $this->model->read(['project_id' => $this->user['project_id']],
                 ['pv_num','ip_num','inquiry_num','date','compliance_day','service_day','country']);
         }
+        //获取项目的剩余时长
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['id'=>$this->user['project_id']],['remain_day','finish_remain_day']);
+        $info['service_day'] = $projectInfo['remain_day'];
+        $info['compliance_day'] = $projectInfo['finish_remain_day'];
         return $this->success($info);
     }