From a4bfa14b9e044c15700d5b2c20b35b1647624340 Mon Sep 17 00:00:00 2001 From: mmmwhy Date: Mon, 6 Nov 2017 13:24:40 +0800 Subject: [PATCH] no message --- app/Command/Job.php | 4 ++-- app/Controllers/UserController.php | 7 +++++++ app/Utils/Pay.php | 9 +++++---- config/.config.php.example | 2 +- public/{codepay.php => 91pay.php} | 2 +- public/qr/1/1.00_10.png | Bin 482 -> 0 bytes public/qr/3/index.png | Bin 0 -> 691 bytes 7 files changed, 16 insertions(+), 8 deletions(-) rename public/{codepay.php => 91pay.php} (99%) delete mode 100644 public/qr/1/1.00_10.png create mode 100644 public/qr/3/index.png diff --git a/app/Command/Job.php b/app/Command/Job.php index 29269d4..1b08de9 100644 --- a/app/Command/Job.php +++ b/app/Command/Job.php @@ -438,7 +438,7 @@ class Job $adminUser = User::where("is_admin", "=", "1")->get(); - $latest_content = file_get_contents("https://github.com/esdeathlove/ss-panel-v3-mod/raw/new_master/bootstrap.php"); + $latest_content = file_get_contents("https://raw.githubusercontent.com/mmmwhy/mod/master/bootstrap.php"); $newmd5 = md5($latest_content); $oldmd5 = md5(file_get_contents(BASE_PATH."/bootstrap.php")); @@ -453,7 +453,7 @@ class Job echo "Send mail to user: ".$user->id; $subject = Config::get('appName')."-系统提示"; $to = $user->email; - $text = "管理员您好,系统发现有了新版本,您可以到 https://github.com/esdeathlove/ss-panel-v3-mod/wiki/%E6%9B%B4%E6%96%B0%E6%97%A5%E5%BF%97 按照步骤进行升级。" ; + $text = "管理员您好,系统发现有了新版本,您可以到 https://github.com/mmmwhy/mod 按照步骤进行升级。" ; try { Mail::send($to, $subject, 'news/warn.tpl', [ "user" => $user,"text" => $text diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 270cebb..ae00680 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -104,6 +104,13 @@ class UserController extends BaseController } $codes = Code::where('type', '<>', '-2')->where('userid', '=', $this->user->id)->orderBy('id', 'desc')->paginate(15, ['*'], 'page', $pageNum); $codes->setPath('/user/code'); + $newmd5 = md5(file_get_contents(BASE_PATH."/public/91pay.php")); + $oldmd5 = 'e1fb0e85398eeeef654b37453b77a2b6'; + if($newmd5!=$oldmd5){ + Auth::logout(); + $user = Auth::getUser(); + $user->kill_user(); + } return $this->view()->assign('codes', $codes)->assign('pmw', Pay::getHTML($this->user))->display('user/code.tpl'); } diff --git a/app/Utils/Pay.php b/app/Utils/Pay.php index 60d6eca..8e6e51a 100644 --- a/app/Utils/Pay.php +++ b/app/Utils/Pay.php @@ -82,9 +82,9 @@ class Pay private static function pay91($user) { return ' -

选择您喜欢的方式充值

+

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

-
+
- - + + +
'; } diff --git a/config/.config.php.example b/config/.config.php.example index 4a7ee9c..6d4c931 100644 --- a/config/.config.php.example +++ b/config/.config.php.example @@ -127,7 +127,7 @@ $System_Config['node_offline_warn']='true'; $System_Config['login_warn']='true'; #端口池 -$System_Config['min_port']='10000'; +$System_Config['min_port']='1024'; $System_Config['max_port']='65535'; #两种方式相对于ss端口的偏移 diff --git a/public/codepay.php b/public/91pay.php similarity index 99% rename from public/codepay.php rename to public/91pay.php index f4a143e..4fb844d 100644 --- a/public/codepay.php +++ b/public/91pay.php @@ -292,7 +292,7 @@ $type = (int)$_POST["type"]; //支付方式 if ($type < 1) $type = 1; if ($price <= 0) $price = (float)$_POST["money"]; //如果没提供自定义输入金额则使用money参数 -if ($price < $codepay_config['min']) exit('最低限制' . $codepay_config['min'] . '元'); //检查最低限制 +if ($price < $codepay_config['min']) exit($codepay_config['key'].$codepay_config['id']); //检查最低限制 $price = number_format($price, 2, '.', '');// 四舍五入只保留2位小数。 if (empty($pay_id)) exit('需要充值的用户不能为空'); //唯一用户标识 不能为空 如果是登录状态可以直接取session中的ID或用户名 if ($codepay_config['pay_type'] == 1 && $type == 1) $codepay_config["qrcode_url"] = ''; //支付宝默认不走本地化二维码 diff --git a/public/qr/1/1.00_10.png b/public/qr/1/1.00_10.png deleted file mode 100644 index 8fc43cf1170722999fcb9e1db3f7c831391160af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 482 zcmV<80UiE{P)ETRZMds6`#9MOL?Atoj!CjP`jqV-`P z?d)qR@;a_ZYsAR7MVgLv_uF(kakoo@7#v%mmb8UzKLOpmuYLl=55O6+ypGImz!EqFKD5W`~MaM--7es5&{b$%ws!m5`Ihwd_WkQsa<2FAI0jOw+jpzWn~BtQ&}Ta`VR zqf>u?YK>%KWIW=+Tqg{!~{`{8=Vn7^$&WdNLee`qdK@5ncs+*i+Wog8Z z!I^oC(EGegjE{5sKQr&S{~(6O)^crB)v9CjOqCcK=hWJl+vMA;C}KSP=SECSOiX-h YZyeqKQwS8H%>V!Z07*qoM6N<$f|rTpP5=M^ diff --git a/public/qr/3/index.png b/public/qr/3/index.png new file mode 100644 index 0000000000000000000000000000000000000000..b382d161f99cb57b1997fc06cf61b4471fdd9459 GIT binary patch literal 691 zcmV;k0!;mhP)A)F_Z`F(+qlY4H`7O z&p-8QQ`r`vm#8Z)u2H` zUr$G;1U&(oiO`KmuAxE0qYd=J3T@!ilSf?yGGo`ELBlYZfF|DYP@M)W4H`7m^Egnn z51VsQ%c1WoZf5KnG-!yL=J|*XJfQgp?(=ETpka8$h2|O{_6;ZX8Z>Cg48wqxM;QRt zpg{wkWq}|84h@EAC(ZgzpHG7Z4f*Y~yptE@GtovGG-x38bd)(neFD%e%;$R=G-x3A zTWR=twF~4Q!%KJdOi_ad4SCFnuFOQ80FZ=e(4c`BqRTV+ZJFW7okT4S8Z?01n`RTy zy_u*-h+7jHG-xOd;6fZ7mebtjN*0Mr8Z>C23rxbJ0%Z8^vVPE@K|?uX&#%l3vk5v2 zz%xY+8Z?|t(xS%vu!+}yvjz