mirror of
				https://github.com/v2board/v2board.git
				synced 2025-10-31 09:21:46 +08:00 
			
		
		
		
	update
This commit is contained in:
		| @@ -11,12 +11,12 @@ class ConfigController extends Controller | ||||
| { | ||||
|     public function getEmailTemplate() | ||||
|     { | ||||
|         $dirs = []; | ||||
|         foreach (glob(resource_path('views/mail')) as $file) { | ||||
|             array_push($dirs, $file); | ||||
|         } | ||||
|         $path = resource_path('views/mail/'); | ||||
|         $files = array_map(function ($item) use ($path) { | ||||
|             return str_replace($path, '', $item); | ||||
|         }, glob($path . '*')); | ||||
|         return response([ | ||||
|             'data' => $dirs | ||||
|             'data' => $files | ||||
|         ]); | ||||
|     } | ||||
|  | ||||
| @@ -83,6 +83,9 @@ class ConfigController extends Controller | ||||
|                 ], | ||||
|                 'tutorial' => [ | ||||
|                     'apple_id' => config('v2board.apple_id') | ||||
|                 ], | ||||
|                 'email' => [ | ||||
|                     'email_template' => config('v2board.email_template', 'default') | ||||
|                 ] | ||||
|             ] | ||||
|         ]); | ||||
|   | ||||
| @@ -6,7 +6,7 @@ use App\Http\Requests\Admin\MailSend; | ||||
| use App\Services\UserService; | ||||
| use Illuminate\Http\Request; | ||||
| use App\Http\Controllers\Controller; | ||||
| use App\Jobs\SendEmail; | ||||
| use App\Jobs\SendEmailJob; | ||||
|  | ||||
| class MailController extends Controller | ||||
| { | ||||
| @@ -28,10 +28,10 @@ class MailController extends Controller | ||||
|         } | ||||
|  | ||||
|         foreach ($users as $user) { | ||||
|             SendEmail::dispatch([ | ||||
|             SendEmailJob::dispatch([ | ||||
|                 'email' => $user->email, | ||||
|                 'subject' => $request->input('subject'), | ||||
|                 'template_name' => 'mail.sendEmailCustom', | ||||
|                 'template_name' => 'notify', | ||||
|                 'template_value' => [ | ||||
|                     'name' => config('v2board.app_name', 'V2Board'), | ||||
|                     'url' => config('v2board.app_url'), | ||||
|   | ||||
| @@ -9,7 +9,7 @@ use Illuminate\Http\Exceptions\HttpResponseException; | ||||
| use Illuminate\Support\Facades\Mail; | ||||
| use App\Utils\Helper; | ||||
| use Illuminate\Support\Facades\Cache; | ||||
| use App\Jobs\SendEmail; | ||||
| use App\Jobs\SendEmailJob; | ||||
| use App\Models\InviteCode; | ||||
| use App\Utils\Dict; | ||||
| use App\Utils\CacheKey; | ||||
| @@ -45,10 +45,10 @@ class CommController extends Controller | ||||
|         $code = rand(100000, 999999); | ||||
|         $subject = config('v2board.app_name', 'V2Board') . '邮箱验证码'; | ||||
|  | ||||
|         SendEmail::dispatch([ | ||||
|         SendEmailJob::dispatch([ | ||||
|             'email' => $email, | ||||
|             'subject' => $subject, | ||||
|             'template_name' => 'mail.sendEmailVerify', | ||||
|             'template_name' => 'verify', | ||||
|             'template_value' => [ | ||||
|                 'name' => config('v2board.app_name', 'V2Board'), | ||||
|                 'code' => $code, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user