- sudo mysql -e "CREATE DATABASE sspanel; use sspanel; source sql/glzjin_all.sql;"
- sudo mysql -e "use mysql; update user set authentication_string=PASSWORD('sspanel') where User='root'; update user set plugin='mysql_native_password';FLUSH PRIVILEGES;"
2. Create a new branch for each feature or improvement
3. Send a pull request from each feature branch against the dev branch.
It is very important to separate new features or improvements into separate feature branches, and to send a
pull request for each branch. This allows each feature or improvement to be reviewed and merged individually.
### Coding Style
All pull requests and commits **must** adhere to the [PSR-2 standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md) at least.
And we **recommend** adhering to the [PSR-12 standard](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md).
### Commit message
The Commit message **must** containe all the changes you maked in sort.
Please **do not** use words like "fix", "improve" only.
@ -135,11 +134,11 @@ class DetectController extends AdminController
$datatables = new Datatables(new DatatablesHelper());
$datatables->query('Select detect_log.id,user_id,user.user_name,node_id,node.name as node_name,list.id as rule_id,list.name as rule_name,list.text as rule_text,list.regex as rule_regex,list.type as rule_type,detect_log.datetime from detect_log,user,ss_node as node,detect_list as list where user.id=detect_log.user_id and node.id = detect_log.node_id and list.id = detect_log.list_id');
$datatables->edit('rule_type', function ($data) {
$datatables->edit('rule_type', static function ($data) {
@ -75,7 +73,7 @@ class IpController extends AdminController
$ip = $request->getParam('ip');
$user = Auth::getUser();
$BIP = BlockIp::where("ip", $ip)->get();
$BIP = BlockIp::where('ip', $ip)->get();
foreach ($BIP as $bi) {
$bi->delete();
}
@ -88,7 +86,7 @@ class IpController extends AdminController
$res['ret'] = 1;
$res['msg'] = "发送解封命令解封 " . $ip . " 成功";
$res['msg'] = '发送解封命令解封 ' . $ip . ' 成功';
return $this->echoJson($response, $res);
}
@ -97,13 +95,13 @@ class IpController extends AdminController
$datatables = new Datatables(new DatatablesHelper());
$datatables->query('Select blockip.id,node.name,blockip.ip,blockip.ip as location,datetime from blockip,ss_node as node WHERE blockip.nodeid = node.id');
$datatables->edit('datetime', function ($data) {
$datatables->edit('datetime', static function ($data) {
return date('Y-m-d H:i:s', $data['datetime']);
});
$iplocation = new QQWry();
$datatables->edit('location', function ($data) use ($iplocation) {
$datatables->edit('location', static function ($data) use ($iplocation) {
@ -117,13 +115,13 @@ class IpController extends AdminController
$datatables = new Datatables(new DatatablesHelper());
$datatables->query('Select unblockip.id,userid,user.user_name,unblockip.ip,unblockip.ip as location,datetime from unblockip,user WHERE unblockip.userid = user.id');
$datatables->edit('datetime', function ($data) {
$datatables->edit('datetime', static function ($data) {
return date('Y-m-d H:i:s', $data['datetime']);
});
$iplocation = new QQWry();
$datatables->edit('location', function ($data) use ($iplocation) {
$datatables->edit('location', static function ($data) use ($iplocation) {
@ -137,18 +135,18 @@ class IpController extends AdminController
$datatables = new Datatables(new DatatablesHelper());
$datatables->query('Select login_ip.id,login_ip.userid,user.user_name,login_ip.ip,login_ip.ip as location,login_ip.datetime,login_ip.type from login_ip,user WHERE login_ip.userid = user.id');
$datatables->edit('datetime', function ($data) {
$datatables->edit('datetime', static function ($data) {
return date('Y-m-d H:i:s', $data['datetime']);
});
$iplocation = new QQWry();
$datatables->edit('location', function ($data) use ($iplocation) {
$datatables->edit('location', static function ($data) use ($iplocation) {
$datatables->edit('type', static function ($data) {
return $data['type'] == 0 ? '成功' : '失败';
});
@ -162,26 +160,26 @@ class IpController extends AdminController
$datatables = new Datatables(new DatatablesHelper());
$datatables->query('Select alive_ip.id,alive_ip.userid,user.user_name,alive_ip.nodeid,ss_node.name as node_name,alive_ip.ip,alive_ip.ip as location,alive_ip.datetime,alive_ip.id as is_node from alive_ip,user,ss_node WHERE alive_ip.userid = user.id and alive_ip.nodeid = ss_node.id and `datetime` > UNIX_TIMESTAMP() - 60');
$datatables->edit('datetime', function ($data) {
$datatables->edit('datetime', static function ($data) {
@ -366,16 +366,16 @@ class RelayController extends AdminController
$datatables = new Datatables(new DatatablesHelper());
$datatables->query('Select relay.id as op,relay.id,relay.user_id,user.user_name,source_node.name as source_node_name,dist_node.name as dist_node_name,relay.port,relay.priority from relay,user,ss_node as source_node,ss_node as dist_node WHERE (relay.user_id = user.id or relay.user_id = 0) and source_node.id = relay.source_node_id and dist_node.id = relay.dist_node_id group by id');
$datatables->edit('status', static function ($data) {
return $data['status'] == 1 ? '上架' : '下架';
});
$datatables->edit('period_sales', function ($data) {
$datatables->edit('period_sales', static function ($data) {
$shop = Shop::find($data['id']);
$period = Config::get('sales_period');
@ -283,28 +280,28 @@ class ShopController extends AdminController
$datatables = new Datatables(new DatatablesHelper());
$datatables->query('Select bought.id as op,bought.id as id,bought.datetime,shop.id as content,bought.price,user.id as user_id,user.user_name,renew,shop.auto_reset_bandwidth from bought,user,shop where bought.shopid = shop.id and bought.userid = user.id');
@ -109,15 +107,15 @@ class TicketController extends AdminController
$datatables = new Datatables(new DatatablesHelper());
$datatables->query('Select ticket.id as op,ticket.id,ticket.datetime,ticket.title,ticket.userid,user.user_name,ticket.status from ticket,user where ticket.userid = user.id and ticket.rootid = 0');
@ -459,9 +459,12 @@ class UserController extends BaseController
$array_nodes = array();
$nodes_muport = array();
$db = new DatatablesHelper();
$infoLogs = $db->query('SELECT * FROM ( SELECT * FROM `ss_node_info` WHERE log_time > ' . (time() - 300) . ' ORDER BY id DESC LIMIT 999999999999 ) t GROUP BY node_id ORDER BY id DESC');
$onlineLogs = $db->query('SELECT * FROM ( SELECT * FROM `ss_node_online_log` WHERE log_time > ' . (time() - 300) . ' ORDER BY id DESC LIMIT 999999999999 ) t GROUP BY node_id ORDER BY id DESC');
foreach ($nodes as $node) {
if ($node->node_group != $user->node_group && $node->node_group != 0) {