Merge pull request #171 from v2board/dev

1.2.5

app/Http/Controllers/Client/ClientController.php

@@ -101,13 +101,20 @@ class ClientController extends Controller
         $proxyGroup = '';
         foreach ($server as $item) {
             // [Proxy]
-            $proxies .= $item->name . ' = vmess, ' . $item->host . ', ' . $item->port . ', username=' . $user->v2ray_uuid . ', tls=' . ($item->tls ? "true" : "false");
+            $proxies .= $item->name . ' = vmess, ' . $item->host . ', ' . $item->port . ', username=' . $user->v2ray_uuid;
+            if ($item->tls) {
+                $tlsSettings = json_decode($item->tlsSettings);
+                $proxies .= ', tls=' . ($item->tls ? "true" : "false");
+                if (isset($tlsSettings->allowInsecure)) {
+                  $proxies .= ', skip-cert-verify=true';
+                }
+            }
             if ($item->network == 'ws') {
                 $proxies .= ', ws=true';
                 if ($item->networkSettings) {
                     $wsSettings = json_decode($item->networkSettings);
                     if (isset($wsSettings->path)) $proxies .= ', ws-path=' . $wsSettings->path;
-                    if (isset($wsSettings->headers->Host)) $proxies .= ', ws-headers=' . $wsSettings->headers->Host;
+                    if (isset($wsSettings->headers->Host)) $proxies .= ', ws-headers=host:' . $wsSettings->headers->Host;
                 }
             }
             $proxies .= "\r\n";

app/Http/Controllers/User/TicketController.php

@@ -51,6 +51,9 @@ class TicketController extends Controller
     public function save(TicketSave $request)
     {
         DB::beginTransaction();
+        if ((int)Ticket::where('status', 0)->count()) {
+            abort(500, '存在其他工单尚未处理');
+        }
         $ticket = Ticket::create(array_merge($request->only([
             'subject',
             'level'

app/Jobs/SendEmailJob.php

@@ -22,6 +22,7 @@ class SendEmailJob implements ShouldQueue
      */
     public function __construct($params)
     {
+        $this->delay(now()->addSecond(2));
         $this->onQueue('send_email');
         $this->params = $params;
     }

app/Services/ServerService.php

@@ -56,6 +56,7 @@ class ServerService
         if ($server->dnsSettings) {
             $dns = json_decode($server->dnsSettings);
             $json->dns = $dns;
+            $json->outbound->settings->domainStrategy = 'UseIP';
         }
     }