From bdaabdbe091cf3889969f74b76c1e58e08f11637 Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <aa123456>
Date: Thu, 19 Oct 2023 14:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E5=86=8C=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81=E3=80=81=E6=8F=90=E5=B8=81=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Common/functions.php                      | 17 ++++++++++++++++
 .../Api/V1/UserWalletController.php           |  4 ++--
 .../Controllers/Appapi/V1/LoginController.php |  4 ++++
 .../Controllers/Appapi/V1/UserController.php  | 20 ++++++++++++++++++-
 resources/lang/spa.json                       |  2 +-
 routes/yx_appapi.php                          |  1 +
 6 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/app/Common/functions.php b/app/Common/functions.php
index 5ee5d74..42c16e2 100644
--- a/app/Common/functions.php
+++ b/app/Common/functions.php
@@ -1164,6 +1164,23 @@ function sendEmailCode($email, $scene = 'verify_code')
     }
 }
 
+function sendTbEmail($email, $scene = 'tb_code'){
+    $key = $scene . ':' . $email;
+    //    if (Cache::has($key)){
+    //        return '请勿重复发送';
+    //    }
+    $code = getCode();
+    Mail::send('emails.tb_code', ['code' => $code], function ($message) use (&$email) {
+        $message->to($email, 'PNECoin')->subject('PNECoin');
+    }); //dd(Mail::failures());
+    if (Mail::failures()) {
+        return '发送失败';
+    } else {
+        Cache::put($key, $code, 600);
+        return true;
+    }
+}
+
 function checkEmailCode($email, $code, $scene = 'verify_code')
 {
     $key = $scene . ':' . $email;
diff --git a/app/Http/Controllers/Api/V1/UserWalletController.php b/app/Http/Controllers/Api/V1/UserWalletController.php
index fac9200..96bcee6 100644
--- a/app/Http/Controllers/Api/V1/UserWalletController.php
+++ b/app/Http/Controllers/Api/V1/UserWalletController.php
@@ -225,10 +225,10 @@ class UserWalletController extends ApiController {
     }
 
     # 提币验证码
-    public function wdcode(){
+    public function wdcode(Request $request){
         $user    = $this->current_user();
         // send email code
-        $sendResult = sendEmailCode($user['email']);
+        $sendResult = sendTbEmail($user['email']);
         if ($sendResult === true) {
             return $this->success("success");
         }
diff --git a/app/Http/Controllers/Appapi/V1/LoginController.php b/app/Http/Controllers/Appapi/V1/LoginController.php
index 44692b9..0670eb9 100644
--- a/app/Http/Controllers/Appapi/V1/LoginController.php
+++ b/app/Http/Controllers/Appapi/V1/LoginController.php
@@ -175,6 +175,10 @@ class LoginController extends ApiController
             exit();
         }
 
+        if (!Cache::pull($this->get_cache_key($request->input('gc_key')))) {
+            exit();
+        }
+
         $account = $request->input('email');
         //        if($this->agent->isDesktop()){
         //            $token = $request->input('token');
diff --git a/app/Http/Controllers/Appapi/V1/UserController.php b/app/Http/Controllers/Appapi/V1/UserController.php
index c6a881f..eccb98e 100644
--- a/app/Http/Controllers/Appapi/V1/UserController.php
+++ b/app/Http/Controllers/Appapi/V1/UserController.php
@@ -185,6 +185,24 @@ class UserController extends ApiController
         return $this->successWithData($user);
     }
 
+    /**
+     * 修改密码时候发送的邮箱验证码
+     * 用户登录后操作。（邮箱真实有效、已经处于登录）
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     * @throws ApiException
+     */
+    public function sendUemailCode(Request  $request){
+        $user = $this->current_user();
+        $uemail = $user->email();
+        //
+        $sendResult = sendEmailCode($uemail);
+        if ($sendResult === true) {
+            return $this->success();
+         }
+        return $this->error(4001, $sendResult);
+    }
+
     //修改用户信息
     public function updateUserInfo(Request $request)
     {
@@ -278,7 +296,7 @@ class UserController extends ApiController
     public function myNotifiables(Request $request)
     {
         $user = $this->current_user();
-        // 
+        //
         $notifiables = $user->notifications()->latest()->paginate()->toArray();
         $notifiables['data'] = collect($notifiables['data'])->map(function ($v) {
             $v['data'] = $v['type']::messageToMultilanguage($v['data']);
diff --git a/resources/lang/spa.json b/resources/lang/spa.json
index 57aacca..f539756 100644
--- a/resources/lang/spa.json
+++ b/resources/lang/spa.json
@@ -177,5 +177,5 @@
     "数量":"cantidad",
     "提币地址":"dirección de retiro de moneda",
     "您的验证码是":"Su código de verificación es",
-    "注意验证码3分钟内有效，非本人操作请忽略。":Tenga en cuenta que el código de verificación es válido en 3 minutos; ignórelo si no lo hace usted mismo."
+    "注意验证码3分钟内有效，非本人操作请忽略。":"Tenga en cuenta que el código de verificación es válido en 3 minutos; ignórelo si no lo hace usted mismo."
 }
diff --git a/routes/yx_appapi.php b/routes/yx_appapi.php
index da5e7e4..5252df0 100644
--- a/routes/yx_appapi.php
+++ b/routes/yx_appapi.php
@@ -85,6 +85,7 @@ $api->group(['namespace' => 'V1', 'middleware' => 'auth.api'], function ($api) {
     //个人中心
     $api->get('user/switchSecondVerify', 'UserController@switchSecondVerify'); //登陆二次验证开关
     $api->get('user/getUserInfo', 'UserController@getUserInfo'); //获取用户信息
+    $api->get('user/sendUemailCode', 'UserController@sendUemailCode'); // 更改密码时发送邮箱验证码
     $api->post('user/updateUserInfo', 'UserController@updateUserInfo'); //修改用户信息
 
     //账号安全