Fixed 邮件获取用户邮箱失败

app/Components/NetworkDetection.php

@@ -7,12 +7,17 @@ use Log;
 
 class NetworkDetection
 {
+    public const success = '✔️ 通讯正常';
+    public const oversea_blocked = '🛑 海外阻断';
+    public const china_blocked = '🛑 国内阻断';
+    public const disconnected = '❌ 断连';
+
     /**
      * 用外部API进行Ping检测.
      *
      * @param  string  $ip  被检测的IP或者域名
      *
-     * @return bool|array
+     * @return bool
      */
     public function ping(string $ip)
     {
@@ -140,18 +145,18 @@ class NetworkDetection
             }
 
             if ($message['firewall-enable'] && $message['firewall-disable']) {
-                return '通讯正常'; // 正常
+                return self::success; // 正常
             }
 
             if ($message['firewall-enable'] && ! $message['firewall-disable']) {
-                return '海外阻断'; // 国外访问异常
+                return self::oversea_blocked; // 国外访问异常
             }
 
             if (! $message['firewall-enable'] && $message['firewall-disable']) {
-                return '国内阻断'; // 被墙
+                return self::china_blocked; // 被墙
             }
 
-            return '断连'; // 服务器宕机
+            return self::disconnected; // 服务器宕机
         }
 
         return false;
@@ -177,18 +182,18 @@ class NetworkDetection
             }
 
             if ($cn[$checkName] === 'success' && $us['outside_'.$checkName] === 'success') {
-                return '通讯正常'; // 正常
+                return self::success; // 正常
             }
 
             if ($cn[$checkName] === 'success' && $us['outside_'.$checkName] !== 'success') {
-                return '海外阻断'; // 国外访问异常
+                return self::oversea_blocked; // 国外访问异常
             }
 
             if ($cn[$checkName] !== 'success' && $us['outside_'.$checkName] === 'success') {
-                return '国内阻断'; // 被墙
+                return self::china_blocked; // 被墙
             }
 
-            return '断连'; // 服务器宕机
+            return self::disconnected; // 服务器宕机
         }
 
         return false;
@@ -216,18 +221,18 @@ class NetworkDetection
             }
 
             if ($message['data']['data']['inner'.$checkName] && $message['data']['data']['out'.$checkName]) {
-                return '通讯正常'; // 正常
+                return self::success; // 正常
             }
 
             if ($message['data']['data']['inner'.$checkName] && ! $message['data']['data']['out'.$checkName]) {
-                return '海外阻断'; // 国外访问异常
+                return self::oversea_blocked; // 国外访问异常
             }
 
             if (! $message['data']['data']['inner'.$checkName] && $message['data']['data']['out'.$checkName]) {
-                return '国内阻断'; // 被墙
+                return self::china_blocked; // 被墙
             }
 
-            return '断连'; // 服务器宕机
+            return self::disconnected; // 服务器宕机
         }
 
         return false;
@@ -258,18 +263,18 @@ class NetworkDetection
             }
 
             if ($cn['data'][$checkName] && $us['data'][$checkName]) {
-                return '通讯正常'; // 正常
+                return self::success; // 正常
             }
 
             if ($cn['data'][$checkName] && ! $us['data'][$checkName]) {
-                return '海外阻断'; // 国外访问异常
+                return self::oversea_blocked; // 国外访问异常
             }
 
             if (! $cn['data'][$checkName] && $us['data'][$checkName]) {
-                return '国内阻断'; // 被墙
+                return self::china_blocked; // 被墙
             }
 
-            return '断连'; // 服务器宕机
+            return self::disconnected; // 服务器宕机
         }
 
         return false;
@@ -292,18 +297,18 @@ class NetworkDetection
             }
 
             if ($message[0]['result'][$checkName] && $message[1]['result'][$checkName]) {
-                return '通讯正常'; // 正常
+                return self::success; // 正常
             }
 
             if ($message[0]['result'][$checkName] && ! $message[1]['result'][$checkName]) {
-                return '海外阻断'; // 国外访问异常
+                return self::oversea_blocked; // 国外访问异常
             }
 
             if (! $message[0]['result'][$checkName] && $message[1]['result'][$checkName]) {
-                return '国内阻断'; // 被墙
+                return self::china_blocked; // 被墙
             }
 
-            return '断连'; // 服务器宕机
+            return self::disconnected; // 服务器宕机
         }
 
         return false;
