Merge branch 'dev-xpy' into dev

app/common/repositories/user/UserRepository.php

@@ -4474,4 +4474,16 @@ class UserRepository extends BaseRepository
             Elm::number('pack','份数',$stock['pack'])->required()
         ])->setTitle('编辑');
     }
+
+    //记录用户确认了用户协议
+    private function userar($uid){
+        Db::name('operating_record')->insert([
+            'uid' => $uid,
+            'operation_model' => '1',
+            'operate_model_type' => '1',
+            'mark' => '用户同意用户协议记录',
+            'operation_time' => date('Y-m-d H:i:s')
+        ]);
+    }
+
 }

app/controller/api/Auth.php

@@ -472,7 +472,6 @@ class Auth extends BaseController
         $tokenInfo = $repository->createToken($user);
 
         $repository->loginAfter($user);
-
         return app('json')->success($repository->returnToken($user, $tokenInfo));
     }
 
@@ -559,7 +558,7 @@ class Auth extends BaseController
 
         $result = $repository->returnToken($user, $tokenInfo);
         $result['uid'] = $user->uid;
-
+        $repository->userar($user->uid);
         return app('json')->success($result);
 
     }