Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mk #6

Merged
merged 42 commits into from Mar 13, 2019
Merged

mk #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
0d0884a
Update HomeController.php
GeekQu Feb 12, 2019
1b70968
Merge branch 'pr/16' into dev
GeekQu Feb 12, 2019
0c060ee
加回 ss & ssd 的全部 url
GeekQu Feb 12, 2019
d65905c
mergeSub 去除的遗留问题
GeekQu Feb 15, 2019
a705e50
Merge branch 'pr/17' into dev
GeekQu Feb 15, 2019
2ce018b
fix bug
GeekQu Feb 15, 2019
8266caf
首页的订阅链接修改
GeekQu Feb 15, 2019
49efc53
Update main.tpl
GeekQu Feb 15, 2019
98eced5
增加一些URL传参
GeekQu Feb 18, 2019
0b63054
fix bug
GeekQu Feb 18, 2019
5765cad
Merge branch 'pr/18' into dev
GeekQu Feb 18, 2019
85c17b6
更新
GeekQu Feb 25, 2019
9d3790d
Merge branch 'pr/19' into dev
GeekQu Feb 25, 2019
205076f
Merge branch 'pr/20' into dev
GeekQu Feb 26, 2019
12940ab
ios账户共享新增累计充值门槛
TheCGDF Feb 28, 2019
67fb551
Merge branch 'pr/21' into dev
GeekQu Feb 28, 2019
a6e39a7
跟进 Clash 节点配置字段
GeekQu Mar 2, 2019
feff60f
修复Clash YAML配置中多余的空格以及当没有回国节点时导致的配置文件错误
GeekQu Mar 3, 2019
860dd97
Fix: typo, clashX & Clash for Windows
SukkaW Mar 6, 2019
f71759d
Merge pull request #567 from SukkaW/fix/user/indexold
TheCGDF Mar 6, 2019
d4a790b
Merge branch 'dev' of git://github.com/GeekQu/ss-panel-v3-mod_Uim int…
Mar 7, 2019
156cbcb
Merge branch 'GeekQu-dev' into dev
Mar 7, 2019
fbdf96d
绑定tg文字微调
TheCGDF Mar 7, 2019
e2029b0
修复TGbot quan的订阅问题
Mar 9, 2019
191e3d1
修复如果端口设置成0的情况
Mar 10, 2019
b21ca25
修复 Clash 配置中会输出 kcp 协议节点
GeekQu Mar 10, 2019
dcd09b9
Merge pull request #22 from rico93/dev
GeekQu Mar 10, 2019
4fa9925
update
tonyzzzzzz Mar 11, 2019
51be96f
补充ssr-electron linux教程
TheCGDF Mar 11, 2019
f177813
修正下载链接
TheCGDF Mar 11, 2019
805d234
登录验证
laurieryayoi Mar 12, 2019
6c73665
补充登录验证
laurieryayoi Mar 12, 2019
1a8b6d4
更新预编译文件
laurieryayoi Mar 12, 2019
d50400b
Merge branch 'dev' of https://github.com/Anankke/ss-panel-v3-mod_Uim …
laurieryayoi Mar 12, 2019
48d58be
登录超时token
laurieryayoi Mar 12, 2019
97203af
修复 V2Ray 的节点地址可以被错误提交
GeekQu Mar 12, 2019
6931a05
订阅链接兼容从上游面板切换到此面板
GeekQu Mar 12, 2019
c20b63c
Merge pull request #26 from GeekQu/dev
GeekQu Mar 12, 2019
eaa3cdb
修复v2ray节点的ip解析
TheCGDF Mar 12, 2019
4295dea
Merge branch 'dev' of git://github.com/Anankke/ss-panel-v3-mod_Uim in…
Mar 12, 2019
f014051
Merge branch 'Anankke-dev' into dev
Mar 12, 2019
df9bdfb
Merge branch 'dev' of github.com:rico93/ss-panel-v3-mod_Uim into dev
Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Command/Job.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static function syncnode()
{
$nodes = Node::all();
foreach ($nodes as $node) {
if ($node->sort == 11) {
if ($node->sort == 11 or $node->sort =12) {
$server_list = explode(";", $node->server);
if(!Tools::is_ip($server_list[0])){
if($node->changeNodeIp($server_list[0])){
Expand Down Expand Up @@ -132,7 +132,7 @@ public static function DailyJob()
{
$nodes = Node::all();
foreach ($nodes as $node) {
if ($node->sort == 0 || $node->sort == 10 || $node->sort == 11) {
if ($node->sort == 0 || $node->sort == 10 || $node->sort == 11 ||$node->sort ==12 ) {
if (date("d")==$node->bandwidthlimit_resetday) {
$node->node_bandwidth=0;
$node->save();
Expand Down
9 changes: 5 additions & 4 deletions app/Command/XCat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function boot()
return $this->resetAllPort();
case("update"):
return Update::update($this);
case ("sendDailyUsageByTG"):
case("sendDailyUsageByTG"):
return $this->sendDailyUsageByTG();
case('npmbuild'):
return $this->npmbuild();
Expand Down Expand Up @@ -246,7 +246,6 @@ public function resetTraffic()
return "reset traffic successful";
}


public function setTelegram()
{
$bot = new \TelegramBot\Api\BotApi(Config::get('telegram_token'));
Expand All @@ -268,6 +267,7 @@ public function initQQWry()
echo("finish....");
}
}

public function sendDailyUsageByTG()
{
$bot = new \TelegramBot\Api\BotApi(Config::get('telegram_token'));
Expand All @@ -292,14 +292,15 @@ public function npmbuild(){
system('npm install');
system('npm run build');
system('cp -u ../public/vuedist/index.html ../resources/views/material/index.tpl');
}
}

public function iptest()
{ $nodes = Node::all();

foreach ($nodes as $node) {
$ip ="";
$server="";
if ($node->sort == 11) {
if ($node->sort == 11 || $node->sort == 12) {
$server_list = explode(";", $node->server);
$server = $server_list[0];
if(!Tools::is_ip($server_list[0])){
Expand Down
28 changes: 25 additions & 3 deletions app/Controllers/Admin/NodeController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,22 @@ public function add($request, $response, $args)

$req_node_ip = trim($request->getParam('node_ip'));
if($req_node_ip==""){
$req_node_ip=$node->server;
if($node->sort==11){
$server_list = explode(";", $node->server);
$req_node_ip=$server_list[0];
}
else{
$req_node_ip=$node->server;
}
}

if ($node->sort == 11 || $node->sort == 12) {
$server_list = explode(";", $node->server);
if (count($server_list) <= 5) {
$rs['ret'] = 0;
$rs['msg'] = "您输入的节点地址格式有误！";
return $response->getBody()->write(json_encode($rs));
}
if(!Tools::is_ip($server_list[0])){
$node->node_ip = gethostbyname($server_list[0]);
if ($node->node_ip=="127.0.0.1"){
Expand Down Expand Up @@ -139,12 +150,23 @@ public function update($request, $response, $args)

$req_node_ip=trim($request->getParam('node_ip'));
if($req_node_ip==""){
$req_node_ip=$node->server;
if($node->sort==11){
$server_list = explode(";", $node->server);
$req_node_ip=$server_list[0];
}
else{
$req_node_ip=$node->server;
}
}

$success=true;
if ($node->sort == 11 || $node->sort == 12) {
$server_list = explode(";", $node->server);
if (count($server_list) <= 5) {
$rs['ret'] = 0;
$rs['msg'] = "您输入的节点地址格式有误！";
return $response->getBody()->write(json_encode($rs));
}
if(!Tools::is_ip($server_list[0])){
$success=$node->changeNodeIp($server_list[0]);
}else{
Expand Down
53 changes: 21 additions & 32 deletions app/Controllers/HomeController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,92 +154,81 @@ public function sublinkOut($request, $response, $args)
if (!$user->isLogin) {
$msg = "₍₍ ◝(・ω・)◟ ⁾⁾ 您没有登录噢，登录之后再刷新就阔以了啦";
} else {
$subUrl = Config::get('subUrl') . LinkController::GenerateSSRSubCode($user->id, 0);
$subInfo = LinkController::GetSubinfo($user, 0);
switch ($request->getParam('type')) {
case 'ss':
$msg = "```
个人端口：" . $subUrl . "?sub=2&mu=0
公共端口：" . $subUrl . "?sub=2&mu=1
订阅链接：" . $subInfo['ss'] . "
```";
break;
case 'ssr':
$msg = "```
个人端口：" . $subUrl . "?sub=1&mu=0
公共端口：" . $subUrl . "?sub=1&mu=1
订阅链接：" . $subInfo['ssr'] . "
```";
break;
case 'v2ray':
// v2rayN 格式
$msg = "```
公共端口：" . $subUrl . "?sub=3
订阅链接：" . $subInfo['v2ray'] . "
```";
break;
// APPs~
case 'ssd':
$msg = "```
个人端口：" . $subUrl . "?ssd=1&mu=0
公共端口：" . $subUrl . "?ssd=1&mu=1
订阅链接：" . $subInfo['ssd'] . "
```";
break;
case 'clash':
$msg = "```
个人端口：" . $subUrl . "?clash=1&mu=0
公共端口：" . $subUrl . "?clash=1&mu=1
订阅链接：" . $subInfo['clash'] . "
```";
break;
case 'surge':
$msg = "```
// Surge Version 2.x
个人端口：" . $subUrl . "?surge=2&mu=0
公共端口：" . $subUrl . "?surge=2&mu=1
订阅链接：" . $subInfo['surge2'] . "
// Surge Version 3.x
个人端口：" . $subUrl . "?surge=3&mu=0
公共端口：" . $subUrl . "?surge=3&mu=1
订阅链接：" . $subInfo['surge3'] . "
```";
break;
case 'kitsunebi':
$msg = "```
// 合并订阅，包含 ss、v2ray
个人端口：" . $subUrl . "?sub=4&mu=0
公共端口：" . $subUrl . "?sub=4&mu=1
// v2ray 订阅
公共端口：" . $subUrl . "?sub=3
订阅链接：" . $subInfo['v2ray'] . "
// 合并订阅，包含 ss、v2ray
订阅链接：" . $subInfo['v2ray_ss'] . "
```";
break;
case 'surfboard':
$msg = "```
个人端口：" . $subUrl . "?surfboard=1&mu=0
公共端口：" . $subUrl . "?surfboard=1&mu=1
订阅链接：" . $subInfo['surfboard'] . "
```";
break;
case 'quantumult_sub':
// Quantumult V2ray 专属格式
$msg = "```
// ssr 订阅
个人端口：" . $subUrl . "?sub=1&mu=0
公共端口：" . $subUrl . "?sub=1&mu=1
订阅链接：" . $subInfo['ssr'] . "
// V2ray 订阅
公共端口：" . $subUrl . "?quantumult=1
订阅链接：" . $subInfo['quantumult_v2'] . "
```";
break;
case 'quantumult_conf':
$msg = "```
// 导入 ss、ssr、v2ray 以及分流规则的配置
个人端口[全部订阅]：" . $subUrl . "?quantumult=2&mu=0
公共端口[全部订阅]：" . $subUrl . "?quantumult=2&mu=1
// 使用自定义策略组的配置，类似 Surge
个人端口[全部订阅]：" . $subUrl . "?quantumult=3&mu=0
公共端口[全部订阅]：" . $subUrl . "?quantumult=3&mu=1
订阅链接：" . $subInfo['quantumult_sub'] . "
// 使用自定义策略组的配置，类似 Surge、Clash
订阅链接：" . $subInfo['quantumult_conf'] . "
```";
break;
case 'shadowrocket':
$msg = "```
// ssr 订阅
个人端口：" . $subUrl . "?sub=1&mu=0
公共端口：" . $subUrl . "?sub=1&mu=1
订阅链接：" . $subInfo['ssr'] . "
// v2ray 订阅
订阅链接：" . $subInfo['v2ray'] . "
// 合并订阅，包含 ss、ssr、v2ray
个人端口：" . $subUrl . "?sub=5&mu=0
公共端口：" . $subUrl . "?sub=5&mu=1
订阅链接：" . $subInfo['v2ray_ss_ssr'] . "
```";
break;
default:
Expand Down
Loading