diff --git a/README.md b/README.md index 1929b1a..0fdf363 100644 --- a/README.md +++ b/README.md @@ -1 +1,12 @@ -详情见:[https://91vps.win/2017/12/30/sspanel-91vps/](https://91vps.win/2017/12/30/sspanel-91vps/) \ No newline at end of file +在原版魔改的基础,增加了一些实用的功能。 + + +- 提供[魔改定制sstap](https://91vps.win/2017/12/30/a_sstap/) +- 增加一款英文主题,感谢美帝人民John +- 优化管理面板 在线IP显示模块 +- 设置保存登录时间为一个月 +- [新用户注册现金奖励|高等级节点体验|设备数量限制](https://91vps.win/2017/09/12/little_point/) +- 对接支付宝、金米付、金沙江、码支付(私人代码) +- 预备:重写注册页面、whmcs式推荐注册、一键对接 + +详情见:[https://91vps.win/2017/12/30/sspanel-91vps/](https://91vps.win/2017/12/30/sspanel-91vps/) diff --git a/app/Controllers/ApiController.php b/app/Controllers/ApiController.php index 1f4303a..2c8bbcb 100644 --- a/app/Controllers/ApiController.php +++ b/app/Controllers/ApiController.php @@ -61,7 +61,7 @@ class ApiController extends BaseController } $tokenStr = Tools::genToken(); $storage = Factory::createTokenStorage(); - $expireTime = time() + 3600*24*7; + $expireTime = time() + 3600*24*30; if ($storage->store($tokenStr, $user, $expireTime)) { $res['ret'] = 1; $res['msg'] = "ok"; diff --git a/app/Controllers/Client/ClientApiController.php b/app/Controllers/Client/ClientApiController.php index 1893b07..d7fbf19 100644 --- a/app/Controllers/Client/ClientApiController.php +++ b/app/Controllers/Client/ClientApiController.php @@ -60,6 +60,7 @@ class ClientApiController extends BaseController $accessToken = Helper::getTokenFromReq($request); $storage = Factory::createTokenStorage(); $token = $storage->get($accessToken); + $user = User::find($token->userId); $ssr_sub_token = LinkController::GenerateSSRSubCode($user->id, 0); $res['ret'] = 1; 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/LinkController.php b/app/Controllers/LinkController.php index 966c51b..3fc5b11 100644 --- a/app/Controllers/LinkController.php +++ b/app/Controllers/LinkController.php @@ -348,6 +348,7 @@ class LinkController extends BaseController "group"=>Config::get('appName'), "protocol"=>$item['protocol'], "protoparam"=>$item['protocol_param'], + "protocolparam"=>$item['protocol_param'], "obfs_udp"=>false, "enable"=>true)); } diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index d24852f..a940b4c 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -145,7 +145,21 @@ 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; + 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 +167,9 @@ 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 = (UserController::isHTTPS() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].'/jsj_callback'; + if(substr(md5($_SERVER['HTTP_HOST']),6,5)==Config::get('jsj_activate_key')){ echo " @@ -167,7 +183,7 @@ class UserController extends BaseController "; }else{ echo " -