1

@@ -37,47 +37,43 @@ class Home {
             app()->e('smtp_verify_error');
             app()->e('smtp_verify_error');
         }
         }
 
 
-        $data = db()->first(\Model\email::first($formData['email']));
-
-        app()->_json($data);
-
-//        // host
-//        $model = Email::_first($formData['email']);
-//        if(!$model){
-//            $model = new Email();
-//            $model->email = $formData['email'];
-//        }
-//
-//        $model->imap = $formData['imap'];
-//        $model->smtp = $formData['smtp'];
-//        $model->status = Email::STATUS_ACTIVE;
-//        $model->password = @base64_encode($formData['password']);
-//
-//        try {
-//            Mail::login($model->email,$model->password,$model->imap);
-//        }catch (\Throwable $e){
-//            return res()
-//                ->message($e->getMessage())
-//                ->status(400)
-//                ->toJson();
-//        }
-//
-//        // 登录成功了，密码验证字段通过
-//        $model->pwd_error = 0;
-//        // 保存好邮箱
-//        $model->save();
-//
-//        // 设置上id，方便后面使用
-//        Mail::$client[$model->email]->setId($model->id);
-//
-//        // 开始同步文件夹
-////        $folder = Mail::syncFolder($model->email);
-//
-//        return res()
-//            ->data([
-//                'token' => token_en($model->id.','.$model->email.','.time())
-//            ])
-//            ->toJson();
+        // 查询数据
+        $model = db()->first(\Model\email::first($formData['email']));
+        if(!$model){
+            $model = new Email();
+            $model->email = $formData['email'];
+        }
+
+        $model->imap = $formData['imap'];
+        $model->smtp = $formData['smtp'];
+        $model->status = Email::STATUS_ACTIVE;
+        $model->password = @base64_encode($formData['password']);
+
+        try {
+            Mail::login($model->email,$model->password,$model->imap);
+        }catch (\Throwable $e){
+            return res()
+                ->message($e->getMessage())
+                ->status(400)
+                ->toJson();
+        }
+
+        // 登录成功了，密码验证字段通过
+        $model->pwd_error = 0;
+        // 保存好邮箱
+        $model->save();
+
+        // 设置上id，方便后面使用
+        Mail::$client[$model->email]->setId($model->id);
+
+        // 开始同步文件夹
+//        $folder = Mail::syncFolder($model->email);
+
+        return res()
+            ->data([
+                'token' => token_en($model->id.','.$model->email.','.time())
+            ])
+            ->toJson();
 
 
     }
     }
 
 

@@ -144,4 +144,14 @@ class DbPool {
     }
     }
 
 
 
 
+    /**
+     * 结束
+     */
+    public function __destruct(){
+        $this->client = null;
+    }
+
+
+
+
 }
 }