@@ -328,18 +333,18 @@ class NetworkDetection
             }
 
             if (str_contains($cn[$checkName], 'green') && str_contains($us[$checkName], 'green')) {
-                return '通讯正常'; // 正常
+                return self::success; // 正常
             }
 
             if (str_contains($cn[$checkName], 'green') && ! str_contains($us[$checkName], 'green')) {
-                return '海外阻断'; // 国外访问异常
+                return self::oversea_blocked; // 国外访问异常
             }
 
             if (! str_contains($cn[$checkName], 'green') && str_contains($us[$checkName], 'green')) {
-                return '国内阻断'; // 被墙
+                return self::china_blocked; // 被墙
             }
 
-            return '断连'; // 服务器宕机
+            return self::disconnected; // 服务器宕机
         }
 
         return false;

app/Models/User.php

@@ -26,6 +26,11 @@ class User extends Authenticatable implements JWTSubject
     protected $dates = ['expired_at', 'reset_time'];
     protected $guarded = [];
 
+    public function routeNotificationForMail($notification)
+    {
+        return $this->username;
+    }
+
     public function usedTrafficPercentage()
     {
         return round(($this->used_traffic) / $this->transfer_enable, 2);

composer.lock

@@ -2089,16 +2089,16 @@
         },
         {
             "name": "laravel-lang/lang",
-            "version": "8.1.3",
+            "version": "10.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Laravel-Lang/lang.git",
-                "reference": "54048d1319b211daa8ab73655b698feb09588876"
+                "reference": "68adbec33de30777cddbfd99cef1e3fb16237a5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/54048d1319b211daa8ab73655b698feb09588876",
-                "reference": "54048d1319b211daa8ab73655b698feb09588876",
+                "url": "https://api.github.com/repos/Laravel-Lang/lang/zipball/68adbec33de30777cddbfd99cef1e3fb16237a5a",
+                "reference": "68adbec33de30777cddbfd99cef1e3fb16237a5a",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2112,10 +2112,16 @@
             },
             "require-dev": {
                 "andrey-helldar/pretty-array": "^2.3",
-                "andrey-helldar/support": "^3.4",
+                "andrey-helldar/support": "^3.16.1",
+                "guzzlehttp/guzzle": "^7.3",
+                "laravel/breeze": "^1.2",
+                "laravel/fortify": "^1.7",
+                "laravel/jetstream": "^2.3",
                 "php": "^8.0",
                 "phpunit/phpunit": "^9.5",
-                "symfony/var-dumper": "^5.2"
+                "symfony/finder": "^5.2",
+                "symfony/var-dumper": "^5.2",
+                "vlucas/phpdotenv": "^5.3"
             },
             "suggest": {
                 "andrey-helldar/laravel-lang-publisher": "Easy installation and update of translation files for your project",
@@ -2144,7 +2150,7 @@
                 "issues": "https://github.com/Laravel-Lang/lang/issues",
                 "source": "https://github.com/Laravel-Lang/lang"
             },
