Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -92,6 +92,11 @@ class EmailController extends BaseController
         $this->response('success');
         $this->response('success');
     }
     }
 
 
+    public function get_smtp(Smtp $smtp){
+        $info = $smtp->read(['project_id' => $this->param['project_id']]);
+        $this->response('success', $info);
+    }
+
     public function group_send(GroupSendTask $groupSendTask)
     public function group_send(GroupSendTask $groupSendTask)
     {
     {
         $this->request->validate([
         $this->request->validate([

@@ -633,6 +633,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/del', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'delete'])->name('subscribe_email_del');
         Route::any('/del', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'delete'])->name('subscribe_email_del');
         Route::any('/export', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'export'])->name('subscribe_email_export');
         Route::any('/export', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'export'])->name('subscribe_email_export');
         Route::any('/set_smtp', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'set_smtp'])->name('subscribe_email_set_smtp');
         Route::any('/set_smtp', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'set_smtp'])->name('subscribe_email_set_smtp');
+        Route::any('/get_smtp', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'get_smtp'])->name('subscribe_email_get_smtp');
         Route::any('/group_send', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'group_send'])->name('subscribe_email_group_send');
         Route::any('/group_send', [\App\Http\Controllers\Bside\Subscribe\EmailController::class, 'group_send'])->name('subscribe_email_group_send');
     });
     });