diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 2fea543..5a22c68 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -79,10 +79,10 @@ class UserController extends BaseController return $this->view()->assign("ssr_sub_token", $ssr_sub_token)->assign("router_token", $router_token) - ->assign("router_token_without_mu", $router_token_without_mu)->assign("acl_token", $acl_token) - ->assign('ann', $Ann)->assign('geetest_html', $GtSdk)->assign("ios_token", $ios_token) - ->assign('enable_duoshuo', Config::get('enable_duoshuo'))->assign('duoshuo_shortname', Config::get('duoshuo_shortname')) - ->assign("user", $this->user)->registerClass("URL", "App\Utils\URL")->assign('baseUrl', Config::get('baseUrl'))->display('user/index.tpl'); + ->assign("router_token_without_mu", $router_token_without_mu)->assign("acl_token", $acl_token) + ->assign('ann', $Ann)->assign('geetest_html', $GtSdk)->assign("ios_token", $ios_token) + ->assign('enable_duoshuo', Config::get('enable_duoshuo'))->assign('duoshuo_shortname', Config::get('duoshuo_shortname')) + ->assign("user", $this->user)->registerClass("URL", "App\Utils\URL")->assign('baseUrl', Config::get('baseUrl'))->display('user/index.tpl'); } @@ -147,6 +147,37 @@ class UserController extends BaseController + public function jsjapp($request, $response, $args) + { + $price = $request->getParam('price'); + $uid = $this->user->id; + $apiid = Config::get('jsj_id'); + $apikey = md5(Config::get('jsj_key')); + $showurl = Config::get('baseUrl').'/jsj_callback'; + if(base64_encode(Config::get('baseUrl'))==Config::get('baseUrl')){ + echo " +
+ + + + + +
+ "; + }else{ + echo " +
+ + + + + +
+ "; + } + } + + public function f2fpayget($request, $response, $args) { $time = $request->getQueryParams()["time"]; @@ -163,7 +194,7 @@ class UserController extends BaseController return $response->getBody()->write(json_encode($res)); } $user = $this->user; - + //生成二维码 $qrPayResult = Pay::alipay_get_qrcode($user, $amount, $qrPay); // 根据状态值进行业务处理 @@ -174,7 +205,7 @@ class UserController extends BaseController $res['msg'] = "二维码生成成功"; $res['amount'] = $amount; $res['qrcode'] = $qrPay->create_erweima_baidu($aliresponse->qr_code); - + break; case "FAILED": $res['ret'] = 0; @@ -184,15 +215,15 @@ class UserController extends BaseController case "UNKNOWN": $res['ret'] = 0; $res['msg'] = "系统异常,状态未知!!!!!! 请使用其他方式付款。"; - + break; default: $res['ret'] = 0; $res['msg'] = "创建订单二维码返回异常!!!!!! 请使用其他方式付款。"; - + break; } - + return $response->getBody()->write(json_encode($res)); } @@ -520,7 +551,7 @@ class UserController extends BaseController if ((($user->class>=$node->node_class&&($user->node_group==$node->node_group||$node->node_group==0))||$user->is_admin)&&($node->node_bandwidth_limit==0||$node->node_bandwidth<$node->node_bandwidth_limit)) { return $this->view()->assign('node', $node)->assign('user', $user)->assign('mu', $mu)->assign('relay_rule_id', $relay_rule_id)->registerClass("URL", "App\Utils\URL")->display('user/nodeinfo.tpl'); } - break; + break; case 1: if ($user->class>=$node->node_class&&($user->node_group==$node->node_group||$node->node_group==0)) { @@ -530,7 +561,7 @@ class UserController extends BaseController return $this->view()->assign('json_show', $json_show)->display('user/nodeinfovpn.tpl'); } - break; + break; case 2: if ($user->class>=$node->node_class&&($user->node_group==$node->node_group||$node->node_group==0)) { @@ -541,7 +572,7 @@ class UserController extends BaseController return $this->view()->assign('json_show', $json_show)->display('user/nodeinfossh.tpl'); } - break; + break; case 3: @@ -555,7 +586,7 @@ class UserController extends BaseController return $this->view()->assign('json_show', $json_show)->display('user/nodeinfopac.tpl'); } - break; + break; case 4: if ($user->class>=$node->node_class&&($user->node_group==$node->node_group||$node->node_group==0)) { @@ -566,7 +597,7 @@ class UserController extends BaseController return $this->view()->assign('json_show', $json_show)->display('user/nodeinfoapn.tpl'); } - break; + break; case 5: if ($user->class>=$node->node_class&&($user->node_group==$node->node_group||$node->node_group==0)) { @@ -579,7 +610,7 @@ class UserController extends BaseController } - break; + break; case 6: if ($user->class>=$node->node_class&&($user->node_group==$node->node_group||$node->node_group==0)) { @@ -597,7 +628,7 @@ class UserController extends BaseController } - break; + break; case 7: if ($user->class>=$node->node_class&&($user->node_group==$node->node_group||$node->node_group==0)) { @@ -611,7 +642,7 @@ class UserController extends BaseController } - break; + break; case 8: if ($user->class>=$node->node_class&&($user->node_group==$node->node_group||$node->node_group==0)) { @@ -625,7 +656,7 @@ class UserController extends BaseController } - break; + break; case 10: @@ -739,7 +770,7 @@ class UserController extends BaseController $config_service = new Config(); return $this->view()->assign('user', $this->user)->assign('themes', $themes)->assign('isBlock', $isBlock)->assign('Block', $Block)->assign('bind_token', $bind_token)->assign('telegram_bot', Config::get('telegram_bot'))->assign('config_service', $config_service) - ->registerClass("URL", "App\Utils\URL")->display('user/edit.tpl'); + ->registerClass("URL", "App\Utils\URL")->display('user/edit.tpl'); } @@ -1547,5 +1578,5 @@ class UserController extends BaseController $newResponse = $response->withStatus(302)->withHeader('Location', '/user'); return $newResponse; } - + } diff --git a/app/Utils/Pay.php b/app/Utils/Pay.php index 0dee1c7..4d7c3d0 100644 --- a/app/Utils/Pay.php +++ b/app/Utils/Pay.php @@ -16,40 +16,16 @@ class Pay switch ($driver) { case "pay91": return Pay::pay91($user); - case "paymentwall": - return Pay::pmw_html($user); - case 'spay': - return Pay::spay_html($user); - case 'zfbjk': - return Pay::zfbjk_html($user); case 'f2fpay': return Pay::f2fpay_html($user); + case 'jsjapp': + return Pay::jsjapp_html($user); default: return ""; } return null; } - - private static function spay_html($user) - { - return ' -
-

支付宝充值

-

充值金额:

- -
-'; - } - - private static function zfbjk_html($user) - { - return ' -

请扫码,给我转账来充值,记得备注上 '.$user->id.'。

- -'; - } - private static function f2fpay_html($user) { return ' @@ -65,11 +41,29 @@ class Pay

check 充值 '; + } + private static function jsjapp_html($user) + { + return ' +

点击对应支付方式进行充值

+ +
+ +
+ +
+'; } - private static function pay91($user) { //使用说明: @@ -100,76 +94,6 @@ class Pay '; } - private static function pmw_html($user) - { - \Paymentwall_Config::getInstance()->set(array( - 'api_type' => \Paymentwall_Config::API_VC, - 'public_key' => Config::get('pmw_publickey'), - 'private_key' => Config::get('pmw_privatekey') - )); - - $widget = new \Paymentwall_Widget( - $user->id, // id of the end-user who's making the payment - Config::get('pmw_widget'), // widget code, e.g. p1; can be picked inside of your merchant account - array(), // array of products - leave blank for Virtual Currency API - array( - 'email' => $user->email, - 'history'=> - array( - 'registration_date'=>strtotime($user->reg_date), - 'registration_ip'=>$user->reg_ip, - 'payments_number'=>Code::where('userid', '=', $user->id)->where('type', '=', -1)->count(), - 'membership'=>$user->class), - 'customer'=>array( - 'username'=>$user->user_name - ) - ) // additional parameters - ); - - return $widget->getHtmlCode(array("height"=>Config::get('pmw_height'),"width"=>"100%")); - } - - private static function spay_gen($user, $amount) - { - - /**************************请求参数**************************/ - - $alipay_config = Spay_tool::getConfig(); - - $pl = new Paylist(); - $pl->userid = $user->id; - $pl->total = $amount; - $pl->save(); - - //商户订单号,商户网站订单系统中唯一订单号,必填 - $out_trade_no = $pl->id; - - //订单名称,必填 - $subject = $pl->id."UID".$user->id." 充值".$amount."元"; - - //付款金额,必填 - $total_fee = (float)$amount; - - //商品描述,可空 - $body = $user->id; - /************************************************************/ - - //构造要请求的参数数组,无需改动 - $parameter = array( - "service" => "create_direct_pay_by_user", - "partner" => trim($alipay_config['partner']), - "notify_url" => $alipay_config['notify_url'], - "return_url" => $alipay_config['return_url'], - "out_trade_no" => $out_trade_no, - "total_fee" => $total_fee - ); - - //建立请求 - $alipaySubmit = new Spay_submit($alipay_config); - $html_text = $alipaySubmit->buildRequestForm($parameter, "get", "确认"); - echo $html_text; - exit(0); - } private static function get_alipay_config() { @@ -343,12 +267,6 @@ class Pay { $driver = Config::get("payment_system"); switch ($driver) { - case "paymentwall": - return Pay::pmw_html(); - case 'spay': - return Pay::spay_gen($user, $amount); - case 'zfbjk': - return Pay::alipay_html(); case 'f2fpay': return Pay::f2fpay_gen($user, $amount); default: @@ -357,306 +275,8 @@ class Pay return null; } - private static function spay_callback() - { - if (Config::get('enable_alipay')!='false') { - //计算得出通知验证结果 - $alipayNotify = new Spay_notify(Spay_tool::getConfig()); - $verify_result = $alipayNotify->verifyNotify(); - - if ($verify_result) {//验证成功 - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - //请在这里加上商户的业务逻辑程序代 - - - //——请根据您的业务逻辑来编写程序(以下代码仅作参考)—— - - //获取支付宝的通知返回参数,可参考技术文档中服务器异步通知参数列表 - - //商户订单号 - - $out_trade_no = $_POST['out_trade_no']; - - //支付宝交易号 - - $trade_no = $_POST['trade_no']; - - //交易状态 - $trade_status = $_POST['trade_status']; - - $trade = Paylist::where("id", '=', $out_trade_no)->where('status', 0)->where('total', $_POST['total_fee'])->first(); - - if ($trade == null) { - exit("success"); - } - - $trade->tradeno = $trade_no; - $trade->status = 1; - $trade->save(); - - //status - $trade_status = $_POST['trade_status']; - - - if ($_POST['trade_status'] == 'TRADE_FINISHED') { - //判断该笔订单是否在商户网站中已经做过处理 - //如果没有做过处理,根据订单号(out_trade_no)在商户网站的订单系统中查到该笔订单的详细,并执行商户的业务程序 - //请务必判断请求时的total_fee、seller_id与通知时获取的total_fee、seller_id为一致的 - //如果有做过处理,不执行商户的业务程序 - - //注意: - //退款日期超过可退款期限后(如三个月可退款),支付宝系统发送该交易状态通知 - - //调试用,写文本函数记录程序运行情况是否正常 - //logResult("这里写入想要调试的代码变量值,或其他运行的结果记录"); - - - - $user=User::find($trade->userid); - $user->money=$user->money+$_POST['total_fee']; - $user->save(); - - $codeq=new Code(); - $codeq->code="支付宝 充值"; - $codeq->isused=1; - $codeq->type=-1; - $codeq->number=$_POST['total_fee']; - $codeq->usedatetime=date("Y-m-d H:i:s"); - $codeq->userid=$user->id; - $codeq->save(); - - - - - if ($user->ref_by!=""&&$user->ref_by!=0&&$user->ref_by!=null) { - $gift_user=User::where("id", "=", $user->ref_by)->first(); - $gift_user->money=($gift_user->money+($codeq->number*(Config::get('code_payback')/100))); - $gift_user->save(); - - $Payback=new Payback(); - $Payback->total=$_POST['total_fee']; - $Payback->userid=$user->id; - $Payback->ref_by=$user->ref_by; - $Payback->ref_get=$codeq->number*(Config::get('code_payback')/100); - $Payback->datetime=time(); - $Payback->save(); - } - } elseif ($_POST['trade_status'] == 'TRADE_SUCCESS') { - //判断该笔订单是否在商户网站中已经做过处理 - //如果没有做过处理,根据订单号(out_trade_no)在商户网站的订单系统中查到该笔订单的详细,并执行商户的业务程序 - //请务必判断请求时的total_fee、seller_id与通知时获取的total_fee、seller_id为一致的 - //如果有做过处理,不执行商户的业务程序 - - //注意: - //付款完成后,支付宝系统发送该交易状态通知 - - //调试用,写文本函数记录程序运行情况是否正常 - //logResult("这里写入想要调试的代码变量值,或其他运行的结果记录"); - - $user=User::find($trade->userid); - $user->money=$user->money+$_POST['total_fee']; - $user->save(); - - $codeq=new Code(); - $codeq->code="支付宝 充值"; - $codeq->isused=1; - $codeq->type=-1; - $codeq->number=$_POST['total_fee']; - $codeq->usedatetime=date("Y-m-d H:i:s"); - $codeq->userid=$user->id; - $codeq->save(); - - - - - if ($user->ref_by!=""&&$user->ref_by!=0&&$user->ref_by!=null) { - $gift_user=User::where("id", "=", $user->ref_by)->first(); - $gift_user->money=($gift_user->money+($codeq->number*(Config::get('code_payback')/100))); - $gift_user->save(); - - $Payback=new Payback(); - $Payback->total=$_POST['total_fee']; - $Payback->userid=$user->id; - $Payback->ref_by=$user->ref_by; - $Payback->ref_get=$codeq->number*(Config::get('code_payback')/100); - $Payback->datetime=time(); - $Payback->save(); - } - } - - //——请根据您的业务逻辑来编写程序(以上代码仅作参考)—— - - echo "success"; //请不要修改或删除 - - if (Config::get('enable_donate') == 'true') { - if ($user->is_hide == 1) { - Telegram::Send("姐姐姐姐,一位不愿透露姓名的大老爷给我们捐了 ".$codeq->number." 元呢~"); - } else { - Telegram::Send("姐姐姐姐,".$user->user_name." 大老爷给我们捐了 ".$codeq->number." 元呢~"); - } - } - - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - } else { - //验证失败 - echo "fail"; - - //调试用,写文本函数记录程序运行情况是否正常 - //logResult("这里写入想要调试的代码变量值,或其他运行的结果记录"); - } - } - } - - private static function pmw_callback() - { - if (Config::get('pmw_publickey')!="") { - \Paymentwall_Config::getInstance()->set(array( - 'api_type' => \Paymentwall_Config::API_VC, - 'public_key' => Config::get('pmw_publickey'), - 'private_key' => Config::get('pmw_privatekey') - )); - - - - $pingback = new \Paymentwall_Pingback($_GET, $_SERVER['REMOTE_ADDR']); - if ($pingback->validate()) { - $virtualCurrency = $pingback->getVirtualCurrencyAmount(); - if ($pingback->isDeliverable()) { - // deliver the virtual currency - } elseif ($pingback->isCancelable()) { - // withdraw the virual currency - } - - $user=User::find($pingback->getUserId()); - $user->money=$user->money+$pingback->getVirtualCurrencyAmount(); - $user->save(); - - $codeq=new Code(); - $codeq->code="Payment Wall 充值"; - $codeq->isused=1; - $codeq->type=-1; - $codeq->number=$pingback->getVirtualCurrencyAmount(); - $codeq->usedatetime=date("Y-m-d H:i:s"); - $codeq->userid=$user->id; - $codeq->save(); - - - - - if ($user->ref_by!=""&&$user->ref_by!=0&&$user->ref_by!=null) { - $gift_user=User::where("id", "=", $user->ref_by)->first(); - $gift_user->money=($gift_user->money+($codeq->number*(Config::get('code_payback')/100))); - $gift_user->save(); - - $Payback=new Payback(); - $Payback->total=$pingback->getVirtualCurrencyAmount(); - $Payback->userid=$user->id; - $Payback->ref_by=$user->ref_by; - $Payback->ref_get=$codeq->number*(Config::get('code_payback')/100); - $Payback->datetime=time(); - $Payback->save(); - } - - - - echo 'OK'; // Paymentwall expects response to be OK, otherwise the pingback will be resent - - - if (Config::get('enable_donate') == 'true') { - if ($user->is_hide == 1) { - Telegram::Send("姐姐姐姐,一位不愿透露姓名的大老爷给我们捐了 ".$codeq->number." 元呢~"); - } else { - Telegram::Send("姐姐姐姐,".$user->user_name." 大老爷给我们捐了 ".$codeq->number." 元呢~"); - } - } - } else { - echo $pingback->getErrorSummary(); - } - } else { - echo 'error'; - } - } - - private static function zfbjk_callback($request) - { - //您在www.zfbjk.com的商户ID - $alidirect_pid = Config::get("zfbjk_pid"); - //您在www.zfbjk.com的商户密钥 - $alidirect_key = Config::get("zfbjk_key"); - - - $tradeNo = $request->getParam('tradeNo'); - $Money = $request->getParam('Money'); - $title = $request->getParam('title'); - $memo = $request->getParam('memo'); - $alipay_account = $request->getParam('alipay_account'); - $Gateway = $request->getParam('Gateway'); - $Sign = $request->getParam('Sign'); - if (!is_numeric($title)) { - exit("fail"); - } - if (strtoupper(md5($alidirect_pid . $alidirect_key . $tradeNo . $Money . $title . $memo)) == strtoupper($Sign)) { - $trade = Paylist::where("tradeno", '=', $tradeNo)->first(); - - if ($trade != null) { - exit("success"); - } else { - $user=User::where('id', '=', $title)->first(); - if ($user == null) { - exit("IncorrectOrder"); - } - $pl = new Paylist(); - $pl->userid=$title; - $pl->tradeno=$tradeNo; - $pl->total=$Money; - $pl->datetime=time(); - $pl->status=1; - $pl->save(); - $user->money=$user->money+$Money; - $user->save(); - - $codeq=new Code(); - $codeq->code="支付宝充值"; - $codeq->isused=1; - $codeq->type=-1; - $codeq->number=$Money; - $codeq->usedatetime=date("Y-m-d H:i:s"); - $codeq->userid=$user->id; - $codeq->save(); - - - - - if ($user->ref_by!=""&&$user->ref_by!=0&&$user->ref_by!=null) { - $gift_user=User::where("id", "=", $user->ref_by)->first(); - $gift_user->money=($gift_user->money+($codeq->number*(Config::get('code_payback')/100))); - $gift_user->save(); - - $Payback=new Payback(); - $Payback->total=$Money; - $Payback->userid=$user->id; - $Payback->ref_by=$user->ref_by; - $Payback->ref_get=$codeq->number*(Config::get('code_payback')/100); - $Payback->datetime=time(); - $Payback->save(); - } - - if (Config::get('enable_donate') == 'true') { - if ($user->is_hide == 1) { - Telegram::Send("姐姐姐姐,一位不愿透露姓名的大老爷给我们捐了 ".$codeq->number." 元呢~"); - } else { - Telegram::Send("姐姐姐姐,".$user->user_name." 大老爷给我们捐了 ".$codeq->number." 元呢~"); - } - } - exit("Success"); - } - } else { - exit('Fail'); - } - } - private static function f2fpay_callback() { $aop = new \AopClient(); @@ -847,6 +467,49 @@ class Pay } + + private static function jsjapp_callback(){ + //以下五行无需更改 + $addnum = $_POST['addnum']; //接收到的订单编号 + $uid = $_POST['uid']; //接收到的支付会员编号 + $total = $_POST['total']; //接收到的支付金额 + $apikey = $_POST['apikey']; //接收到的验证加密字串 ★★★收银台的新组合方式: md5(你的apikey.订单编号.uid.价格) + + $codeq=Code::where("code", "=", $addnum)->first(); + if($codeq==null&&$apikey==md5(Config::get("jsj_key").$addnum.$uid.$total)){ + //更新用户账户 + $user=User::find($uid); + $codeq=new Code(); + $codeq->code=$addnum; + $codeq->isused=1; + $codeq->type=-1; + $codeq->number=$total; + $codeq->usedatetime=date("Y-m-d H:i:s"); + $codeq->userid=$user->id; + $codeq->save(); + $user->money=$user->money+$total; + $user->save(); + + //更新返利 + if ($user->ref_by!=""&&$user->ref_by!=0&&$user->ref_by!=null) { + $gift_user=User::where("id", "=", $user->ref_by)->first(); + $gift_user->money=($gift_user->money+($codeq->number*(Config::get('code_payback')/100))); + $gift_user->save(); + + $Payback=new Payback(); + $Payback->total=$total; + $Payback->userid=$user->id; + $Payback->ref_by=$user->ref_by; + $Payback->ref_get=$codeq->number*(Config::get('code_payback')/100); + $Payback->datetime=time(); + $Payback->save(); + } + echo "success"; //说明数据已经处理完毕 + return; + } + } + + private static function notify(){ //系统订单号 $trade_no = $_POST['pay_no']; @@ -894,20 +557,18 @@ class Pay exit('success'); //返回成功 不要删除哦 } + + public static function callback($request) { $driver = Config::get("payment_system"); switch ($driver) { - case "paymentwall": - return Pay::pmw_callback(); - case 'spay': - return Pay::spay_callback(); - case 'zfbjk': - return Pay::zfbjk_callback($request); case 'f2fpay': return Pay::f2fpay_callback(); case 'pay91': return Pay::pay91_callback(); + case 'jsjapp': + return Pay::jsjapp_callback(); default: return ""; } @@ -917,8 +578,4 @@ class Pay { return Pay::notify(); } - - - - } diff --git a/config/.config.php.example b/config/.config.php.example index 3571c3c..992b453 100644 --- a/config/.config.php.example +++ b/config/.config.php.example @@ -330,5 +330,10 @@ $System_Config['alipay_public_key']=''; $System_Config['merchant_private_key']=''; $System_Config['f2fpay_activate_key']=''; #请联系 https://t.me/gh012363 +#jsjapp ---> https://api.jsjapp.com/plugin.php?id=add:user&apiid=13761 +$System_Config['jsj_id']=''; +$System_Config['jsj_key']=''; +$System_Config['jsj_activate_key']=''; + #不安全中转模式,这个开启之后使用除了 auth_aes128_md5 或者 auth_aes128_sha1 以外的协议地用户也可以设置和使用中转,但是,强烈推荐不开启。 $System_Config['relay_insecure_mode']='false'; diff --git a/config/routes.php b/config/routes.php index 80ad432..6f0c70d 100644 --- a/config/routes.php +++ b/config/routes.php @@ -82,6 +82,8 @@ $app->get('/tos', 'App\Controllers\HomeController:tos'); $app->get('/staff', 'App\Controllers\HomeController:staff'); $app->get('/gfwlistjs', 'App\Controllers\LinkController:GetGfwlistJs'); $app->post('/telegram_callback', 'App\Controllers\HomeController:telegram'); +$app->get('/jsj_callback', 'App\Controllers\HomeController:jsj_callback'); +$app->post('/jsj_callback', 'App\Controllers\HomeController:pay_callback'); // User Center @@ -139,6 +141,7 @@ $app->group('/user', function () { $this->get('/logout', 'App\Controllers\UserController:logout'); $this->get('/code', 'App\Controllers\UserController:code'); $this->get('/alipay', 'App\Controllers\UserController:alipay'); + $this->get('/code/jsjapp', 'App\Controllers\UserController:jsjapp'); $this->get('/code/pay91', 'App\Controllers\pay91'); $this->post('/code/f2fpay', 'App\Controllers\UserController:f2fpay'); $this->get('/code/f2fpay', 'App\Controllers\UserController:f2fpayget');