Merge branch 'dev' into head2_dev

head2_dev
Rico 7 years ago
commit ae73bea531

@ -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中转,无法食用';
}
}

@ -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']

@ -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));

@ -0,0 +1,151 @@
<?php
namespace App\Services\Gateway;
use App\Services\Auth;
use App\Models\Paylist;
class TomatoPay extends AbstractPayment
{
public function purchase($request, $response, $args)
{
$type = $request->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 = "<script language='javascript' type='text/javascript'>window.location.href='" . $url . "';</script>";
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 '
<div class="card-inner">
<p class="card-heading">充值</p>
<h5>支付方式:</h5>
<h5 style="color:red">推荐使用支付宝支付,更快到账!</h5>
<br/>
<nav class="tab-nav margin-top-no">
<ul class="nav nav-list">
<li>
<a class="waves-attach waves-effect type active" data-toggle="tab" data-pay="alipay"><img src="/images/alipay.jpg" height="50px"></img></a>
</li>
<li>
<a class="waves-attach waves-effect type" data-toggle="tab" data-pay="wxpay"><img src="/images/weixin.jpg" height="50px"></img></a>
</li>
</ul>
<div class="tab-nav-indicator"></div>
</nav>
<div class="form-group form-group-label">
<label class="floating-label" for="amount">金额</label>
<input class="form-control" id="amount" type="text">
</div>
</div>
<div class="card-action">
<div class="card-action-btn pull-left">
<button class="btn btn-flat waves-attach" id="tomato_pay" ><span class="icon">check</span>&nbsp;充值</NOtton>
</div>
</div>
<script>
var type = "wxpay";
var type = "alipay";
var pid = 0;
$(".type").click(function(){
type = $(this).data("pay");
});
$("#tomato_pay").click(function(){
var price = parseFloat($("#amount").val());
console.log("将要使用"+type+"方法充值"+price+"元")
if(isNaN(price)){
$("#result").modal();
$("#msg").html("非法的金额!");
}
$.ajax({
\'url\':"/user/payment/purchase",
\'data\':{
\'price\':price,
\'type\':type,
},
\'dataType\':\'json\',
\'type\':"POST",
success:function(data){
console.log(data);
if(data.errcode==-1){
$("#result").modal();
$("#msg").html(data.errmsg);
}
if(data.errcode==0){
pid = data.pid;
if(type=="wxpay"){
$("#result").modal();
$("#msg").html("正在跳转到微信..."+data.code);
}else if(type=="alipay"){
$("#result").modal();
$("#msg").html("正在跳转到支付宝..."+data.code);
}
}
}
});
setTimeout(f, 1000);
});
</script>
';
}
public function getReturnHTML($request, $response, $args)
{
// TODO: Implement getReturnHTML() method.
}
public function getStatus($request, $response, $args)
{
$return = [];
$p = Paylist::where('tradeno', $_POST['pid'])->first();
$return['ret'] = 1;
$return['result'] = $p->status;
return json_encode($return);
}
}

@ -9,7 +9,7 @@
namespace App\Services;
use App\Services\Gateway\{
AopF2F, Codepay, DoiAMPay, PaymentWall, ChenPay, SPay, TrimePay, PAYJS, BitPayX
AopF2F, Codepay, DoiAMPay, PaymentWall, ChenPay, SPay, TrimePay, PAYJS, BitPayX,TomatoPay
};
class Payment
@ -36,6 +36,8 @@ class Payment
return new BitPayX(Config::get('bitpay_secret'));
case ('payjs'):
return new PAYJS(Config::get('payjs_key'));
case ("tomatopay"):
return new TomatoPay();
default:
return null;
}

@ -386,6 +386,13 @@ class Tools
}
return $object;
}
public static function relayRulePortCheck($rules){
$res = array();
foreach($rules as $value) {
$res[$value->port][] = $value->port;
}
return count($res)==count($rules);
}
public static function getRelayNodeIp($source_node, $dist_node)
{

@ -240,6 +240,21 @@ $_ENV['bitpay_secret']='';
$_ENV['payjs_mchid']='';
$_ENV['payjs_key']='';
#tomatopay番茄云支付
#使用教程:https://swapidc.fanqieui.com/?t/329.html tg群 https://t.me/fanqiepay
$_ENV['tomatopay'] = [
'wxpay'=>[
'mchid' => '', // 商户号
'account' => '', //您在番茄云支付的登录邮箱
'token' => "" // 安全验证码
],
'alipay'=>[
'mchid' => '', // 商户号
'account' => '', //您在番茄云支付的登录邮箱
'token' => "" // 安全验证码
],
];
$_ENV['idtpay']=[
'partner'=>"", //商户号

Loading…
Cancel
Save