Merge remote-tracking branch 'origin/master' into akun

@@ -167,7 +167,7 @@ class VideoTask extends Command
      */
      */
     public function getProjectKeyword($number)
     public function getProjectKeyword($number)
     {
     {
-        $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag%')->whereNotNull('keyword_content')->pluck('id')->toArray();
+        $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag')->whereNotNull('keyword_content')->pluck('id')->toArray();
         $keyword_id = array_rand($keyword_arr_id, $number);
         $keyword_id = array_rand($keyword_arr_id, $number);
         $keyword = Keyword::whereIn("id", $keyword_id)->get();
         $keyword = Keyword::whereIn("id", $keyword_id)->get();
         return $keyword;
         return $keyword;

@@ -7,6 +7,8 @@
  */
  */
 namespace App\Http\Controllers\Api;
 namespace App\Http\Controllers\Api;
 
 
+use App\Enums\Common\Code;
+use App\Http\Logic\Bside\User\UserLoginLogic;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
@@ -16,6 +18,7 @@ use App\Models\RouteMap\RouteMap;
 use App\Models\User\User;
 use App\Models\User\User;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
 /**
 /**
@@ -142,4 +145,26 @@ class PrivateController extends BaseController
         $user = array_unique(array_merge($valid_user, $upgrade_user));
         $user = array_unique(array_merge($valid_user, $upgrade_user));
         return $this->success($user);
         return $this->success($user);
     }
     }
-}
+
+    /**
+     * @remark :模拟登录返回token
+     * @name   :getToken
+     * @author :lyh
+     * @method :post
+     * @time   :2024/3/29 16:19
+     */
+    public function getAutoToken(){
+        //获取当前用户的草鸡管理员
+        $userModel = new User();
+        $userInfo = $userModel->read(['project_id'=>$this->param['project_id'],'role_id'=>0]);
+        $userLoginLogicModel = new UserLoginLogic();
+        $info = $userLoginLogicModel->autoAssembleParam($userInfo);
+        //生成新token
+        $token = md5(uniqid().'auto'.$info['id']);
+        //存储缓存
+        $info['token'] = $token;
+        Cache::add($token,$info,3600);
+        $data = ['token'=>$token,'main_lang_id'=>$info['main_lang_id']];
+        $this->response('success',Code::SUCCESS,$data);
+    }
+}

@@ -62,6 +62,9 @@ class KeywordVideoController extends BaseController
         if(isset($this->map['project_name']) && is_array($this->map['project_name'])){
         if(isset($this->map['project_name']) && is_array($this->map['project_name'])){
             $query->where('gl_project.title','like','%'.$this->map['project_name'].'%');
             $query->where('gl_project.title','like','%'.$this->map['project_name'].'%');
         }
         }
+        if(isset($this->map['status'])){
+            $query->where('gl_keyword_video_task.status',$this->map['status']);
+        }
         return $query;
         return $query;
     }
     }
 
 

@@ -188,6 +188,9 @@ class CustomModuleContentLogic extends BaseLogic
     public function contentEdit(){
     public function contentEdit(){
         $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1：6.0
         $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1：6.0
         $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
         $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
+        if(!isset($this->param['category_id'])){
+            $this->param['category_id'] = '';
+        }
         if($is_upgrade == 0 || $six_read == 1) {
         if($is_upgrade == 0 || $six_read == 1) {
             $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE, $this->param['id'], $this->user['project_id']);
             $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE, $this->param['id'], $this->user['project_id']);
         }
         }

@@ -33,3 +33,4 @@ Route::post('video_task_callback', [\App\Http\Controllers\Api\NoticeController::
 Route::any('has_user', [\App\Http\Controllers\Api\PrivateController::class, 'hasUser'])->name('api.has_user');
 Route::any('has_user', [\App\Http\Controllers\Api\PrivateController::class, 'hasUser'])->name('api.has_user');
 // 6.0有效用户用户
 // 6.0有效用户用户
 Route::any('valid_user', [\App\Http\Controllers\Api\PrivateController::class, 'validUser'])->name('api.valid_user');
 Route::any('valid_user', [\App\Http\Controllers\Api\PrivateController::class, 'validUser'])->name('api.valid_user');
+Route::any('getAutoToken', [\App\Http\Controllers\Api\PrivateController::class, 'getAutoToken'])->name('api.getAutoToken');