Browse Source

移除SSD

TheCGDF 5 years ago
parent
commit
f713a7f80d

+ 1 - 2
README.md

@@ -123,10 +123,9 @@ SSPanel UIM 离不开所有 [贡献代码](https://github.com/Anankke/SSPanel-Ui
 
 - 添加 Telegram OAuth
 
-[**CGDF**](https://github.com/CGDF-GitHub)
+[**CGDF**](https://github.com/TheCGDF)
 
 - xcat 一键 update
-- 适配 SSD
 - 用户列表分页加载
 
 [**CHEN**](https://github.com/ChenSee)

+ 1 - 1
config/.config.example.php

@@ -427,7 +427,7 @@ $_ENV['userCenterClient']     = [
 
 
 //新旧首页设置--------------------------------------------------------------------------------------------
-$_ENV['newIndex'] = true;	//使用新的 Node.js 开发的首页请填写 true,其他值为使用先前的首页,如您使用其他主题请保持 true
+$_ENV['newIndex'] = false;	//使用新的 Node.js 开发的首页请填写 true,其他值为使用先前的首页,如您使用其他主题请保持 true
 
 
 //节点检测-----------------------------------------------------------------------------------------------

+ 9 - 9
resources/views/material/user/edit.tpl

@@ -44,11 +44,11 @@
                         <div class="card-inner">
                             <div class="card-inner">
                                 <div class="card-heading">选择客户端</div>
-                                <p>SS/SSD/SSR 支持的加密方式和混淆方式有所不同,请根据实际情况来进行选择</p>
+                                <p>SS/SSR 支持的加密方式和混淆方式有所不同,请根据实际情况来进行选择</p>
                                 <p>在这里选择你需要使用的客户端可以帮助你筛选加密方式和混淆方式</p>
                                 <p>auth_chain 系为实验性协议,可能造成不稳定或无法使用</p>
                                 <br>
-                                <button class="btn btn-subscription" type="button" id="filter-btn-ss">SS/SSD</button>
+                                <button class="btn btn-subscription" type="button" id="filter-btn-ss">SS</button>
                                 <button class="btn btn-subscription" type="button" id="filter-btn-ssr">SSR</button>
                                 <button class="btn btn-subscription" type="button" id="filter-btn-universal">通用</button>
                             </div>
@@ -58,7 +58,7 @@
                                     <button class="btn btn-flat" id="method-update"><span class="icon">check</span>&nbsp</button>
                                 </div>
                                 <p>
-                                    当前加密方式:<code id="ajax-user-method" data-default="method">[{if URL::CanMethodConnect($user->method) == 2}SS/SSD{else}SS/SSR{/if}可连接] {$user->method}</code>
+                                    当前加密方式:<code id="ajax-user-method" data-default="method">[{if URL::CanMethodConnect($user->method) == 2}SS{else}SS/SSR{/if}可连接] {$user->method}</code>
                                 </p>
                                 <div class="form-group form-group-label control-highlight-custom dropdown">
                                     <label class="floating-label" for="method">加密方式</label>
@@ -70,7 +70,7 @@
                                             <li class="{if URL::CanMethodConnect($user->method) == 2}filter-item-ss{else}filter-item-universal{/if}">
                                                 <a href="#" class="dropdown-option" onclick="return false;"
                                                    val="{$method}"
-                                                   data="method">[{if URL::CanMethodConnect($method) == 2}SS/SSD{else}SS/SSR{/if}
+                                                   data="method">[{if URL::CanMethodConnect($method) == 2}SS{else}SS/SSR{/if}
                                                     可连接] {$method}</a>
                                             </li>
                                         {/foreach}
@@ -83,7 +83,7 @@
                                     <div class="card-heading">协议&混淆设置</div>
                                     <button class="btn btn-flat" id="ssr-update"><span class="icon">check</span>&nbsp;</button>
                                 </div>
-                                <p>当前协议:<code id="ajax-user-protocol" data-default="protocol">[{if URL::CanProtocolConnect($user->protocol) == 3}SS/SSD/SSR{else}SSR{/if}可连接] {$user->protocol}</code></p>
+                                <p>当前协议:<code id="ajax-user-protocol" data-default="protocol">[{if URL::CanProtocolConnect($user->protocol) == 3}SS/SSR{else}SSR{/if}可连接] {$user->protocol}</code></p>
                                 <div class="form-group form-group-label control-highlight-custom dropdown">
                                     <label class="floating-label" for="protocol">协议</label>
                                     <button id="protocol" class="form-control maxwidth-edit" data-toggle="dropdown"
@@ -93,7 +93,7 @@
                                         {foreach $protocol_list as $protocol}
                                             <li class="{if URL::CanProtocolConnect($protocol) == 3}filter-item-universal{else}filter-item-ssr{/if}">
                                                 <a href="#" class="dropdown-option" onclick="return false;" val="{$protocol}" data="protocol">
-                                                    [{if URL::CanProtocolConnect($protocol) == 3}SS/SSD/SSR{else}SSR{/if}
+                                                    [{if URL::CanProtocolConnect($protocol) == 3}SS/SSR{else}SSR{/if}
                                                     可连接] {$protocol}
                                                 </a>
                                             </li>
@@ -104,8 +104,8 @@
                             </div>
 
                             <div class="card-inner">
-                                <p>当前混淆方式:<code id="ajax-user-obfs" data-default="obfs">[{if URL::CanObfsConnect($user->obfs) >= 3}SS/SSD/SSR{elseif URL::CanObfsConnect($user->obfs) == 1}SSR{else}SS/SSD{/if}可连接] {$user->obfs}</code></p>
-                                <p>SS/SSD 和 SSR 支持的混淆类型有所不同,simple_obfs_* 为 SS/SSD 的混淆方式,其他为 SSR 的混淆方式</p>
+                                <p>当前混淆方式:<code id="ajax-user-obfs" data-default="obfs">[{if URL::CanObfsConnect($user->obfs) >= 3}SS/SSR{elseif URL::CanObfsConnect($user->obfs) == 1}SSR{else}SS{/if}可连接] {$user->obfs}</code></p>
+                                <p>SS 和 SSR 支持的混淆类型有所不同,simple_obfs_* 为 SS 的混淆方式,其他为 SSR 的混淆方式</p>
                                 <div class="form-group form-group-label control-highlight-custom dropdown">
                                     <label class="floating-label" for="obfs">混淆方式</label>
                                     <button id="obfs" class="form-control maxwidth-edit" data-toggle="dropdown" value="{$user->obfs}"></button>
@@ -114,7 +114,7 @@
                                         {foreach $obfs_list as $obfs}
                                             <li class="{if URL::CanObfsConnect($obfs) >= 3}filter-item-universal{else}{if URL::CanObfsConnect($obfs) == 1}filter-item-ssr{else}filter-item-ss{/if}{/if}">
                                                 <a href="#" class="dropdown-option" onclick="return false;" val="{$obfs}" data="obfs">
-                                                    [{if URL::CanObfsConnect($obfs) >= 3}SS/SSD/SSR{else}{if URL::CanObfsConnect($obfs) == 1}SSR{else}SS/SSD{/if}{/if}可连接] {$obfs}
+                                                    [{if URL::CanObfsConnect($obfs) >= 3}SS/SSR{else}{if URL::CanObfsConnect($obfs) == 1}SSR{else}SS{/if}{/if}可连接] {$obfs}
                                                 </a>
                                             </li>
                                         {/foreach}

+ 12 - 52
resources/views/material/user/index.tpl

@@ -472,26 +472,8 @@ table tr td:first-child {
                                                         使用方式:
                                                         <a id="win_ss" class="copy-config btn-dl" onclick=Copyconfig("/user/getUserAllURL?type=ss","#win_ss","")><i class="material-icons icon-sm">send</i> 拷贝全部节点 URL</a>
                                                     </p>
-												<hr/>
-												<p><span class="icon icon-lg text-white">filter_2</span> SSD - [ SS ]:</p>
-													<p>
-                                                        应用下载:
-                                                        <a class="btn-dl" href="{if $config["subscribe_client"]===true}{if $config["subscribe_client_url"]==''}/user/getPcClient{else}{$config["subscribe_client_url"]}/getClient/{$getClient}{/if}?type=ssd-win{else}/ssr-download/ssd-win.7z{/if}"><i class="material-icons icon-sm">cloud_download</i> 本站下载【高速】</a>
-                                                        .
-                                                        <a class="btn-dl" href="https://github.com/CGDF-Github/SSD-Windows/releases"><i class="material-icons icon-sm">cloud_download</i> 官方下载</a>
-                                                    </p>
-                                                    <p>
-                                                        使用教程:
-                                                        <a class="btn-dl" href="{if $config['use_this_doc'] === false}/user/tutorial{else}/doc/#/Windows/ShadowsocksD{/if}"><i class="material-icons icon-sm">turned_in_not</i> 点击查看</a>
-                                                    </p>
-													<p>
-                                                        使用方式:
-                                                        <a class="copy-text btn-dl" data-clipboard-text="{$subInfo['ssd']}"><i class="material-icons icon-sm">send</i> 拷贝订阅链接</a>
-                                                        .
-                                                        <a id="win_ssd" class="copy-config btn-dl" onclick=Copyconfig("/user/getUserAllURL?type=ssd","#win_ssd","")><i class="material-icons icon-sm">send</i> 拷贝全部节点 URL</a>
-                                                    </p>
-												<hr/>
-												<p><span class="icon icon-lg text-white">filter_3</span> SSR(R) - [ SS/SSR ]:</p>
+												<hr/>											
+												<p><span class="icon icon-lg text-white">filter_2</span> SSR(R) - [ SS/SSR ]:</p>
 													<p>
                                                         应用下载:
                                                         <a class="btn-dl" href="{if $config["subscribe_client"]===true}{if $config["subscribe_client_url"]==''}/user/getPcClient{else}{$config["subscribe_client_url"]}/getClient/{$getClient}{/if}?type=ssr-win{else}/ssr-download/ssr-win.7z{/if}"><i class="material-icons icon-sm">cloud_download</i> 本站下载【高速】</a>
@@ -510,7 +492,7 @@ table tr td:first-child {
                                                     </p>
 												<hr/>
 
-												<p><span class="icon icon-lg text-white">filter_4</span> SSTap - [ SS/SSR ]:</p>
+												<p><span class="icon icon-lg text-white">filter_3</span> SSTap - [ SS/SSR ]:</p>
 													<p>
                                                         应用下载:
                                                         <a class="btn-dl" href="/ssr-download/SSTap.7z"><i class="material-icons icon-sm">cloud_download</i> 本站下载【高速】</a>
@@ -525,7 +507,7 @@ table tr td:first-child {
                                                     </p>
 												<hr/>
 
-												<p><span class="icon icon-lg text-white">filter_5</span> V2RayN - [ SS/VMess ]:</p>
+												<p><span class="icon icon-lg text-white">filter_4</span> V2RayN - [ SS/VMess ]:</p>
 													<p>
                                                         应用下载:
                                                         <a class="btn-dl" href="{if $config["subscribe_client"]===true}{if $config["subscribe_client_url"]==''}/user/getPcClient{else}{$config["subscribe_client_url"]}/getClient/{$getClient}{/if}?type=v2rayn-win{else}/ssr-download/v2rayn.zip{/if}"><i class="material-icons icon-sm">cloud_download</i> 本站下载【高速】</a>
@@ -543,7 +525,7 @@ table tr td:first-child {
                                                         <a id="win_v2rayn" class="copy-config btn-dl" onclick=Copyconfig("/user/getUserAllURL?type=v2ray","#win_v2rayn","")><i class="material-icons icon-sm">send</i> 拷贝全部节点 URL</a>
                                                     </p>
 												<hr/>
-												<p><span class="icon icon-lg text-white">filter_6</span> Clash for Windows - [ SS/VMess/Trojan ]:</p>
+												<p><span class="icon icon-lg text-white">filter_5</span> Clash for Windows - [ SS/VMess/Trojan ]:</p>
 													<p>
                                                         应用下载:
                                                         <a class="btn-dl" href="/ssr-download/Clash-Windows.7z"><i class="material-icons icon-sm">cloud_download</i> 本站下载【高速】</a>
@@ -561,7 +543,7 @@ table tr td:first-child {
                                                         <a class="btn-dl" href="clash://install-config?url={urlencode($subInfo['clash'])}"><i class="material-icons icon-sm">send</i> 配置一键导入</a>
                                                     </p>
                                             	<hr/>
-												<p><span class="icon icon-lg text-white">filter_7</span> ClashR for Windows - [ SS/SSR/VMess ]:</p>
+												<p><span class="icon icon-lg text-white">filter_6</span> ClashR for Windows - [ SS/SSR/VMess ]:</p>
 													<p>
                                                         应用下载:
                                                         <a class="btn-dl" href="#"><i class="material-icons icon-sm">cloud_download</i> 暂无下载</a>
@@ -841,30 +823,8 @@ table tr td:first-child {
                                                         使用方式:
                                                         <a class="copy-text btn-dl" data-clipboard-text="{$subInfo['ssa']}"><i class="material-icons icon-sm">send</i> 拷贝该应用专属订阅链接</a>
                                                     </p>
-												<hr/>
-												<p><span class="icon icon-lg text-white">filter_2</span> SSD - [ SS ]:</p>
-													<p>
-                                                        应用下载:
-                                                        <a class="btn-dl" href="/ssr-download/ssd-android.apk"><i class="material-icons icon-sm">cloud_download</i> 本站下载【高速】</a>
-                                                        .
-                                                        <a class="btn-dl" href="https://github.com/CGDF-Github/SSD-Android/releases"><i class="material-icons icon-sm">cloud_download</i> 官方下载</a>
-                                                    </p>
-													<p>
-                                                        插件下载:
-                                                        <a class="btn-dl" href="/ssr-download/ss-android-obfs.apk"><i class="material-icons icon-sm">cloud_download</i> 「必须」obfs 插件本站下载【高速】</a>
-                                                    </p>
-                                                    <p>
-                                                        使用教程:
-                                                        <a class="btn-dl" href="{if $config['use_this_doc'] === false}/user/tutorial{else}/doc/#/Android/ShadowsocksD{/if}"><i class="material-icons icon-sm">turned_in_not</i> 点击查看</a>
-                                                    </p>
-													<p>
-                                                        使用方式:
-                                                        <a class="copy-text btn-dl" data-clipboard-text="{$subInfo['ssd']}"><i class="material-icons icon-sm">send</i> 拷贝该应用专属订阅链接</a>
-                                                        .
-                                                        <a id="android_ssd" class="copy-config btn-dl" onclick=Copyconfig("/user/getUserAllURL?type=ssd","#android_ssd","")><i class="material-icons icon-sm">send</i> 拷贝全部节点 URL</a>
-                                                    </p>
-												<hr/>
-												<p><span class="icon icon-lg text-white">filter_3</span> SSR(R) - [ SSR ]:</p>
+												<hr/>												
+												<p><span class="icon icon-lg text-white">filter_2</span> SSR(R) - [ SSR ]:</p>
 													<p>
                                                         应用下载:
                                                         <a class="btn-dl" href="/ssr-download/ssr-android.apk"><i class="material-icons icon-sm">cloud_download</i> SSR 本站下载【高速】</a>
@@ -880,7 +840,7 @@ table tr td:first-child {
                                                         <a class="copy-text btn-dl" data-clipboard-text="{$subInfo['ssr']}"><i class="material-icons icon-sm">send</i> 拷贝订阅链接</a>
                                                     </p>
 												<hr/>
-												<p><span class="icon icon-lg text-white">filter_4</span> V2RayNG - [ SS/VMess ]:</p>
+												<p><span class="icon icon-lg text-white">filter_3</span> V2RayNG - [ SS/VMess ]:</p>
 													<p>
                                                         应用下载:
                                                         <a class="btn-dl" href="/ssr-download/v2rayng.apk"><i class="material-icons icon-sm">cloud_download</i> 本站下载【高速】</a>
@@ -896,7 +856,7 @@ table tr td:first-child {
                                                         <a class="copy-text btn-dl" data-clipboard-text="{$subInfo['v2ray']}"><i class="material-icons icon-sm">send</i> 拷贝订阅链接</a>
                                                     </p>
 												<hr/>
-												<p><span class="icon icon-lg text-white">filter_5</span> Surfboard - [ SS/VMess ]:</p>
+												<p><span class="icon icon-lg text-white">filter_4</span> Surfboard - [ SS/VMess ]:</p>
 												    <p>该客户端新版本支持 V2Ray 节点,如您遇到配置解析错误等情况,请尝试升级客户端.</p>
 													<p>
                                                         应用下载:
@@ -913,7 +873,7 @@ table tr td:first-child {
                                                         <a class="btn-dl" href="{$subInfo['surfboard']}"><i class="material-icons icon-sm">send</i> 配置文件下载</a>
                                                     </p>
 												<hr/>
-												<p><span class="icon icon-lg text-white">filter_6</span> Kitsunebi - [ SS/VMess ]:</p>
+												<p><span class="icon icon-lg text-white">filter_5</span> Kitsunebi - [ SS/VMess ]:</p>
 												    <p>该客户端专属订阅链接支持同时订阅 SS 和 V2Ray 节点.</p>
 													<p>
                                                         应用下载:
@@ -931,7 +891,7 @@ table tr td:first-child {
                                                         <a class="copy-text btn-dl" data-clipboard-text="{$subInfo['kitsunebi']}"><i class="material-icons icon-sm">send</i> 拷贝该应用专属订阅链接</a>
                                                     </p>
                                                 <hr/>
-                                                    <p><span class="icon icon-lg text-white">filter_7</span> Clash for Android - [ SS/VMess ]:</p>
+                                                    <p><span class="icon icon-lg text-white">filter_6</span> Clash for Android - [ SS/VMess ]:</p>
 													<p>
                                                         应用下载:
                                                         <a class="btn-dl" href="https://play.google.com/store/apps/details?id=com.github.kr328.clash"><i class="material-icons icon-sm">cloud_download</i> Google Play 下载</a>

+ 0 - 1
resources/views/material/user/markdown/ssd-android.md

@@ -1 +0,0 @@
-打开 ShadowsocksD,点击右上角的“加号”,选择“添加订阅”,将剪贴板中的内容粘贴进去,点击“OK”,稍等片刻即可看见订阅的节点

+ 0 - 4
resources/views/material/user/markdown/ssd-windows.md

@@ -1,4 +0,0 @@
-1. 下载 SSD,解压至任意磁盘并运行
-2. 任务栏右下角右键纸飞机图标->服务器订阅->SSD服务器订阅设置,将订阅链接设置为下面的地址,确定之后再更新SSD服务器订阅
-3. 然后选择一个合适的服务器,代理规则选“绕过局域网和大陆”,然后即可上网
-4. 备用导入节点方法:复制节点链接,然后右键小飞机->从剪贴板复制地址

+ 1 - 31
resources/views/material/user/tutorial.tpl

@@ -82,7 +82,7 @@ Tab 负责控制 SSR / SS / V2Ray 的容器的切换。Tab 条目位于 ul.nav.n
                                             <a class="" data-toggle="tab" href="#tutorial_ssr"><i class="icon icon-lg">airplanemode_active</i>&nbsp;SSR</a>
                                         </li>
                                         <li>
-                                            <a class="" data-toggle="tab" href="#tutorial_ss"><i class="icon icon-lg">flight_takeoff</i>&nbsp;SS/SSD</a>
+                                            <a class="" data-toggle="tab" href="#tutorial_ss"><i class="icon icon-lg">flight_takeoff</i>&nbsp;SS</a>
                                         </li>
                                         <li>
                                             <a class="" data-toggle="tab" href="#tutorial_v2ray"><i class="icon icon-lg">flight_land</i>&nbsp;V2RAY</a>
@@ -232,21 +232,6 @@ Tab 负责控制 SSR / SS / V2Ray 的容器的切换。Tab 条目位于 ul.nav.n
 
                                 <div class="tab-pane fade page-course" id="tutorial_ss">
 
-                                    <div class="tile tile-collapse">
-                                        <div data-toggle="tile" data-target="#tutorial-heading-ssdwin">
-                                            <div class="tile-inner">
-                                                <div class="text-overflow">ShadowsocksD Windows</div>
-                                            </div>
-                                        </div>
-                                        <div class="collapsible-region collapse" id="tutorial-heading-ssdwin">
-                                            <div class="tile-sub markdown-body">
-                                                <div id="tutorial-ssdwin-content"></div>
-                                                <script>
-                                                    document.getElementById('tutorial-ssdwin-content').innerHTML = marked(`{include file='user/markdown/ssd-windows.md'}`);
-                                                </script>
-                                            </div>
-                                        </div>
-                                    </div>
                                     <div class="tile tile-collapse">
                                         <div data-toggle="tile" data-target="#tutorial-heading-ssxng">
                                             <div class="tile-inner">
@@ -277,21 +262,6 @@ Tab 负责控制 SSR / SS / V2Ray 的容器的切换。Tab 条目位于 ul.nav.n
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="tile tile-collapse">
-                                        <div data-toggle="tile" data-target="#tutorial-heading-ssd-android">
-                                            <div class="tile-inner">
-                                                <div class="text-overflow">ShadowsocksD Android</div>
-                                            </div>
-                                        </div>
-                                        <div class="collapsible-region collapse" id="tutorial-heading-ssd-android">
-                                            <div class="tile-sub markdown-body">
-                                                <div id="tutorial-ssd-android-content"></div>
-                                                <script>
-                                                    document.getElementById('tutorial-ssd-android-content').innerHTML = marked(`{include file='user/markdown/ssd-android.md'}`);
-                                                </script>
-                                            </div>
-                                        </div>
-                                    </div>
                                     <div class="tile tile-collapse">
                                         <div data-toggle="tile" data-target="#tutorial-heading-router-ss">
                                             <div class="tile-inner">

+ 0 - 8
src/Controllers/HomeController.php

@@ -240,14 +240,6 @@ class HomeController extends BaseController
                         '```'
                     ];
                     break;
-                case 'ssd':
-                    $msg = [
-                        '**订阅链接:**',
-                        '```',
-                        $subInfo['ssd'],
-                        '```'
-                    ];
-                    break;
                 case 'clash':
                     $msg = [
                         '**订阅链接:**[[点击下载配置]](' . $subInfo['clash'] . ')',

+ 2 - 67
src/Controllers/LinkController.php

@@ -132,7 +132,7 @@ class LinkController extends BaseController
                     $opts['sub'] = 3;
                     break;
                 case 3:
-                    $opts['ssd'] = 1;
+                    $opts['ssd'] = 1;//deprecated
                     break;
                 case 4:
                     $opts['clash'] = 1;
@@ -145,7 +145,7 @@ class LinkController extends BaseController
 
         $getBody = '';
 
-        $sub_type_array = ['list', 'ssd', 'clash', 'surge', 'surfboard', 'quantumult', 'quantumultx', 'sub'];
+        $sub_type_array = ['list', 'clash', 'surge', 'surfboard', 'quantumult', 'quantumultx', 'sub'];
         foreach ($sub_type_array as $key) {
             if (isset($opts[$key])) {
                 $query_value = $opts[$key];
@@ -212,13 +212,6 @@ class LinkController extends BaseController
                     'class'    => 'Lists'
                 ];
                 break;
-            case 'ssd':
-                $return = [
-                    'filename' => 'SSD',
-                    'suffix'   => 'txt',
-                    'class'    => 'SSD'
-                ];
-                break;
             case 'ssr':
                 $return = [
                     'filename' => 'SSR',
@@ -448,7 +441,6 @@ class LinkController extends BaseController
             'trojan'          => '?sub=4',
             // apps
             'ssa'             => '?list=ssa',
-            'ssd'             => '?ssd=1',
             'clash'           => '?clash=1',
             'clash_provider'  => '?list=clash',
             'clashr'          => '?clash=2',
@@ -827,63 +819,6 @@ class LinkController extends BaseController
         return ConfController::getClashConfs($user, $Proxys, $_ENV['Clash_Profiles'][$Profiles]);
     }
 
-    /**
-     * SSD 订阅
-     *
-     * @param User  $user 用户
-     * @param int   $ssd  订阅类型
-     * @param array $opts request
-     * @param array $Rule 节点筛选规则
-     *
-     * @return string
-     */
-    public static function getSSD($user, $ssd, $opts, $Rule)
-    {
-        if (!URL::SSCanConnect($user)) {
-            return null;
-        }
-        $array_all                  = [];
-        $array_all['airport']       = $_ENV['appName'];
-        $array_all['port']          = $user->port;
-        $array_all['encryption']    = $user->method;
-        $array_all['password']      = $user->passwd;
-        $array_all['traffic_used']  = Tools::flowToGB($user->u + $user->d);
-        $array_all['traffic_total'] = Tools::flowToGB($user->transfer_enable);
-        $array_all['expiry']        = $user->class_expire;
-        $array_all['url']           = self::getSubinfo($user, 0)['ssd'];
-        $plugin_options             = '';
-        if (strpos($user->obfs, 'http') != false) {
-            $plugin_options = 'obfs=http';
-        }
-        if (strpos($user->obfs, 'tls') != false) {
-            $plugin_options = 'obfs=tls';
-        }
-        if ($plugin_options != '') {
-            $array_all['plugin'] = 'simple-obfs';
-            $array_all['plugin_options'] = $plugin_options;
-            if ($user->obfs_param != '') {
-                $array_all['plugin_options'] .= ';obfs-host=' . $user->obfs_param;
-            }
-        }
-        $array_server = [];
-        $server_index = 1;
-        $Rule['type'] = 'ss';
-        $nodes = URL::getNew_AllItems($user, $Rule);
-        foreach ($nodes as $item) {
-            if ($item['type'] != 'ss') continue;
-            $server = AppURI::getSSDURI($item);
-            if ($server !== null) {
-                $server['id'] = $server_index;
-                $array_server[] = $server;
-                $server_index++;
-            }
-        }
-        $array_all['servers'] = $array_server;
-        $json_all = json_encode($array_all, 320);
-
-        return 'ssd://' . base64_encode($json_all);
-    }
-
     /**
      * 通用订阅,ssr & v2rayn
      *

+ 0 - 7
src/Controllers/UserController.php

@@ -1412,9 +1412,6 @@ class UserController extends BaseController
             case 'ssr':
                 $return .= URL::get_NewAllUrl($user, ['type' => 'ssr']) . PHP_EOL;
                 break;
-            case 'ssd':
-                $return .= LinkController::getSSD($user, 1, [], ['type' => 'ss']) . PHP_EOL;
-                break;
             case 'v2ray':
                 $return .= URL::get_NewAllUrl($user, ['type' => 'vmess']) . PHP_EOL;
                 break;
@@ -1482,10 +1479,6 @@ class UserController extends BaseController
                 $user_config_file_name = 'gui-config.json';
                 $content = ClientProfiles::getSSPcConf($this->user);
                 break;
-            case 'ssd-win':
-                $user_config_file_name = 'gui-config.json';
-                $content = ClientProfiles::getSSDPcConf($this->user);
-                break;
             case 'ssr-win':
                 $user_config_file_name = 'gui-config.json';
                 $content = ClientProfiles::getSSRPcConf($this->user);

+ 0 - 1
src/Controllers/VueController.php

@@ -112,7 +112,6 @@ class VueController extends BaseController
         $user->ssr_url_all_mu = URL::get_NewAllUrl($pre_user, ['type' => 'ssr', 'is_mu' => 1]);
         $user->ss_url_all = URL::get_NewAllUrl($pre_user, ['type' => 'ss']);
         $ssinfo = URL::getSSConnectInfo($pre_user);
-        $user->ssd_url_all = LinkController::getSSD($ssinfo, 1, [], ['type' => 'ss']);
         $user->vmess_url_all = URL::getAllVMessUrl($user);
         $user->isAbleToCheckin = $user->isAbleToCheckin();
         $ssr_sub_token = LinkController::GenerateSSRSubCode($this->user->id, 0);

+ 0 - 48
src/Utils/AppURI.php

@@ -483,54 +483,6 @@ class AppURI
         return $return;
     }
 
-    public static function getSSDURI(array $item)
-    {
-        $return = null;
-        switch ($item['type']) {
-            case 'ss':
-                # 666
-                $return['remarks']      = $item['remark'];
-                $return['server']       = $item['address'];
-                $return['port']         = $item['port'];
-                $return['encryption']   = $item['method'];
-                $return['password']     = $item['passwd'];
-                $plugin_options         = '';
-                if ($item['obfs'] != 'plain') {
-                    switch ($item['obfs']) {
-                        case 'simple_obfs_http':
-                            $return['plugin'] = 'simple-obfs';
-                            $plugin_options .= 'obfs=http;obfs-host=' . $item['obfs_param'];
-                            break;
-                        case 'simple_obfs_tls':
-                            $return['plugin'] = 'simple-obfs';
-                            $plugin_options .= 'obfs=tls;obfs-host=' . $item['obfs_param'];
-                            break;
-                        case 'v2ray':
-                            $return['plugin'] = 'v2ray';
-                            if ($item['net'] == 'ws') {
-                                $plugin_options .= 'mode=ws';
-                            }
-                            if ($item['tls'] == 'tls') {
-                                $plugin_options .= ';security=tls';
-                            } else {
-                                $plugin_options .= ';security=none';
-                            }
-                            $plugin_options .= ';path=' . $item['path'];
-                            if ($item['host'] != '') {
-                                $plugin_options .= ';host=' . $item['host'];
-                            } else {
-                                $plugin_options .= ';host=' . $item['address'];
-                            }
-                            break;
-                    }
-                }
-                $return['plugin_options'] = $plugin_options;
-                $return['ratio']          = $item['ratio'];
-                break;
-        }
-        return $return;
-    }
-
     public static function getSSJSON(array $item)
     {
         $return = null;

+ 0 - 127
src/Utils/ClientProfiles.php

@@ -166,133 +166,6 @@ class ClientProfiles
         return json_encode($config, JSON_PRETTY_PRINT);
     }
 
-    public static function getSSDPcConf($user)
-    {
-        $id = 1;
-        $proxy = [];
-        $items = URL::getNew_AllItems(
-            $user,
-            [
-                'type' => 'ss'
-            ]
-        );
-        foreach ($items as $item) {
-            $proxy_plugin = '';
-            $proxy_plugin_opts = '';
-            if ($item['obfs'] == 'v2ray' || in_array($item['obfs'], Config::getSupportParam('ss_obfs'))) {
-                if ($item['obfs'] == 'v2ray') {
-                    $proxy_plugin .= 'v2ray';
-                } else {
-                    $proxy_plugin .= 'simple-obfs';
-                }
-                if (strpos($item['obfs'], 'http') !== false) {
-                    $proxy_plugin_opts .= 'obfs=http';
-                } elseif (strpos($item['obfs'], 'tls') !== false) {
-                    $proxy_plugin_opts .= 'obfs=tls';
-                } else {
-                    $proxy_plugin_opts .= 'v2ray;' . $item['obfs_param'];
-                }
-                if ($item['obfs_param'] != '' && $item['obfs'] != 'v2ray') {
-                    $proxy_plugin_opts .= ';obfs-host=' . $item['obfs_param'];
-                }
-            }
-            $proxy[] = [
-                'remarks'          => $item['remark'],
-                'server'           => $item['address'],
-                'server_port'      => $item['port'],
-                'password'         => $item['passwd'],
-                'method'           => $item['method'],
-                'plugin'           => $proxy_plugin,
-                'plugin_opts'      => $proxy_plugin_opts,
-                'plugin_args'      => '',
-                'timeout'          => 5,
-                'id'               => $id,
-                'ratio'            => $item['ratio'],
-                'subscription_url' => LinkController::getSubinfo($user, 0)['ssd']
-            ];
-            $id++;
-        }
-        $plugin = '';
-        $plugin_opts = '';
-        if ($user->obfs == 'v2ray' || in_array($user->obfs, Config::getSupportParam('ss_obfs'))) {
-            if ($user->obfs == 'v2ray') {
-                $plugin .= 'v2ray';
-            } else {
-                $plugin .= 'simple-obfs';
-            }
-            if (strpos($user->obfs, 'http') !== false) {
-                $plugin_opts .= 'obfs=http';
-            } elseif (strpos($user->obfs, 'tls') !== false) {
-                $plugin_opts .= 'obfs=tls';
-            } else {
-                $plugin_opts .= 'v2ray;' . $user->obfs_param;
-            }
-            if ($user->obfs_param != '' && $user->obfs != 'v2ray') {
-                $plugin_opts .= ';obfs-host=' . $user->obfs_param;
-            }
-        }
-        $config = [
-            'configs'                => $proxy,
-            'strategy'               => null,
-            'index'                  => 0,
-            'global'                 => false,
-            'enabled'                => true,
-            'shareOverLan'           => false,
-            'isDefault'              => false,
-            'localPort'              => 1080,
-            'portableMode'           => true,
-            'pacUrl'                 => null,
-            'useOnlinePac'           => false,
-            'secureLocalPac'         => true,
-            'availabilityStatistics' => false,
-            'autoCheckUpdate'        => true,
-            'checkPreRelease'        => false,
-            'isVerboseLogging'       => false,
-            'logViewer'              => [
-                'topMost'         => false,
-                'wrapText'        => false,
-                'toolbarShown'    => false,
-                'Font'            => 'Consolas, 8pt',
-                'BackgroundColor' => 'Black',
-                'TextColor'       => 'White'
-            ],
-            'proxy' => [
-                'useProxy'     => false,
-                'proxyType'    => 0,
-                'proxyServer'  => '',
-                'proxyPort'    => 0,
-                'proxyTimeout' => 3
-            ],
-            'hotkey' => [
-                'SwitchSystemProxy'     => '',
-                'SwitchSystemProxyMode' => '',
-                'SwitchAllowLan'        => '',
-                'ShowLogs'              => '',
-                'ServerMoveUp'          => '',
-                'ServerMoveDown'        => '',
-                'RegHotkeysAtStartup'   => false
-            ],
-            'subscriptions' => [
-                [
-                    'airport'          => $_ENV['appName'],
-                    'encryption'       => $user->method,
-                    'password'         => $user->passwd,
-                    'port'             => $user->port,
-                    'expiry'           => $user->class_expire,
-                    'traffic_used'     => Tools::flowToGB($user->u + $user->d),
-                    'traffic_total'    => Tools::flowToGB($user->transfer_enable),
-                    'url'              => LinkController::getSubinfo($user, 0)['ssd'],
-                    'plugin'           => $plugin,
-                    'plugin_options'   => $plugin_opts,
-                    'plugin_arguments' => '',
-                    'use_proxy'        => false
-                ]
-            ]
-        ];
-
-        return json_encode($config, JSON_PRETTY_PRINT);
-    }
-
     public static function getV2RayNPcConf($user)
     {
         $subUrl = LinkController::getSubinfo($user, 0)['v2ray'];

+ 1 - 5
src/Utils/Telegram/Callbacks/Callback.php

@@ -910,11 +910,7 @@ class Callback
                 [
                     'text'          => 'SSR 订阅',
                     'callback_data' => 'user.subscribe|?sub=1'
-                ],
-                [
-                    'text'          => 'SSD 订阅',
-                    'callback_data' => 'user.subscribe|?ssd=1'
-                ],
+                ],        
             ],
             [
                 [

+ 0 - 1
src/Utils/TelegramProcess.php

@@ -16,7 +16,6 @@ class TelegramProcess
         'clean_link' => '重置订阅',
         '?mu=0' => 'SSR普通订阅',
         '?mu=1' => 'SSR单端口订阅',
-        '?mu=3' => 'SS/SSD订阅',
         '?mu=2' => 'V2ray订阅',
         '?mu=4' => 'Clash订阅'];