proxy

@@ -34,12 +34,18 @@ class ServerProxy extends Base {
         $email = app()->request('email');
         $smtp = app()->request('smtp');
         $imap = app()->request('imap');
-        $proxy = new MailProxy($email,$imap,$smtp);
-        $proxy->proxySuccess();
-        app()->_json([
-            'imap_proxy'    =>  $proxy->getImapProxy(),
-            'smtp_proxy'    =>  $proxy->getSmtpProxy()
-        ]);
+        $default = app()->request('default');
+
+        if($email&&$imap&&$smtp&&Verify::sEmail($email)){
+            $proxy = new MailProxy($email,$imap,$smtp, $default);
+            $proxy->proxySuccess();
+            app()->_json([
+                'imap_proxy'    =>  $proxy->getImapProxy(),
+                'smtp_proxy'    =>  $proxy->getSmtpProxy()
+            ]);
+        }else{
+            app()->e('异常');
+        }
     }
 
 

@@ -3,6 +3,8 @@
 namespace Service;
 
 use Lib\Mail\MailFun;
+use Model\emailSql;
+use Model\listsSql;
 
 /**
  * @author：dc
@@ -60,7 +62,7 @@ class MailProxy {
      */
     protected $proxyService = [
         '43.134.162.250', // 这个是新加坡服务器 代理
-        '43.154.117.107', // 这个是 shopk的那台服务器
+//        '43.154.117.107', // 这个是 shopk的那台服务器
     ];
 
     /**
@@ -75,26 +77,44 @@ class MailProxy {
      */
     protected $email = '';
 
+    protected $defaultIp = '';
+
     /**
      * MailProxy constructor.
      * @param string $email
      * @param string $imap
      * @param string $smtp
+     * @param string $default
      * @throws \Exception
      */
-    public function __construct(string $email, string $imap, string $smtp)
+    public function __construct(string $email, string $imap, string $smtp,string $default='')
     {
         $this->email = str_replace(['"',"'"],'',$email);
+
+        if($default){
+            $this->defaultIp = $default;
+        }
+
         // 先分配
         $this->assignEmail();
 
         $this->originImapHost = $imap;
 
         $this->originSmtpHost = $smtp;
-        // 解析
-        $this->proxyImapHost = $this->parse($imap,993);
-        // 解析
-        $this->proxySmtpHost = $this->parse($smtp,465);
+        // 不需要分配
+        if($this->assignIp===false){
+            // 解析
+            $this->proxyImapHost = $imap;
+            // 解析
+            $this->proxySmtpHost = $smtp;
+        }else{
+            // 解析
+            $this->proxyImapHost = $this->parse($imap,993);
+            // 解析
+            $this->proxySmtpHost = $this->parse($smtp,465);
+        }
+
+
     }
 
     /**
@@ -153,9 +173,7 @@ class MailProxy {
             if($serve != $this->assignIp){
                 $this->assignIp = $serve;
                 // 更新 ip
-                db()->throw()->update('mail_proxy',[
-                    'ip'    =>  $this->assignIp
-                ],dbWhere(['email'=>$this->email]),false);
+                $this->updateIp();
             }
 
         }else{
@@ -193,6 +211,30 @@ class MailProxy {
             $this->assignIp = $data['ip'];
             return ;
         }
+
+        if(!$data){
+            // 如果 已经有之前的邮箱了， 就不进行代理了
+            if(db()->count(emailSql::first($this->email))){
+                $this->assignIp = false;
+                return ;
+            }
+        }
+
+        // 默认指定 ip
+        if($this->defaultIp){
+            if($data){
+                $this->assignIp = $this->defaultIp;
+                if($data['ip'] == $this->defaultIp){
+                    return ;
+                }else{
+                    $this->updateIp();
+                }
+            }else{
+                $this->createIp();
+            }
+            return ;
+        }
+
         // 一个月活跃用户
         $t = date('Y-m-d H:i:s',strtotime("-30 day"));
         foreach ($this->proxyService as $ip){
@@ -202,16 +244,9 @@ class MailProxy {
                 $this->assignIp = $ip;
                 // 如果某个服务器 停止了，进来了就要重新分配
                 if($data){
-                    db()->throw()->update('mail_proxy',[
-                        'ip'    =>  $this->assignIp
-                    ],'id = '.$data['id']);
+                    $this->updateIp();
                 }else{
-                    db()->throw()->insert('mail_proxy',[
-                        'email' =>  $this->email,
-                        'ip'    =>  $this->assignIp,
-                        'time'  =>  date('Y-m-d H:i:s'),
-                        'status'    =>  0
-                    ],false);
+                    $this->createIp();
                 }
 
                 return ;
@@ -221,6 +256,32 @@ class MailProxy {
         throw new \Exception('没有资源可分配');
     }
 
+    /**
+     * 更新ip
+     * @param $ip
+     * @author：dc
+     * @time 2025/3/14 15:55
+     */
+    protected function updateIp(){
+        db()->throw()->update('mail_proxy',[
+            'ip'    =>  $this->assignIp,
+            'time'  =>  date('Y-m-d H:i:s'),
+        ],dbWhere(['email'=>$this->email]),false);
+    }
+
+    /**
+     * 创建
+     * @author：dc
+     * @time 2025/3/14 15:57
+     */
+    protected function createIp(){
+        db()->throw()->insert('mail_proxy',[
+            'email' =>  $this->email,
+            'ip'    =>  $this->assignIp,
+            'time'  =>  date('Y-m-d H:i:s'),
+            'status'    =>  0
+        ],false);
+    }
 
     /**
      * 标记为正常使用代理
@@ -229,7 +290,8 @@ class MailProxy {
      */
     public function proxySuccess(){
         db()->update('mail_proxy',[
-            'status'    =>  1
+            'status'    =>  1,
+            'time'  =>  date('Y-m-d H:i:s'),
         ],dbWhere(['email'=>$this->email]),false);
     }