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

gx



查看合并请求 !1742

@@ -67,6 +67,7 @@ class RenewProjectController extends BaseController
         }else{
         }else{
             $map['type'] = $param['type'];
             $map['type'] = $param['type'];
         }
         }
+        $map['extend_type'] = 0;
         $map['remain_day'] = ['<=',15];
         $map['remain_day'] = ['<=',15];
         return $map;
         return $map;
     }
     }

@@ -82,4 +82,23 @@ class ChatController extends BaseController
         $data = $chat->edit(['status'=>0],['id'=>$this->param['id']]);
         $data = $chat->edit(['status'=>0],['id'=>$this->param['id']]);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
+
+    /**
+     * @remark :修改标题
+     * @name   :saveChat
+     * @author :lyh
+     * @method :post
+     * @time   :2025/4/7 11:15
+     */
+    public function saveChat(Chat $chat){
+        $this->request->validate([
+            'id'=>['required'],
+            'input_content'=>['required'],
+        ],[
+            'id.required' => 'id不能为空',
+            'input_content.required' => '标题不能为空',
+        ]);
+        $data = $chat->edit(['input_content'=>$this->param['input_content']],['id'=>$this->param['id']]);
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

@@ -152,7 +152,7 @@ class LoginController extends BaseController
         ],[
         ],[
             'str.required' => '翻译字符串不能为空',
             'str.required' => '翻译字符串不能为空',
         ]);
         ]);
-        $str = Translate::tran($this->param['str'], 'en') ?? '';
+        $str = Translate::tran($this->param['str'], $this->param['language'] ?? 'en') ?? '';
         if(is_array($str)){
         if(is_array($str)){
             $str = $str[0];
             $str = $str[0];
         }
         }

@@ -717,6 +717,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'list'])->name('gpt_list');
         Route::any('/', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'list'])->name('gpt_list');
         Route::any('/itemList', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'itemList'])->name('gpt_itemList');
         Route::any('/itemList', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'itemList'])->name('gpt_itemList');
         Route::any('/del', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'del'])->name('gpt_del');
         Route::any('/del', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'del'])->name('gpt_del');
+        Route::any('/save', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'saveChat'])->name('gpt_save');
         Route::any('/sendMessage', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'sendMessage'])->name('gpt_sendMessage');
         Route::any('/sendMessage', [\App\Http\Controllers\Bside\Gpt\ChatController::class, 'sendMessage'])->name('gpt_sendMessage');
     });
     });