diff --git a/app/Command/FinanceMail.php b/app/Command/FinanceMail.php index 9a12e4ca..e48278fb 100644 --- a/app/Command/FinanceMail.php +++ b/app/Command/FinanceMail.php @@ -21,7 +21,7 @@ class FinanceMail { $datatables = new Datatables(new DatatablesHelper()); $datatables->query( - 'select code.number,code.userid,code.usedatetime from code + 'select code.number, code.userid, code.usedatetime from code where TO_DAYS(NOW()) - TO_DAYS(code.usedatetime) = 1 and code.type = -1 and code.isused= 1'); $text_json=$datatables->generate(); $text_array=json_decode($text_json,true); @@ -40,6 +40,25 @@ class FinanceMail $income_count+=1; $income_total+=$code['number']; } + //易付通的单独表 + $datatables2 = new Datatables(new DatatablesHelper()); + $datatables2->query( + 'select yft_order_info.price, yft_order_info.user_id, yft_order_info.create_time from yft_order_info + where TO_DAYS(NOW()) - TO_DAYS(yft_order_info.create_time) = 1 and yft_order_info.state= 1'); + $text_json2=$datatables2->generate(); + $text_array2=json_decode($text_json2,true); + $codes2=$text_array2['data']; + foreach($codes2 as $code2){ + $text_html.=''; + $text_html.=''.$code2['price'].''; + $text_html.=''.$code2['user_id'].''; + $user=User::find($code2['user_id']); + $text_html.=''.$user->user_name.''; + $text_html.=''.$code2['create_time'].''; + $text_html.=''; + $income_count+=1; + $income_total+=$code['price']; + } $text_html.=''; $text_html.='
昨日总收入笔数:'.$income_count.'
昨日总收入金额:'.$income_total; @@ -88,6 +107,19 @@ class FinanceMail $income_count+=1; $income_total+=$code['number']; } + //易付通的单独表 + $datatables2 = new Datatables(new DatatablesHelper()); + $datatables2->query( + 'select yft_order_info.price from yft_order_info + where yearweek(date_format(yft_order_info.create_time,\'%Y-%m-%d\')) = yearweek(now())-1 and yft_order_info.state= 1'); + //每周的第一天是周日,因此统计周日~周六的七天 + $text_json2=$datatables2->generate(); + $text_array2=json_decode($text_json2,true); + $codes2=$text_array2['data']; + foreach($codes2 as $code2){ + $income_count+=1; + $income_total+=$code2['price']; + } $text_html.='
上周总收入笔数:'.$income_count.'
上周总收入金额:'.$income_total; $adminUser = User::where("is_admin", "=", "1")->get(); @@ -134,6 +166,18 @@ class FinanceMail $income_count+=1; $income_total+=$code['number']; } + $datatables2 = new Datatables(new DatatablesHelper()); + $datatables2->query( + 'select yft_order_info.price from yft_order_info + where date_format(yft_order_info.create_time,\'%Y-%m\') =date_format(date_sub(curdate(), interval 1 month),\'%Y-%m\') and yft_order_info.state= 1'); + //每周的第一天是周日,因此统计周日~周六的七天 + $text_json2=$datatables2->generate(); + $text_array2=json_decode($text_json2,true); + $codes2=$text_array2['data']; + foreach($codes2 as $code2){ + $income_count+=1; + $income_total+=$code2['price']; + } $text_html.='
上月总收入笔数:'.$income_count.'
上月总收入金额:'.$income_total; $adminUser = User::where("is_admin", "=", "1")->get(); diff --git a/app/Controllers/Admin/NodeController.php b/app/Controllers/Admin/NodeController.php index 9466d9a8..82eb4850 100644 --- a/app/Controllers/Admin/NodeController.php +++ b/app/Controllers/Admin/NodeController.php @@ -117,24 +117,35 @@ class NodeController extends AdminController if ($node->sort == 0 || $node->sort == 1 || $node->sort == 10 || $node->sort == 11) { if ($request->getParam('node_ip') != '') { $node->node_ip = $request->getParam('node_ip'); - } else { + } + else { if ($node->isNodeOnline()) { $succ = false; if ($node->sort == 11) { $server_list = explode(";", $request->getParam('server')); $succ = $node->changeNodeIp($server_list[0]); - } else { + } + else { $succ = $node->changeNodeIp($request->getParam('server')); } - if (!succ) { + if (!$succ) { $rs['ret'] = 0; $rs['msg'] = "更新节点IP失败,请检查您输入的节点地址是否正确!"; return $response->getBody()->write(json_encode($rs)); } } + else{ + if ($node->sort == 11) { + $server_list = explode(";", $request->getParam('server')); + $node->node_ip = gethostbyname($server_list[0]); + } else { + $node->node_ip = gethostbyname($request->getParam('server')); + } + } } - } else { + } + else { $node->node_ip=""; } diff --git a/app/Controllers/AdminController.php b/app/Controllers/AdminController.php index 88d69cdc..50eead2a 100644 --- a/app/Controllers/AdminController.php +++ b/app/Controllers/AdminController.php @@ -56,6 +56,12 @@ class AdminController extends UserController $num = $request->getParam('num'); $prefix = $request->getParam('prefix'); + if(is_numeric($num)==false){ + $res['ret'] = 0; + $res['msg'] = "非法请求"; + return $response->getBody()->write(json_encode($res)); + } + if ($request->getParam('uid')!="0") { if (strpos($request->getParam('uid'), "@")!=false) { $user=User::where("email", "=", $request->getParam('uid'))->first(); diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 6a32c45d..727acbca 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -541,12 +541,19 @@ class UserController extends BaseController public function ResetPort($request, $response, $args) { + $price=Config::get('port_price'); $user = $this->user; + + if ($user->money<$price){ + $res['ret'] = 0; + $res['msg'] = "余额不足。"; + return $response->getBody()->write(json_encode($res)); + } $origin_port = $user->port; $user->port = Tools::getAvPort(); - $user->save(); + $relay_rules = Relay::where('user_id', $user->id)->where('port', $origin_port)->get(); foreach ($relay_rules as $rule) { @@ -554,12 +561,60 @@ class UserController extends BaseController $rule->save(); } + $user->money-=$price; + $user->save(); $res['ret'] = 1; $res['msg'] = "设置成功,新端口是".$user->port; return $response->getBody()->write(json_encode($res)); } + public function SpecifyPort($request, $response, $args) + { + $price=Config::get('port_price_specify'); + $user = $this->user; + + if ($user->money<$price){ + $res['ret'] = 0; + $res['msg'] = "余额不足。"; + return $response->getBody()->write(json_encode($res)); + } + + $port=$request->getParam('port'); + + if ($portConfig::get('max_port')||is_numeric($port)==false){ + $res['ret'] = 0; + $res['msg'] = "端口不在要求范围内。"; + return $response->getBody()->write(json_encode($res)); + } + + $port_occupied = User::pluck('port')->toArray(); + + if(in_array($port,$port_occupied)==true){ + $res['ret'] = 0; + $res['msg'] = "端口已被占用。"; + return $response->getBody()->write(json_encode($res)); + } + + $origin_port = $user->port; + + $user->port = $port; + + + $relay_rules = Relay::where('user_id', $user->id)->where('port', $origin_port)->get(); + foreach ($relay_rules as $rule) { + $rule->port = $user->port; + $rule->save(); + } + + $user->money-=$price; + $user->save(); + + $res['ret'] = 1; + $res['msg'] = "钦定成功"; + return $response->getBody()->write(json_encode($res)); + } + public function GaReset($request, $response, $args) { $user = $this->user; @@ -698,7 +753,7 @@ class UserController extends BaseController $node_prefix=(object)$node_prefix; $node_order=(object)$node_order; $tools = new Tools(); - return $this->view()->assign('relay_rules', $relay_rules)->assign('node_class', $node_class)->assign('node_isv6', $node_isv6)->assign('tools', $tools)->assign('node_method', $node_method)->assign('node_muport', $node_muport)->assign('node_bandwidth', $node_bandwidth)->assign('node_heartbeat', $node_heartbeat)->assign('node_prefix', $node_prefix)->assign('node_prefix_file', $node_flag_file)->assign('node_prealive', $node_prealive)->assign('node_order', $node_order)->assign('user', $user)->assign('node_alive', $node_alive)->assign('node_latestload', $node_latestload)->registerClass("URL", "App\Utils\URL")->display('user/node.tpl'); + return $this->view()->assign('relay_rules', $relay_rules)->assign('node_class', $node_class)->assign('node_isv6', $node_isv6)->assign('tools', $tools)->assign('node_method', $node_method)->assign('node_muport', $node_muport)->assign('node_bandwidth', $node_bandwidth)->assign('node_heartbeat', $node_heartbeat)->assign('node_prefix', $node_prefix)->assign('node_flag_file', $node_flag_file)->assign('node_prealive', $node_prealive)->assign('node_order', $node_order)->assign('user', $user)->assign('node_alive', $node_alive)->assign('node_latestload', $node_latestload)->registerClass("URL", "App\Utils\URL")->display('user/node.tpl'); } @@ -1026,7 +1081,7 @@ class UserController extends BaseController { $price=Config::get('invite_price'); $num=$request->getParam('num'); - if($price<0||$num<=0){ + if(is_numeric($num)==false||$price<0||$num<=0){ $res['ret'] = 0; $res['msg'] = "非法请求"; return $response->getBody()->write(json_encode($res)); @@ -1041,7 +1096,7 @@ class UserController extends BaseController return $response->getBody()->write(json_encode($res)); } $user->invite_num += $num; - $user->money=$user->money-$price; + $user->money-=$amount; $user->save(); $res['ret'] = 1; $res['msg'] = "邀请次数添加成功。"; diff --git a/app/Services/Config.php b/app/Services/Config.php index 604416d1..e421a500 100644 --- a/app/Services/Config.php +++ b/app/Services/Config.php @@ -22,11 +22,15 @@ class Config "appName" => self::get("appName"), "version" => VERSION, "baseUrl" => self::get("baseUrl"), - "checkinMin" => self::get("checkinMin"), - "code_payback" => self::get("code_payback"), + "min_port" => self::get("min_port"), + "max_port" => self::get("max_port"), "invite_price"=>self::get("invite_price"), + "checkinMin" => self::get("checkinMin"), "checkinMax" => self::get("checkinMax"), + "code_payback" => self::get("code_payback"), "wecenter_url" => self::get("wecenter_url"), + "port_price" => self::get("port_price"), + "port_price_specify" => self::get("port_price_specify"), "enable_wecenter" => self::get("enable_wecenter"), "jump_delay" => self::get("jump_delay"), "enable_analytics_code" => self::get("enable_analytics_code"), @@ -35,12 +39,12 @@ class Config "payment_system" => self::get("payment_system"), "enable_crisp" => self::get("enable_crisp"), "crisp_id" => self::get("crisp_id"), - "enable_ticket"=>self::get("enable_ticket"), - "enable_admin_contact"=>self::get("enable_admin_contact"), - "admin_contact1"=>self::get("admin_contact1"), - "admin_contact2"=>self::get("admin_contact2"), - "admin_contact3"=>self::get("admin_contact3"), - "enable_flag"=>self::get("enable_flag") + "enable_ticket"=> self::get("enable_ticket"), + "enable_admin_contact" => self::get("enable_admin_contact"), + "admin_contact1" => self::get("admin_contact1"), + "admin_contact2" => self::get("admin_contact2"), + "admin_contact3" => self::get("admin_contact3"), + "enable_flag" => self::get("enable_flag") ]; } diff --git a/app/Utils/Tools.php b/app/Utils/Tools.php index a01656a5..11753986 100644 --- a/app/Utils/Tools.php +++ b/app/Utils/Tools.php @@ -145,14 +145,11 @@ class Tools { //检索User数据表现有port $det = User::pluck('port')->toArray(); - $port = array_diff(range(Config::get('min_port'), Config::get('max_port')), $det); shuffle($port); - return $port[0]; } - public static function base64_url_encode($input) { return strtr(base64_encode($input), array('+' => '-', '/' => '_', '=' => '')); diff --git a/config/.config.php.example b/config/.config.php.example index 52830c4e..b9de34ee 100644 --- a/config/.config.php.example +++ b/config/.config.php.example @@ -3,6 +3,15 @@ // ss-panel-v3-mod_UIChanges配置 // true为开启,false为关闭 +// 注释里请勿使用英文方括号、分号、单引号,否则迁移Config时可能会出现BUG + +//config迁移附注(由开发者填写本次config迁移后需要注意的地方,站长勿动) +//如需换行,直接换行即可,无需换行符 +$System_Config['config_migrate_notice']= +'enable_prefix和prefix_regex在最近的版本中分别被重命名为enable_flag和flag_regex +flag_regex在最近的版本中使用了新的值,依然是匹配 国旗名+空格,但效果更好 +新增port_price用于给【重置端口】功能定价'; + //基础设置,正确填写以下内容你的网站就能使用了----------------------------------------------------------------------- $System_Config['key'] = '1145141919810'; // !!! 瞎 jb 修改此key为随机字符串确保网站安全 !!! @@ -104,6 +113,8 @@ $System_Config['auto_clean_min_money']='1'; //自动清理时余额低于 $System_Config['enable_auto_clean_unused']='false'; //未使用的0级用户自动清理开关 $System_Config['enable_auto_clean_unused_days']='30'; //自动清理多少天没使用的0级用户 $System_Config['enable_kill']='true'; //是否允许用户注销账户 +$System_Config['port_price']='-1'; //用户随机重置端口所需要的价格,价格小于0时视为不开放购买 +$System_Config['port_price_specify']='-1'; //用户指明钦定端口所需要的价格,价格小于0时视为不开放购买 //Telegram bot设置-------------------------------------------------------------- @@ -210,7 +221,7 @@ $System_Config['finance_public']='false'; //财务报告是否向Telegram群 //国旗图标显示 $System_Config['enable_flag']='false'; //启用该项之前务必先仔细阅读教程 -$System_Config['flag_regex']='/.*(?=\s)/'; //从站点全名中匹配国家/地区的正则表达式(php版) +$System_Config['flag_regex']='/.*?(?=\s)/'; //从站点全名中匹配国家/地区的正则表达式(php版) //杂项(一般不需要更改------------------------------------------------------------- $System_Config['authDriver'] = 'cookie'; //不能更改此项 diff --git a/config/routes.php b/config/routes.php index 499ee1bb..0b029fba 100644 --- a/config/routes.php +++ b/config/routes.php @@ -157,6 +157,7 @@ $app->group('/user', function () { $this->get('/gareset', 'App\Controllers\UserController:GaReset'); $this->get('/telegram_reset', 'App\Controllers\UserController:telegram_reset'); $this->post('/resetport', 'App\Controllers\UserController:ResetPort'); + $this->post('/specifyport', 'App\Controllers\UserController:SpecifyPort'); $this->post('/pacset', 'App\Controllers\UserController:PacSet'); $this->get('/getpcconf', 'App\Controllers\UserController:GetPcConf'); $this->get('/getiosconf', 'App\Controllers\UserController:GetIosConf'); diff --git a/resources/views/material/admin/code/add.tpl b/resources/views/material/admin/code/add.tpl index d890adda..5696c811 100644 --- a/resources/views/material/admin/code/add.tpl +++ b/resources/views/material/admin/code/add.tpl @@ -27,7 +27,7 @@
- +
diff --git a/resources/views/material/footer.tpl b/resources/views/material/footer.tpl index 5755d9c8..36d5353b 100644 --- a/resources/views/material/footer.tpl +++ b/resources/views/material/footer.tpl @@ -5,6 +5,8 @@ + + diff --git a/resources/views/material/password/reset.tpl b/resources/views/material/password/reset.tpl index ed295d9a..6981d651 100644 --- a/resources/views/material/password/reset.tpl +++ b/resources/views/material/password/reset.tpl @@ -43,14 +43,8 @@
- -
-

登录

-

注册账号

-
- - - + + {include file='dialog.tpl'} diff --git a/resources/views/material/tos.tpl b/resources/views/material/tos.tpl index 647375a3..d2b78451 100644 --- a/resources/views/material/tos.tpl +++ b/resources/views/material/tos.tpl @@ -32,7 +32,7 @@ - 手机号为本站服务的唯一凭证,请自行保管。 + 邮箱为本站服务的唯一凭证,请自行保管。 diff --git a/resources/views/material/user/edit.tpl b/resources/views/material/user/edit.tpl index 104c0ca9..ea470f08 100644 --- a/resources/views/material/user/edit.tpl +++ b/resources/views/material/user/edit.tpl @@ -335,24 +335,46 @@ + {if $config['port_price']>=0 || $config['port_price_specify']>=0}
+ {if $config['port_price']>=0}

重置端口

-

随机更换一个端口使用

+

对号码不满意?来摇号吧~!

+

随机更换一个端口使用,价格:{$config['port_price']}元/次

重置后1分钟内生效

当前端口:{$user->port}

+
+
+
+ +
+
+ {/if} + {if $config['port_price_specify']>=0} +
+

钦定端口

+

不想摇号?来钦定端口吧~!

+

价格:{$config['port_price_specify']}元/次

+

端口范围:{$config['min_port']}~{$config['max_port']}

+
+ + +
- +
+ {/if}
+ {/if}
@@ -458,6 +480,33 @@ $(".copy-text").click(function () { }) }) +