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

Lyh server



查看合并请求 !3008

@@ -28,7 +28,7 @@ class GeoController extends BaseController
     public function getWritingsList(Request $request)
     public function getWritingsList(Request $request)
     {
     {
         try {
         try {
-            $token = trim($request->input('token'));
+            $token = trim($this->param['token']);
             $param = Crypt::decrypt($token);
             $param = Crypt::decrypt($token);
             if ($param['send_at'] + 86400 < time()) {}
             if ($param['send_at'] + 86400 < time()) {}
             $project_id = $param['project_id'];
             $project_id = $param['project_id'];
@@ -78,10 +78,14 @@ class GeoController extends BaseController
         ]);
         ]);
         $token = trim($request->input('token'));
         $token = trim($request->input('token'));
         $data = GeoWritings::where(['uniqid' => $token])->first();
         $data = GeoWritings::where(['uniqid' => $token])->first();
-        if (empty($data))
+        if (empty($data)){
             return $this->error('非法请求');
             return $this->error('非法请求');
-        if ($data->status != GeoWritings::STATUS_RUNNING)
+        }
+
+        if ($data->status != GeoWritings::STATUS_RUNNING){
             return $this->error('当前文章已确认，不可再次确认');
             return $this->error('当前文章已确认，不可再次确认');
+        }
+
 
 
         // FIXME 验证完成，保存数据，计算内容长度，处理内容中的资源， IP 确认时间 状态
         // FIXME 验证完成，保存数据，计算内容长度，处理内容中的资源， IP 确认时间 状态
         return $data;
         return $data;
@@ -113,4 +117,4 @@ class GeoController extends BaseController
      */
      */
     public function saveConfirm(Request $request)
     public function saveConfirm(Request $request)
     {}
     {}
-}
+}

@@ -125,5 +125,7 @@ class GeoController extends BaseController
      * @param Request $request
      * @param Request $request
      */
      */
     public function saveConfirmData(Request $request)
     public function saveConfirmData(Request $request)
-    {}
+    {
+
+    }
 }
 }

@@ -21,6 +21,9 @@ class AiBlogController extends BaseController
      * @time   :2025/2/14 13:59
      * @time   :2025/2/14 13:59
      */
      */
     public function getAiBlog(AiBlog $aiBlog){
     public function getAiBlog(AiBlog $aiBlog){
+        if(isset($this->param['new_title']) && !empty($this->param['new_title'])){
+            $this->param['new_title'] = ['like', '%'.$this->param['new_title'].'%'];
+        }
         $lists = $aiBlog->lists($this->map,$this->page,$this->row,'id',['id','keyword','new_title','route','image','task_id','status','created_at','updated_at']);
         $lists = $aiBlog->lists($this->map,$this->page,$this->row,'id',['id','keyword','new_title','route','image','task_id','status','created_at','updated_at']);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){

@@ -590,7 +590,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::prefix('conf')->group(function () {
         Route::prefix('conf')->group(function () {
             Route::any('/getConfig', [Aside\Geo\GeoController::class, 'getConfig'])->name('admin.geo_conf_getConfig');
             Route::any('/getConfig', [Aside\Geo\GeoController::class, 'getConfig'])->name('admin.geo_conf_getConfig');
             Route::any('/saveConfig', [Aside\Geo\GeoController::class, 'saveConfig'])->name('admin.geo_conf_saveConfig');
             Route::any('/saveConfig', [Aside\Geo\GeoController::class, 'saveConfig'])->name('admin.geo_conf_saveConfig');
-
+            Route::any('/saveConfirmContent', [Aside\Geo\GeoController::class, 'saveConfirmContent'])->name('admin.geo_conf_saveConfirmContent');
         });
         });
     });
     });
     // 任务相关
     // 任务相关