变更数据

@@ -25,7 +25,7 @@ class GeoController extends BaseController
      * @param Request $request
      * @param Request $request
      * @return false|string
      * @return false|string
      */
      */
-    public function getWritingsList(Request $request)
+    public function getWritingsList()
     {
     {
         try {
         try {
             $token = trim($this->param['token']);
             $token = trim($this->param['token']);
@@ -35,7 +35,6 @@ class GeoController extends BaseController
         } catch (\Exception $e) {
         } catch (\Exception $e) {
             return $this->error('非法请求');
             return $this->error('非法请求');
         }
         }
-
         $project = Project::select('title', 'version')->where(['project_id' => $this->param['project_id']])->first();
         $project = Project::select('title', 'version')->where(['project_id' => $this->param['project_id']])->first();
         $list = GeoWritings::select(['title', 'status', 'uniqid', 'confirm_at'])->where(['project_id' => $project_id, 'is_del' => GeoWritings::IS_DEL_FALSE])->get();
         $list = GeoWritings::select(['title', 'status', 'uniqid', 'confirm_at'])->where(['project_id' => $project_id, 'is_del' => GeoWritings::IS_DEL_FALSE])->get();
         $result = [
         $result = [
@@ -100,8 +99,9 @@ class GeoController extends BaseController
     {
     {
         $token = trim($request->input('token'));
         $token = trim($request->input('token'));
         $data = GeoConfirm::where(['uniqid' => $token])->first();
         $data = GeoConfirm::where(['uniqid' => $token])->first();
-        if (empty($data))
+        if (empty($data)){
             return $this->error('当前授权已失效');
             return $this->error('当前授权已失效');
+        }
         $content = explode("\n", $data->content);
         $content = explode("\n", $data->content);
         $confirm = explode("\n", $data->confirm);
         $confirm = explode("\n", $data->confirm);
         $type = $data->type;
         $type = $data->type;

@@ -116,7 +116,7 @@ class GeoConfirm extends Base
         $content_type = 'Link';
         $content_type = 'Link';
         $send_time = now();
         $send_time = now();
         $type = MessagePush::TYPE_GEO_CONFIRM;
         $type = MessagePush::TYPE_GEO_CONFIRM;
-        $token = uniqid();
+        $token = uniqid().$friend_id;
         $created_at = $updated_at = now();
         $created_at = $updated_at = now();
         $content_array = [
         $content_array = [
             'title' => self::typeMapping()[$data->type],
             'title' => self::typeMapping()[$data->type],

@@ -86,13 +86,11 @@ class GeoWritings extends Base
         $type = MessagePush::TYPE_GEO_CONFIRM;
         $type = MessagePush::TYPE_GEO_CONFIRM;
         $friend_id = $friend->friend_id;
         $friend_id = $friend->friend_id;
         $created_at = $updated_at = now();
         $created_at = $updated_at = now();
-
         $param = [
         $param = [
             'project_id' => $project_id,
             'project_id' => $project_id,
             'send_at' => time()
             'send_at' => time()
         ];
         ];
         $token = Crypt::encrypt($param);
         $token = Crypt::encrypt($param);
-
         $content_array = [
         $content_array = [
             'title' => "确认核心文章",
             'title' => "确认核心文章",
             'desc' => '确认核心文章',
             'desc' => '确认核心文章',
@@ -106,4 +104,4 @@ class GeoWritings extends Base
         return true;
         return true;
     }
     }
 
 
-}
+}

@@ -107,4 +107,8 @@ Route::prefix('ticket_upload')->group(function () {
     Route::any('/saveLayoutDesign', [\App\Http\Controllers\Api\WorkOrder\TicketUploadDataController::class, 'saveLayoutDesign'])->name('ticket_upload.saveLayoutDesign');
     Route::any('/saveLayoutDesign', [\App\Http\Controllers\Api\WorkOrder\TicketUploadDataController::class, 'saveLayoutDesign'])->name('ticket_upload.saveLayoutDesign');
     Route::any('/getLayoutDesignInfo', [\App\Http\Controllers\Api\WorkOrder\TicketUploadDataController::class, 'getLayoutDesignInfo'])->name('ticket_upload.getLayoutDesignInfo');
     Route::any('/getLayoutDesignInfo', [\App\Http\Controllers\Api\WorkOrder\TicketUploadDataController::class, 'getLayoutDesignInfo'])->name('ticket_upload.getLayoutDesignInfo');
 });
 });
+//geo设置
+Route::prefix('geo')->group(function () {
+    Route::any('/getConfirm', [\App\Http\Controllers\Api\GeoController::class, 'getConfirm'])->name('geo.getConfirm');
+});