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

update from NimaQu #106

Closed
wants to merge 3 commits into from
Closed

update from NimaQu #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b791e6
SS配置文件优化
Jiaswa May 26, 2018
ca37856
修复SS链接只导入一个节点
Jiaswa May 26, 2018
0b4691d
Update README.md
tonyzzzzzz May 28, 2018
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
7 changes: 5 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ Wiki已经启用，欢迎为此面板维护wiki

##### NimaQu


- [魔方云 - 低成本极速高效 专属您的私有云](https://www.cubecloud.net/aff.php?aff=796)


Expand All @@ -93,5 +92,9 @@ Wiki已经启用，欢迎为此面板维护wiki

##### Miku


- [qazCloud | 高速云端数据传输服务](https://www.qaz.cloud)

##### Tony Zou

- [PumpCloud - HKBN等线路](https://pumpcloud.net/clientarea/aff.php?aff=229)
- [KDataCenter - 韩国KT线路](https://www.kdatacenter.com/myportal/?affid=303)
11 changes: 10 additions & 1 deletion app/Controllers/LinkController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ public static function GetPcConf($user, $is_mu = 0, $is_ss = 0)
"protocolparam"=>$item['protocol_param'],
"obfs_udp"=>false,
"enable"=>true));
} else {
} elseif ($is_ss != 0 && (strpos('$user->obfs','obfs') !== false)) {
array_push($temparray, array("server"=>$item['address'],
"server_port"=>$item['port'],
"password"=>$item['passwd'],
Expand All @@ -407,6 +407,15 @@ public static function GetPcConf($user, $is_mu = 0, $is_ss = 0)
"plugin_opts"=>URL::getSurgeObfs($item).";obfs-host=wns.windows.com",
"remarks"=>$item['remark'],
"timeout"=>5));
} else {
array_push($temparray, array("server"=>$item['address'],
"server_port"=>$item['port'],
"password"=>$item['passwd'],
"method"=>$item['method'],
"plugin"=>"",
"plugin_opts"=>"",
"remarks"=>$item['remark'],
"timeout"=>5));
}
}

Expand Down
4 changes: 2 additions & 2 deletions app/Utils/URL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ public static function getItemUrl($item, $is_ss) {
if($is_ss == 2) {
$personal_info = $item['method'].':'.$item['passwd']."@".$item['address'].":".$item['port'];
$ssurl = "ss://".Tools::base64_url_encode($personal_info);
$ssurl .= "#".rawurlencode(Config::get('appName')." - ".$item['remark']);
$ssurl .= "#".rawurlencode(Config::get('appName')." - ".$item['remark'])."\n";
}else{
$personal_info = $item['method'].':'.$item['passwd'];
$ssurl = "ss://".Tools::base64_url_encode($personal_info)."@".$item['address'].":".$item['port'];
Expand All @@ -245,7 +245,7 @@ public static function getItemUrl($item, $is_ss) {
}
$ssurl .= "?plugin=".rawurlencode($plugin);
}
$ssurl .= "#".rawurlencode(Config::get('appName')." - ".$item['remark']);
$ssurl .= "#".rawurlencode(Config::get('appName')." - ".$item['remark'])."\n";
}
return $ssurl;
}
Expand Down