合并分支 'master-server' 到 'master'

Master server 查看合并请求 !855

合并分支 'master-server' 到 'master'
Master server 查看合并请求 !855
李宇航
app/Console/Commands/Test/UpdateRoute.php
app/Http/Controllers/Aside/Project/ProjectController.php
app/Http/Logic/Aside/Project/ProcessRecordsLogic.php
app/Models/Channel/Channel.php
app/Models/Domain/DomainInfo.php
app/Models/Manage/ManageHr.php
--- a/app/Console/Commands/Test/UpdateRoute.php
查看文件 @bcb0138
+++ b/app/Console/Commands/Test/UpdateRoute.php
查看文件 @bcb0138
@@ -17,6 +17,7 @@ use App\Models\CustomModule\CustomModuleContent;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\Keyword;
 use App\Models\Product\Product;
+use App\Models\Project\ProcessRecords;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Services\ProjectServer;
@@ -55,20 +56,26 @@ class UpdateRoute extends Command
      * @time   :2023/11/20 15:13
      */
     public function handle(){
-        $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[1653]]]);
-        $data = [];
-        foreach ($list as $v){
-            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
-            ProjectServer::useProject($v['id']);
-//            $this->getProduct();
-//            $this->setProductKeyword();
-//            $this->getBlog();
-//            $this->setCustomRoute($v['id']);
-            $this->editProductAlt();
-//            $this->custom_to_blogs();
-            DB::disconnect('custom_mysql');
-        }
+          $recordModel =  new ProcessRecords();
+          $lists = $recordModel->list();
+          foreach ($lists as $k => $v){
+              $date = $v['record'][0]['date'];
+              $recordModel->edit(['date'=>$date],['id'=>$v['id']]);
+          }
+//        $projectModel = new Project();
+//        $list = $projectModel->list(['delete_status'=>['=',0]]);
+//        $data = [];
+//        foreach ($list as $v){
+//            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
+//            ProjectServer::useProject($v['id']);
+////            $this->getProduct();
+////            $this->setProductKeyword();
+////            $this->getBlog();
+////            $this->setCustomRoute($v['id']);
+//            $this->editProductAlt();
+////            $this->custom_to_blogs();
+//            DB::disconnect('custom_mysql');
+//        }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
--- a/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @bcb0138
+++ b/app/Http/Controllers/Aside/Project/ProjectController.php
查看文件 @bcb0138
@@ -65,12 +65,14 @@ class ProjectController extends BaseController
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
                 $v = $this->handleParam($v);
+                $project_arr[] = $v['id'];
                 $lists['list'][$k] = $v;
             }
         }
         $this->response('success',Code::SUCCESS,$lists);
     }
