变更数据

@@ -66,9 +66,9 @@ class GeoController extends BaseController
      * @param Request $request
      * @param Request $request
      * @return false|string
      * @return false|string
      */
      */
-    public function confirmWritings(Request $request)
+    public function confirmWritings()
     {
     {
-        $request->validate([
+        $this->request->validate([
             'token' => 'required',
             'token' => 'required',
             'title' => 'required|max:120',
             'title' => 'required|max:120',
             'content' => 'required|max:5000'
             'content' => 'required|max:5000'
@@ -79,17 +79,14 @@ class GeoController extends BaseController
             'content.required' => '内容不能为空',
             'content.required' => '内容不能为空',
             'content.max' => '内容过长保存失败',
             'content.max' => '内容过长保存失败',
         ]);
         ]);
-        $token = trim($request->input('token'));
+        $token = trim($this->param['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;
     }
     }

@@ -51,9 +51,6 @@ class GeoWritingsLogic extends BaseLogic
      */
      */
     public function saveWriting(){
     public function saveWriting(){
         try {
         try {
-            $this->param['content_length'] = strlen($this->param['content']);
-            $this->param['confirm_ip'] = $this->request->ip();
-            $this->param['confirm_at'] = date('Y-m-d H:i:s');
             if(isset($this->param['id']) &&!empty($this->param['id'])){
             if(isset($this->param['id']) &&!empty($this->param['id'])){
                 $id = $this->param['id'];
                 $id = $this->param['id'];
                 $this->model->edit($this->param,['id'=>$id]);
                 $this->model->edit($this->param,['id'=>$id]);
@@ -61,11 +58,7 @@ class GeoWritingsLogic extends BaseLogic
                 $this->param['uniqid'] = uniqid().$this->param['project_id'];
                 $this->param['uniqid'] = uniqid().$this->param['project_id'];
                 $id = $this->model->addReturnId($this->param);
                 $id = $this->model->addReturnId($this->param);
             }
             }
-            $friend = ProjectAssociation::where(['project_id' => $this->param['project_id']])->first();
-            if (empty($friend)){
-                $this->fail('项目未绑定微信群, 推送消息失败！');
-            }
-            GeoConfirm::sendConfirmMessage($id, $friend->friend_id);
+            GeoWritings::sendConfirmMessage($id);
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('保存数据失败，请联系管理员'.$e->getMessage());
             $this->fail('保存数据失败，请联系管理员'.$e->getMessage());
         }
         }