Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

app/Http/Controllers/Api/AuthApiController.php

@@ -162,6 +162,11 @@ class AuthApiController extends Controller
             return $this->setError('Email code invalid');
             return $this->setError('Email code invalid');
         }
         }
 
 
+        $hashedPassword = UserModel::where('email', $email)->value('password');
+        if (Hash::check($password, $hashedPassword)) {
+            return $this->setError('The new password cannot be the same as the old password!');
+        }
+
         $user = UserModel::where('email', $email)->first();
         $user = UserModel::where('email', $email)->first();
         $user->password = Hash::make($password);
         $user->password = Hash::make($password);
         $user->update_time = time();
         $user->update_time = time();
@@ -213,7 +218,7 @@ class AuthApiController extends Controller
         Redis::expire($redisKey, 120);
         Redis::expire($redisKey, 120);
         $subject = config('mail.from.name');
         $subject = config('mail.from.name');
 
 
-        return $this->setSuccessData($code);
+        // return $this->setSuccessData($code);
         Mail::to($email)->send(new SendCode($type, $code));
         Mail::to($email)->send(new SendCode($type, $code));
         //错误处理
         //错误处理
         if (count(Mail::failures())) {
         if (count(Mail::failures())) {