+
     /**
      * 需要查询的字段
      * @return array
@@ -358,12 +360,7 @@ class ProjectController extends BaseController
             $data = APublicModel::getNumByProjectId($item['id']);
         }
         if($item['type'] == Project::TYPE_ONE){//建站中
-            $processModel = new ProcessRecords();
-            $item['sign_project'] = 0;
-            $proInfo = $processModel->read(['project_id'=>$item['id'],'updated_at'=>['>=',time() - 3 * 12 * 3600]],['id']);
-            if($proInfo === false){
-                $item['sign_project'] = 1;
-            }
+            $item['sign_project'] = $this->handleProcessRecords($item['id']);
         }
         $manageModel = new ManageHr();
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
@@ -383,7 +380,6 @@ class ProjectController extends BaseController
         $item['domain'] = !empty($item['domain']) ?  $domainModel->getDomain($item['domain']) : '';
         $item['product_num'] = $data['product'] ?? 0;
         $item['keyword_num'] = $data['key'] ?? 0;
-        $item['autologin_code'] = getAutoLoginCode($item['id']);
         $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
         $item['task_finish_num'] = Task::getNumByProjectId($item['id'], Task::STATUS_DOWN);
         $item['task_pending_num'] = Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]);
@@ -392,6 +388,25 @@ class ProjectController extends BaseController
     }
     /**
+     * @remark :处理建站中项目标记问题
+     * @name   :handleProcessRecords
+     * @author :lyh
+     * @method :post
+     * @time   :2024/11/6 15:22
+     */
+    public function handleProcessRecords($project_id){
+        $processModel = new ProcessRecords();
+        $proInfo = $processModel->read(['project_id'=>$project_id],['id','record']);
+        if($proInfo !== false){
+            $date = (strtotime(((array)$proInfo['record'][0])['date']) ?? 0 ) + 3 * 24 * 2600;
+            if($date <= time()){
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    /**
      * @remark :获取数据详情
      * @name   :info
      * @author :lyh
--- a/app/Http/Logic/Aside/Project/ProcessRecordsLogic.php
查看文件 @bcb0138
+++ b/app/Http/Logic/Aside/Project/ProcessRecordsLogic.php
查看文件 @bcb0138
@@ -65,6 +65,7 @@ class ProcessRecordsLogic extends BaseLogic
     public function recordSave(){
         $info = $this->model->read(['project_id'=>$this->param['project_id']]);
         $this->param['operator_id'] = $this->manager['id'];
+        $this->param['date'] = $this->param['record'][0]['date'] ?? null;
         $this->param['record'] = json_encode($this->param['record']);
         if($info === false){
             $res = $this->model->add($this->param);
--- a/app/Models/Channel/Channel.php
查看文件 @bcb0138
+++ b/app/Models/Channel/Channel.php
查看文件 @bcb0138
@@ -4,6 +4,7 @@ namespace App\Models\Channel;
 use App\Models\Base;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Cache;
 use phpDocumentor\Reflection\Types\Self_;
 /**
@@ -56,11 +57,16 @@ class Channel extends Base
     }
     public static function getChannelText($sales_id){
+        $channel_alias = Cache::get('channel_alias_'.$sales_id);
+        if(empty($channel_alias)){
             $user = User::where('id', $sales_id)->select(['name', 'channel_id'])->first();
             if(!$user){
                 return $sales_id;
             }
             $channel_alias = self::where('id', $user['channel_id'])->value('alias');
-        return $channel_alias . '-' . $user['name'];
+            $channel_alias = $channel_alias . '-' . $user['name'];
+            Cache::put('channel_alias_'.$sales_id,$channel_alias,24 * 3600);
+        }
+        return $channel_alias;
     }
 }
--- a/app/Models/Domain/DomainInfo.php
查看文件 @bcb0138
+++ b/app/Models/Domain/DomainInfo.php
查看文件 @bcb0138
@@ -4,6 +4,7 @@ namespace App\Models\Domain;
 use App\Helper\Arr;
 use App\Models\Base;
+use Illuminate\Support\Facades\Cache;
 /**
  * Class DomainInfo
@@ -61,11 +62,16 @@ class DomainInfo extends Base
      * @time   :2023/9/4 17:05
      */
     public function getDomain($domain){
+        $res_domain = Cache::get('domain_'.$domain);
+        if(empty($res_domain)){
             $info = $this->read(['id'=>$domain]);
             if($info === false){
                 return '';
             }
-        return 'https://'.$info['domain'].'/';
+            $res_domain = 'https://'.$info['domain'].'/';
+            Cache::put('domain_'.$domain,$res_domain,24 * 3600);
+        }
+        return $res_domain;
     }
     /**
--- a/app/Models/Manage/ManageHr.php
查看文件 @bcb0138
+++ b/app/Models/Manage/ManageHr.php
查看文件 @bcb0138
@@ -2,6 +2,7 @@
 namespace App\Models\Manage;
 use App\Models\Base;
+use Illuminate\Support\Facades\Cache;
 class ManageHr extends Base
 {
@@ -190,9 +191,13 @@ class ManageHr extends Base
     public function getName($id){
         $name = '';
         if(!empty($id)){
+            $name = Cache::get('manager_hr_'.$id);
+            if(empty($name)){
                 $info = $this->read(['id'=>$id],['id','name']);
                 if($info !== false){
                     $name = $info['name'];
+                    Cache::put('manager_hr_'.$id,$name,24 * 3600);
+                }
             }
         }
         return $name;