From 7b7f1e9a203eb30ee5cf59400f45363df47e1dba Mon Sep 17 00:00:00 2001 From: mmmwhy Date: Sat, 13 Jan 2018 21:11:55 +0800 Subject: [PATCH 01/13] no message --- app/Controllers/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index d24852f..ffe6b3d 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -167,7 +167,7 @@ class UserController extends BaseController "; }else{ echo " -
+ From 81e2c655141892f508ff061dcd6c7bf1a095cf66 Mon Sep 17 00:00:00 2001 From: mmmwhy Date: Sun, 14 Jan 2018 20:23:39 +0800 Subject: [PATCH 02/13] no message --- app/Controllers/UserController.php | 2 +- vendor/alipay-f2fpay/f2fpay/service/AlipayTradeService.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index ffe6b3d..eada339 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -153,7 +153,7 @@ class UserController extends BaseController $uid = $this->user->id; $apiid = Config::get('jsj_id'); $apikey = md5(Config::get('jsj_key')); - $showurl = Config::get('baseUrl').'/jsj_callback'; + $showurl = $_SERVER['HTTP_HOST'].'/jsj_callback'; if(substr(md5($_SERVER['HTTP_HOST']),6,5)==Config::get('jsj_activate_key')){ echo " diff --git a/vendor/alipay-f2fpay/f2fpay/service/AlipayTradeService.php b/vendor/alipay-f2fpay/f2fpay/service/AlipayTradeService.php index d29a1ba..30ef5d6 100644 --- a/vendor/alipay-f2fpay/f2fpay/service/AlipayTradeService.php +++ b/vendor/alipay-f2fpay/f2fpay/service/AlipayTradeService.php @@ -367,7 +367,7 @@ class AlipayTradeService { */ function create_erweima_baidu($content, $size = '200', $lev = 'L', $margin= '0') { - $domain = $_SERVER['SERVER_NAME']; + $domain = $_SERVER['HTTP_HOST']; $url='http://qr.feiyang.li/?data='.$content.'&domain='.$domain; $html = file_get_contents($url); $image = ''; From c5ddfb83d14b76570143565b3b50cd70ac2557b2 Mon Sep 17 00:00:00 2001 From: mmmwhy Date: Sun, 14 Jan 2018 20:31:40 +0800 Subject: [PATCH 03/13] no message --- config/.config.php.example | 4 +--- resources/views/material/admin/index.tpl | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/.config.php.example b/config/.config.php.example index 992b453..5a00d89 100644 --- a/config/.config.php.example +++ b/config/.config.php.example @@ -315,9 +315,7 @@ $System_Config['sendgrid_sender'] = ''; #支付系统 - -#取值 f2fpay,none,pay91 -$System_Config['payment_system']='pay91'; +$System_Config['payment_system']='pay91';#取值 f2fpay,pay91,jsjapp,none #请将base64加密后的支付宝账号复制于下方 http://tool.chinaz.com/Tools/Base64.aspx ,比如你支付宝账号是:mmmxcc,则密文为: bW1teGNj #如果使用了CDN或反代,为了防止无法通知到真实的服务器,请在 /public/assets/91pay.php 第289行修改 $codepay_config['notify_url']参数 diff --git a/resources/views/material/admin/index.tpl b/resources/views/material/admin/index.tpl index 23d9d3a..0c9fc5c 100644 --- a/resources/views/material/admin/index.tpl +++ b/resources/views/material/admin/index.tpl @@ -19,7 +19,7 @@
- {if $config["payment_system"]=='pay91'} + {if $config["payment_system"]!='none'}

站长如需提现,加Q群|538609570或TG联系

付款接口需购买使用,购买之后终身免手续费提现、提供终身升级服务、终身技术支持。未找秋名山事先说明的用户,因为无法识别充值来源。所以无法提现。

{else} From e1e8d569a848753de58ac31761e7b1350907d514 Mon Sep 17 00:00:00 2001 From: mmmwhy Date: Sun, 14 Jan 2018 20:36:21 +0800 Subject: [PATCH 04/13] no message --- app/Controllers/UserController.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index eada339..0cdcfad 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -145,7 +145,20 @@ class UserController extends BaseController } } - + function isHTTPS() + { + if (defined('HTTPS') && HTTPS) return true; + if (!isset($_SERVER)) return FALSE; + if (!isset($_SERVER['HTTPS'])) return FALSE; + if ($_SERVER['HTTPS'] === 1) { //Apache + return TRUE; + } elseif ($_SERVER['HTTPS'] === 'on') { //IIS + return TRUE; + } elseif ($_SERVER['SERVER_PORT'] == 443) { //其他 + return TRUE; + } + return FALSE; + } public function jsjapp($request, $response, $args) { @@ -153,7 +166,7 @@ class UserController extends BaseController $uid = $this->user->id; $apiid = Config::get('jsj_id'); $apikey = md5(Config::get('jsj_key')); - $showurl = $_SERVER['HTTP_HOST'].'/jsj_callback'; + $showurl = (isHTTPS() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].'/jsj_callback'; if(substr(md5($_SERVER['HTTP_HOST']),6,5)==Config::get('jsj_activate_key')){ echo " From f52427e2e9884c6b1d6f3e11bb0bbb3b5d4d8a0c Mon Sep 17 00:00:00 2001 From: mmmwhy Date: Sun, 14 Jan 2018 21:04:49 +0800 Subject: [PATCH 05/13] no message --- app/Controllers/HomeController.php | 9 +++++++++ app/Controllers/UserController.php | 5 ++++- app/Utils/Pay.php | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Controllers/HomeController.php b/app/Controllers/HomeController.php index 0584a41..7e8c8b3 100644 --- a/app/Controllers/HomeController.php +++ b/app/Controllers/HomeController.php @@ -105,6 +105,15 @@ class HomeController extends BaseController return $newResponse; } + public function jsj_callback($request, $response, $args) + { + echo ' + + '; + return; + } public function pay_callback($request, $response, $args) { Pay::callback($request); diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 0cdcfad..a940b4c 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -147,6 +147,7 @@ class UserController extends BaseController function isHTTPS() { + define('HTTPS', false); if (defined('HTTPS') && HTTPS) return true; if (!isset($_SERVER)) return FALSE; if (!isset($_SERVER['HTTPS'])) return FALSE; @@ -166,7 +167,9 @@ class UserController extends BaseController $uid = $this->user->id; $apiid = Config::get('jsj_id'); $apikey = md5(Config::get('jsj_key')); - $showurl = (isHTTPS() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].'/jsj_callback'; + + $showurl = (UserController::isHTTPS() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].'/jsj_callback'; + if(substr(md5($_SERVER['HTTP_HOST']),6,5)==Config::get('jsj_activate_key')){ echo " diff --git a/app/Utils/Pay.php b/app/Utils/Pay.php index 61dd02f..1f2b49b 100644 --- a/app/Utils/Pay.php +++ b/app/Utils/Pay.php @@ -47,7 +47,7 @@ class Pay private static function jsjapp_html($user) { return ' -

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

+

点击金额进行充值