-            "time": "2021-04-14T17:41:45+00:00"
+            "time": "2021-07-08T19:28:32+00:00"
         },
         {
             "name": "laravel-notification-channels/bearychat",
@@ -3877,16 +3883,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.51.1",
+            "version": "2.52.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922"
+                "reference": "369c0e2737c56a0f39c946dd261855255a6fccbe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922",
-                "reference": "8619c299d1e0d4b344e1f98ca07a1ce2cfbf1922",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/369c0e2737c56a0f39c946dd261855255a6fccbe",
+                "reference": "369c0e2737c56a0f39c946dd261855255a6fccbe",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -3973,7 +3979,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-28T13:16:28+00:00"
+            "time": "2021-08-14T19:10:52+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -4110,16 +4116,16 @@
         },
         {
             "name": "overtrue/laravel-lang",
-            "version": "5.0.0",
+            "version": "5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/overtrue/laravel-lang.git",
-                "reference": "30133b4b97a43368949ca48985cd04968d50ba40"
+                "reference": "cb82a2f1e5fd1c7313a5aa1531f02cd5838969e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/overtrue/laravel-lang/zipball/30133b4b97a43368949ca48985cd04968d50ba40",
-                "reference": "30133b4b97a43368949ca48985cd04968d50ba40",
+                "url": "https://api.github.com/repos/overtrue/laravel-lang/zipball/cb82a2f1e5fd1c7313a5aa1531f02cd5838969e4",
+                "reference": "cb82a2f1e5fd1c7313a5aa1531f02cd5838969e4",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -4130,7 +4136,7 @@
             },
             "require": {
                 "ext-json": "*",
-                "laravel-lang/lang": "^8.0",
+                "laravel-lang/lang": "^10.1",
                 "symfony/process": "^5.0.0"
             },
             "require-dev": {
@@ -4169,7 +4175,7 @@
             ],
             "support": {
                 "issues": "https://github.com/overtrue/laravel-lang/issues",
-                "source": "https://github.com/overtrue/laravel-lang/tree/5.0.0"
+                "source": "https://github.com/overtrue/laravel-lang/tree/5.0.2"
             },
             "funding": [
                 {
@@ -4177,7 +4183,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2021-04-28T03:56:56+00:00"
+            "time": "2021-08-20T12:06:44+00:00"
         },
         {
             "name": "phpoffice/phpspreadsheet",
@@ -5497,16 +5503,16 @@
         },
         {
             "name": "stripe/stripe-php",
-            "version": "v7.93.0",
+            "version": "v7.94.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/stripe/stripe-php.git",
-                "reference": "c739cf6841bb3498e23bd52ecfadfcb21c521a14"
+                "reference": "03cd6b5c1c4fc9087ddd1dd046457bff274294d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/c739cf6841bb3498e23bd52ecfadfcb21c521a14",
-                "reference": "c739cf6841bb3498e23bd52ecfadfcb21c521a14",
+                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/03cd6b5c1c4fc9087ddd1dd046457bff274294d6",
+                "reference": "03cd6b5c1c4fc9087ddd1dd046457bff274294d6",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -5558,9 +5564,9 @@
             ],
             "support": {
                 "issues": "https://github.com/stripe/stripe-php/issues",
-                "source": "https://github.com/stripe/stripe-php/tree/v7.93.0"
+                "source": "https://github.com/stripe/stripe-php/tree/v7.94.0"
             },
-            "time": "2021-08-11T18:48:54+00:00"
+            "time": "2021-08-19T14:15:27+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -9274,16 +9280,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "2.1.5",
+            "version": "2.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "ac679902e9f66b85a8f9d8c1c88180f609a8745d"
+                "reference": "e5cac5f9d2354d08b67f1d21c664ae70d748c603"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/ac679902e9f66b85a8f9d8c1c88180f609a8745d",
-                "reference": "ac679902e9f66b85a8f9d8c1c88180f609a8745d",
+                "url": "https://api.github.com/repos/composer/composer/zipball/e5cac5f9d2354d08b67f1d21c664ae70d748c603",
+                "reference": "e5cac5f9d2354d08b67f1d21c664ae70d748c603",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -9356,9 +9362,9 @@
                 "package"
             ],
             "support": {
-                "irc": "irc://irc.freenode.org/composer",
+                "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.1.5"
+                "source": "https://github.com/composer/composer/tree/2.1.6"
             },
             "funding": [
                 {
@@ -9374,7 +9380,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-23T08:35:47+00:00"
+            "time": "2021-08-19T15:11:08+00:00"
         },
         {
             "name": "composer/metadata-minifier",
@@ -13032,16 +13038,16 @@
         },
         {
             "name": "seld/phar-utils",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/phar-utils.git",
-                "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796"
+                "reference": "749042a2315705d2dfbbc59234dd9ceb22bf3ff0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
-                "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/749042a2315705d2dfbbc59234dd9ceb22bf3ff0",
+                "reference": "749042a2315705d2dfbbc59234dd9ceb22bf3ff0",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -13080,9 +13086,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/phar-utils/issues",
-                "source": "https://github.com/Seldaek/phar-utils/tree/master"
+                "source": "https://github.com/Seldaek/phar-utils/tree/1.1.2"
             },
-            "time": "2020-07-07T18:42:57+00:00"
+            "time": "2021-08-19T21:01:38+00:00"
         },
         {
             "name": "symfony/debug",

resources/views/auth/resetPassword.blade.php

@@ -14,7 +14,7 @@
                 {{trans('auth.password.reset.attribute')}}
             </div>
             <div class="form-group form-material floating" data-plugin="formMaterial">
-                <input type="text" class="form-control" name="username" value="{{Request::old('username')}}" required="required" autofocus="autofocus"/>
+                <input type="text" class="form-control" name="username" value="{{Request::old('username')}}" autofocus required/>
                 <label class="floating-label" for="username">
                     {{sysConfig('username_type') === 'email' || sysConfig('username_type') === null ? trans('validation.attributes.email') : trans('validation.attributes.username')}}
                 </label>