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

Lyh server



查看合并请求 !1488

@@ -121,20 +121,25 @@ class AiBlogAuthorTask extends Command
         foreach ($data as $v){
         foreach ($data as $v){
             //查询当前数据是否存在
             //查询当前数据是否存在
             $info = $aiBlogAuthorModel->read(['author_id'=>$v['id']]);
             $info = $aiBlogAuthorModel->read(['author_id'=>$v['id']]);
-            if($info === false){
-                $param = [
-                    'author_id'=>$v['id'],
-                    'title'=>$v['title'],
-                    'image'=>str_replace_url($v['picture']),
-                    'description'=>$v['description'],
-                ];
-                try {
+            $param = [
+                'author_id'=>$v['id'],
+                'title'=>$v['title'],
+                'image'=>str_replace_url($v['picture']),
+                'description'=>$v['description'],
+            ];
+            try {
+                if($info === false){
+                    echo '执行新增'.PHP_EOL;
                     $id = $aiBlogAuthorModel->addReturnId($param);
                     $id = $aiBlogAuthorModel->addReturnId($param);
                     $route = RouteMap::setRoute($v['route'] ?? $v['title'], RouteMap::SOURCE_AI_BLOG_AUTHOR, $id, $project_id);
                     $route = RouteMap::setRoute($v['route'] ?? $v['title'], RouteMap::SOURCE_AI_BLOG_AUTHOR, $id, $project_id);
                     $aiBlogAuthorModel->edit(['route'=>$route],['id'=>$id]);
                     $aiBlogAuthorModel->edit(['route'=>$route],['id'=>$id]);
-                }catch (\Exception $e){
-                    echo 'error:'.$e->getMessage();
+                }else{
+                    $aiBlogAuthorModel->edit($param,['id'=>$info['id']]);
+                    echo '执行更新'.PHP_EOL;
                 }
                 }
+            }catch (\Exception $e){
+                echo 'error:'.$e->getMessage();
+                continue;
             }
             }
         }
         }
         return true;
         return true;

@@ -63,7 +63,10 @@ class UserLoginLogic
             $projectArr[] = $v['project_id'];
             $projectArr[] = $v['project_id'];
         }
         }
         $projectModel = new Project();
         $projectModel = new Project();
-        $project_list = $projectModel->list(['id'=>['in',$projectArr],'delete_status'=>0],'id',['id','title']);
+        $project_list = $projectModel->list(['id'=>['in',$projectArr],'type'=>['!=',8],'delete_status'=>0],'id',['id','title']);
+        if(empty($project_list)){
+            $this->fail('当前项目已关闭，请联系管理员');
+        }
         foreach ($project_list as $k => $v){
         foreach ($project_list as $k => $v){
             $v['domain'] = (new DomainInfo())->getProjectIdDomain($v['id']);
             $v['domain'] = (new DomainInfo())->getProjectIdDomain($v['id']);
             $project_list[$k] = $v;
             $project_list[$k] = $v;
@@ -181,12 +184,15 @@ class UserLoginLogic
      * @time   :2023/8/29 15:26
      * @time   :2023/8/29 15:26
      */
      */
     public function assembleParam($mobile,$project_id){
     public function assembleParam($mobile,$project_id){
-        $info = $this->model->read(['mobile'=>$mobile,'project_id'=>$project_id],['id','mobile','status','role_id','token','name','wechat','project_id']);
+        $info = $this->model->read(['mobile'=>$mobile,'project_id'=>$project_id],['id','mobile','status','type','role_id','token','name','wechat','project_id']);
         //获取项目详情
         //获取项目详情
         $project = $this->getProjectInfo($project_id);
         $project = $this->getProjectInfo($project_id);
         if($project['site_status'] != 0){//关闭站点
         if($project['site_status'] != 0){//关闭站点
             $this->fail('当前网站已过期，请联系管理员及时续费。');
             $this->fail('当前网站已过期，请联系管理员及时续费。');
         }
         }
+        if($project['type'] == 8){//关闭项目
+            $this->fail('当前网站已关闭，请联系管理员。');
+        }
         $info = $this->handleInfo($info,$project);
         $info = $this->handleInfo($info,$project);
         $info['login_source'] = User::LOGIN_PASSWORD_SOURCE;//账号密码登录返回
         $info['login_source'] = User::LOGIN_PASSWORD_SOURCE;//账号密码登录返回
         //保存项目缓存
         //保存项目缓存