diff --git a/app/Controllers/Admin/RelayController.php b/app/Controllers/Admin/RelayController.php index fca33a03..4d685ffe 100644 --- a/app/Controllers/Admin/RelayController.php +++ b/app/Controllers/Admin/RelayController.php @@ -38,7 +38,7 @@ class RelayController extends AdminController )->orderBy('name')->get(); foreach ($source_nodes as $node) { if ($node->sort == 12) { - $node->name .= ' 正在使用V2ray后端 '; + $node->name .= 'V2ray中转,Port代表中转监听端口'; } } $dist_nodes = Node::where( @@ -53,9 +53,9 @@ class RelayController extends AdminController foreach ($dist_nodes as $node) { if ($node->sort == 11 || $node->sort == 12) { $node_explode = Tools::v2Array($node->server); - $node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $node_explode['port']; + $node->name = $node->name; } else { - $node->name .= ' 如果是V2ray后端 请不要设置,用户页面设置 '; + $node->name .= ' 如果是V2ray中转,无法食用'; } } @@ -79,9 +79,9 @@ class RelayController extends AdminController if ($source_node->sort == 12) { $rules = Relay::Where('source_node_id', $source_node_id)->get(); - if (count($rules) > 0) { + if (!Tools::relayRulePortCheck($rules)) { $rs['ret'] = 0; - $rs['msg'] = 'v2ray中转一个起点一个rule'; + $rs['msg'] = '端口冲突请,请更换一个'; return $response->getBody()->write(json_encode($rs)); } } @@ -164,9 +164,9 @@ class RelayController extends AdminController foreach ($dist_nodes as $node) { if ($node->sort == 11 || $node->sort == 12) { $node_explode = Tools::v2Array($node->server); - $node->name = $node->name . ' 如果是V2ray后端 请设置成' . $node_explode['port']; + $node->name = $node->name . 'V2ray中转,Port代表中转监听端口'; } else { - $node->name .= ' 如果是V2ray后端 请不要设置,用户页面设置 '; + $node->name .= ' 如果是V2ray中转,无法食用'; } } diff --git a/app/Controllers/LinkController.php b/app/Controllers/LinkController.php index 1157ef43..2522a18c 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -318,7 +318,7 @@ class LinkController extends BaseController // v2 $v2_items = URL::getAllVMessUrl($user, 1, $emoji); foreach ($v2_items as $item) { - if (!in_array($item['net'], ['ws', 'tcp'])) { + if (!in_array($item['net'], ['ws', 'tcp','kcp','quic','h2'])) { continue; } $item['remark'] = $item['ps']; @@ -353,7 +353,7 @@ class LinkController extends BaseController // v2 $v2_items = URL::getAllVMessUrl($user, 1, $emoji); foreach ($v2_items as $item) { - if (!in_array($item['net'], ['ws', 'tcp'])) { + if (!in_array($item['net'], ['ws', 'tcp','kcp','quic','h2'])) { continue; } $tls = ($item['tls'] == 'tls' @@ -434,7 +434,7 @@ class LinkController extends BaseController $v2ray_name = ''; $v2rays = URL::getAllVMessUrl($user, 1, $emoji); foreach ($v2rays as $v2ray) { - if ($v2ray['net'] == 'kcp' || $v2ray['net'] == 'quic') { + if (in_array($v2ray['net'], array( 'kcp', 'quic','h2'))){ continue; } if (strpos($v2ray['ps'], '回国') or strpos($v2ray['ps'], 'China')) { @@ -633,7 +633,7 @@ class LinkController extends BaseController // v2 $items = URL::getAllVMessUrl($user, 1, $emoji); foreach ($items as $item) { - if (in_array($item['net'], array('kcp', 'http', 'quic'))) { + if (in_array($item['net'], array('kcp', 'http', 'quic','h2'))) { continue; } $v2rays = [ @@ -803,6 +803,9 @@ class LinkController extends BaseController // v2ray $items = URL::getAllVMessUrl($user, 1); foreach ($items as $item) { + if (in_array($item['net'], array( 'http', 'quic'))) { + continue; + } if ($find) { $item['remark'] = $item['ps']; $item = ConfController::getMatchProxy($item, $Rule); @@ -830,11 +833,23 @@ class LinkController extends BaseController $obfs .='obfsParam={"header":'.'"'.($item['type'] == ''||$item['type'] == 'noop' ? 'none' : $item['type']).'"'.'}&obfs=mkcp'; - }else { + } + elseif ($item['net'] == 'h2'){ + $obfs .= ($item['host'] != '' + ? ('&obfsParam=' . $item['host'] . + '&path=' . $item['path'] . '&obfs=h2') + : ('&obfsParam=' . $item['add'] . + '&path=' . $item['path'] . '&obfs=h2')); + $obfs .= ($item['tls'] == 'tls' + ? '&tls=1' + : '&tls=0'); + } + + else { $obfs .= '&obfs=none'; } - if ($obfs!='&obfs=none'){ + if ($obfs!='&obfs=none' && $item['net'] != 'h2'){ if ($item['verify_cert']==false){ $obfs.="&allowInsecure=1"; @@ -951,11 +966,18 @@ class LinkController extends BaseController $protocol .= ('&wspath=' . $item['path'] . '&wsHost=' . $item['host']); break; + case "h2": + $protocol .= ('&h2Path=' . $item['path'] . + '&h2Host=' . $item['host']); + break; } $tls = ($item['tls'] == 'tls' || $item['net'] == 'tls' ? '&tls=1' : '&tls=0'); - $mux = '&mux=1&muxConcurrency=8'; + if ($item['verify_cert']==false && ($item['tls'] == 'tls' || $item['net'] == 'tls')) { + $tls .='&allowInsecure=1'; + } + $mux = '&mux=&muxConcurrency=8'; $return .= ('vmess://' . base64_encode( 'auto:' . $item['id'] . '@' . $item['add'] . ':' . $item['port'] diff --git a/app/Controllers/RelayController.php b/app/Controllers/RelayController.php index 4172adf7..b7d4439b 100644 --- a/app/Controllers/RelayController.php +++ b/app/Controllers/RelayController.php @@ -126,15 +126,10 @@ class RelayController extends UserController } )->where('type', 1)->where( static function ($query) { - $query->Where('sort', 10) - ->orWhere('sort', 12); + $query->Where('sort', 10); } )->where('node_class', '<=', $user->class)->orderBy('name')->get(); - foreach ($source_nodes as $node) { - if ($node->sort == 12) { - $node->name .= ' 正在使用V2ray后端 '; - } - } + $dist_nodes = Node::where( static function ($query) use ($user) { $query->Where('node_group', '=', $user->node_group) @@ -143,9 +138,7 @@ class RelayController extends UserController )->where('type', 1)->where( static function ($query) { $query->Where('sort', 0) - ->orWhere('sort', 10) - ->orWhere('sort', 11) - ->orWhere('sort', 12); + ->orWhere('sort', 10); } )->where('node_class', '<=', $user->class)->orderBy('name')->get(); @@ -164,16 +157,6 @@ class RelayController extends UserController } } - foreach ($dist_nodes as $node) { - if ($node->sort == 11 || $node->sort == 12) { - $node_explode = Tools::v2Array($node->server); - $ports[] = $node_explode['port']; - $node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $node_explode['port']; - } else { - $node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $user->port; - } - } - $ports[] = $user->port; $ports = array_unique($ports); return $this->view()->assign('source_nodes', $source_nodes)->assign('dist_nodes', $dist_nodes)->assign('ports', $ports)->display('user/relay/add.tpl'); @@ -195,8 +178,7 @@ class RelayController extends UserController } )->where('type', 1)->where( static function ($query) { - $query->Where('sort', 10) - ->orWhere('sort', 12); + $query->Where('sort', 10); } )->where('node_class', '<=', $user->class)->first(); if ($source_node == null) { @@ -223,8 +205,7 @@ class RelayController extends UserController static function ($query) { $query->Where('sort', 0) ->orWhere('sort', 10) - ->orWhere('sort', 11) - ->orWhere('sort', 12); + ->orWhere('sort', 11); } )->where('node_class', '<=', $user->class)->first(); @@ -247,12 +228,7 @@ class RelayController extends UserController ->orWhere('node_group', '=', 0); } )->where('type', 1)->where('sort', 9)->where('node_class', '<=', $user->class)->first(); - $v2ray_port_raw = ''; - if ($dist_node->sort == 12 || $dist_node->sort == 11) { - $node_explode = Tools::v2Array($dist_node->server); - $v2ray_port_raw = $node_explode['port']; - } - if (($port_raw == null && $port != $user->port && $v2ray_port_raw == '') || ($v2ray_port_raw != '' && ($port != $user->port && $port != $v2ray_port_raw))) { + if (($port_raw == null && $port != $user->port)) { $rs['ret'] = 0; $rs['msg'] = '端口错误'; return $response->getBody()->write(json_encode($rs)); @@ -316,15 +292,10 @@ class RelayController extends UserController } )->where('type', 1)->where( static function ($query) { - $query->Where('sort', 10) - ->orWhere('sort', 12); + $query->Where('sort', 10); } )->where('node_class', '<=', $user->class)->orderBy('name')->get(); - foreach ($source_nodes as $node) { - if ($node->sort == 12) { - $node->name .= ' 正在使用V2ray后端 '; - } - } + $dist_nodes = Node::where( static function ($query) use ($user) { $query->Where('node_group', '=', $user->node_group) @@ -334,8 +305,7 @@ class RelayController extends UserController static function ($query) { $query->Where('sort', 0) ->orWhere('sort', 10) - ->orWhere('sort', 11) - ->orWhere('sort', 12); + ->orWhere('sort', 11); } )->where('node_class', '<=', $user->class)->orderBy('name')->get(); @@ -353,15 +323,7 @@ class RelayController extends UserController $ports[] = $port_raw->server; } } - foreach ($dist_nodes as $node) { - if ($node->sort == 11 || $node->sort == 12) { - $node_explode = Tools::v2Array($node->server); - $ports[] = $node_explode['port']; - $node->name = $node->name . ' 如果是V2ray后端 请设置成: ' . $node_explode['port']; - } else { - $node->name = $node->name . ' 如果是V2ray后端 请设置成 ' . $user->port; - } - } + $ports[] = $user->port; $ports = array_unique($ports); @@ -390,8 +352,7 @@ class RelayController extends UserController } )->where('type', 1)->where( static function ($query) { - $query->Where('sort', 10) - ->orWhere('sort', 12); + $query->Where('sort', 10); } )->where('node_class', '<=', $user->class)->first(); if ($source_node == null) { @@ -409,8 +370,7 @@ class RelayController extends UserController static function ($query) { $query->Where('sort', 0) ->orWhere('sort', 10) - ->orWhere('sort', 11) - ->orWhere('sort', 12); + ->orWhere('sort', 11); } )->where('node_class', '<=', $user->class)->first(); @@ -433,12 +393,7 @@ class RelayController extends UserController ->orWhere('node_group', '=', 0); } )->where('type', 1)->where('sort', 9)->where('node_class', '<=', $user->class)->first(); - $v2ray_port_raw = ''; - if ($dist_node->sort == 12 || $dist_node->sort == 11) { - $node_explode = Tools::v2Array($dist_node->server); - $v2ray_port_raw = $node_explode['port']; - } - if (($port_raw == null && $port != $user->port && $v2ray_port_raw == '') || ($v2ray_port_raw != '' && ($port != $user->port && $port != $v2ray_port_raw))) { + if (($port_raw == null && $port != $user->port)) { $rs['ret'] = 0; $rs['msg'] = '端口错误'; return $response->getBody()->write(json_encode($rs)); diff --git a/app/Services/Gateway/TomatoPay.php b/app/Services/Gateway/TomatoPay.php new file mode 100644 index 00000000..ce9130f1 --- /dev/null +++ b/app/Services/Gateway/TomatoPay.php @@ -0,0 +1,151 @@ +getParsedBodyParam('type'); + $price = $request->getParsedBodyParam('price'); + if ($price <= 0) { + return $response->write(json_encode(['errcode' => -1, 'errmsg' => "非法的金额."])); + } + $user = Auth::getUser(); + $settings = $_ENV['tomatopay'][$type]; + $pl = new Paylist(); + $pl->userid = $user->id; + $pl->total = $price; + $pl->tradeno = self::generateGuid(); + $pl->save(); + $fqaccount = $settings['account']; + $fqkey = $settings['token']; + $fqmchid = $settings['mchid']; + $fqtrade = $pl->tradeno; + $fqcny = $price; + + $signs = md5( + 'mchid=' . $fqmchid . '&account=' . $fqaccount . '&cny=' . $fqcny . '&type=1&trade=' . $fqtrade . $fqkey + ); + $url = 'https://b.fanqieui.com/gateways/' . $type . '.php?account=' + . $fqaccount . '&mchid=' . $fqmchid . '&type=1' + . '&trade=' . $fqtrade . '&cny=' . $fqcny . '&signs=' . $signs; + $result = ""; + return $response->write(json_encode(['code' => $result, 'errcode' => 0, 'pid' => $pl->id])); + } + + public function notify($request, $response, $args) + { + $type = $args['type']; + $settings = $_ENV['tomatopay'][$type]; + $order_data = $request->getParsedBody(); + $signs = $order_data['sign']; + unset($order_data['sign']); + $security = $order_data; + $o = ''; + foreach ($security as $k => $v) { + $o .= "$k=" . urlencode($v) . "&"; + } + $sign = md5(substr($o, 0, -1) . $settings['token']); + if ($sign == $signs) { + $this->postPayment($order_data['out_trade_no'], "在线支付"); + return $response->write('success'); + } else { + return $response->write('failed'); + } + } + public function getPurchaseHTML() + { + return ' +
充值
+