chore(clash): update some fields

QuickEdition(No-js-Encryption)
GeekQu 6 years ago
parent 28213af6ba
commit 53e817431c

@ -358,6 +358,17 @@ class ConfController extends BaseController
*/ */
public static function getClashConfs($User, $AllProxys, $Configs, $local = false) public static function getClashConfs($User, $AllProxys, $Configs, $local = false)
{ {
$confStr = [
'Proxy' => 'proxies',
'ProxyGroup' => 'proxy-groups',
];
if (isset($_GET['newconf']) && (int) $_GET['newconf'] == 0) {
$confStr = [
'Proxy' => 'Proxy',
'ProxyGroup' => 'Proxy Group',
];
}
if (isset($Configs['Proxy']) || count($Configs['Proxy']) != 0) { if (isset($Configs['Proxy']) || count($Configs['Proxy']) != 0) {
$tmpProxys = array_merge($AllProxys, $Configs['Proxy']); $tmpProxys = array_merge($AllProxys, $Configs['Proxy']);
} else { } else {
@ -369,14 +380,14 @@ class ConfController extends BaseController
$Proxys[] = $Proxy; $Proxys[] = $Proxy;
} }
$tmp = self::getClashConfGeneral($Configs['General']); $tmp = self::getClashConfGeneral($Configs['General']);
$tmp['Proxy'] = $Proxys; $tmp[$confStr['Proxy']] = $Proxys;
if (isset($Configs['ProxyGroup'])) { if (isset($Configs['ProxyGroup'])) {
$tmp['Proxy Group'] = self::getClashConfProxyGroup( $tmp[$confStr['ProxyGroup']] = self::getClashConfProxyGroup(
$AllProxys, $AllProxys,
$Configs['ProxyGroup'] $Configs['ProxyGroup']
); );
} else { } else {
$tmp['Proxy Group'] = self::getClashConfProxyGroup( $tmp[$confStr['ProxyGroup']] = self::getClashConfProxyGroup(
$AllProxys, $AllProxys,
$Configs['Proxy Group'] $Configs['Proxy Group']
); );
@ -475,14 +486,19 @@ class ConfController extends BaseController
*/ */
public static function getClashConfRule($Rules, $local) public static function getClashConfRule($Rules, $local)
{ {
$confStr = 'rules';
if (isset($_GET['newconf']) && (int) $_GET['newconf'] == 0) {
$confStr = 'Rule';
}
$return = ($confStr . ':' . PHP_EOL);
// 加载本地规则文件 // 加载本地规则文件
if ($local) { if ($local) {
$render = ConfRender::getTemplateRender(); $render = ConfRender::getTemplateRender();
return $render->fetch(trim($Rules['source'])); return $return . $render->fetch(trim($Rules['source']));
} }
// 加载远程规则文件 // 加载远程规则文件
$return = ('Rule:' . PHP_EOL);
if (isset($Rules['source']) && $Rules['source'] != '') { if (isset($Rules['source']) && $Rules['source'] != '') {
$sourceURL = trim($Rules['source']); $sourceURL = trim($Rules['source']);
// 远程规则仅支持 github 以及 gitlab // 远程规则仅支持 github 以及 gitlab
@ -500,10 +516,10 @@ class ConfController extends BaseController
} catch (ParseException $exception) { } catch (ParseException $exception) {
$sourceRule['error'] = printf('无法解析 YAML 字符串: %s', $exception->getMessage()); $sourceRule['error'] = printf('无法解析 YAML 字符串: %s', $exception->getMessage());
} }
if (isset($sourceRule['error']) || !isset($sourceRule['Rule'])) { if (isset($sourceRule['error']) || !isset($sourceRule[$confStr])) {
$return .= $sourceContent; $return .= $sourceContent;
} else { } else {
$return .= Yaml::dump($sourceRule['Rule'], 4, 2); $return .= Yaml::dump($sourceRule[$confStr], 4, 2);
} }
} }
} else { } else {

@ -964,9 +964,25 @@ class LinkController extends BaseController
$ProxyGroups = ConfController::getClashProxyGroup2String($ProxyGroups); $ProxyGroups = ConfController::getClashProxyGroup2String($ProxyGroups);
} }
$confStr = [
'mode' => 'rule',
'Proxy' => 'proxies',
'ProxyGroup' => 'proxy-groups',
'Rule' => 'rules',
];
if (isset($opts['newconf']) && (int) $opts['newconf'] == 0) {
$confStr = [
'mode' => 'Rule',
'Proxy' => 'Proxy',
'ProxyGroup' => 'Proxy Group',
'Rule' => 'Rule',
];
}
$render = ConfRender::getTemplateRender(); $render = ConfRender::getTemplateRender();
$render->assign('user', $user) $render->assign('user', $user)
->assign('userapiUrl', $userapiUrl) ->assign('userapiUrl', $userapiUrl)
->assign('confStr', $confStr)
->assign('opts', $opts) ->assign('opts', $opts)
->assign('Proxys', $Proxys) ->assign('Proxys', $Proxys)
->assign('ProxyGroups', $ProxyGroups) ->assign('ProxyGroups', $ProxyGroups)

@ -17,7 +17,7 @@ redir-port: {if array_key_exists("redir-port",$opts)}{$opts['redir-port']}{else}
allow-lan: true allow-lan: true
# 规则模式:Rule(规则) / Global(全局代理)/ Direct(全局直连) # 规则模式:Rule(规则) / Global(全局代理)/ Direct(全局直连)
mode: Rule mode: {$confStr['mode']}
# 设置日志输出级别 (默认级别:silent,即不输出任何内容,以避免因日志内容过大而导致程序内存溢出)。 # 设置日志输出级别 (默认级别:silent,即不输出任何内容,以避免因日志内容过大而导致程序内存溢出)。
# 5 个级别:silent / info / warning / error / debug。级别越高日志输出量越大,越倾向于调试,若需要请自行开启。 # 5 个级别:silent / info / warning / error / debug。级别越高日志输出量越大,越倾向于调试,若需要请自行开启。
@ -56,15 +56,16 @@ secret: '{if array_key_exists("secret",$opts)}{$opts['secret']}{else}{/if}'
# (2) 如果您不在乎可能解析到污染的结果,更加追求速度。请将 nameserver 列表的服务器插入至 fallback 列表内,并移除重复项。 # (2) 如果您不在乎可能解析到污染的结果,更加追求速度。请将 nameserver 列表的服务器插入至 fallback 列表内,并移除重复项。
{/if} {/if}
Proxy: {$confStr['Proxy']}:
{foreach $Proxys as $Proxy} {foreach $Proxys as $Proxy}
- {json_encode($Proxy,320)} - {json_encode($Proxy,320)}
{/foreach} {/foreach}
Proxy Group: {$confStr['ProxyGroup']}:
{$ProxyGroups} {$ProxyGroups}
# 规则 # 规则
{$confStr['Rule']}:
{if $Profiles == 'ConnersHua_Pro'} {if $Profiles == 'ConnersHua_Pro'}
{include file='rule/ConnersHua_Pro.yaml'} {include file='rule/ConnersHua_Pro.yaml'}
{elseif $Profiles == 'ConnersHua_BacktoCN'} {elseif $Profiles == 'ConnersHua_BacktoCN'}

@ -1,4 +1,3 @@
Rule:
# (Video) # (Video)
# AcFun # AcFun
# USER-AGENT,AcFun*,PROXY # USER-AGENT,AcFun*,PROXY

@ -1,4 +1,3 @@
Rule:
# Feeb # Feeb
- DOMAIN-KEYWORD,epochtimes,REJECT - DOMAIN-KEYWORD,epochtimes,REJECT
- DOMAIN-SUFFIX,881903.com,REJECT - DOMAIN-SUFFIX,881903.com,REJECT

@ -1,4 +1,3 @@
Rule:
# (GlobalTV) # (GlobalTV)
# > ABC # > ABC
- DOMAIN-SUFFIX,edgedatg.com,GlobalTV - DOMAIN-SUFFIX,edgedatg.com,GlobalTV
@ -798,4 +797,4 @@ Rule:
# GeoIP China # GeoIP China
- GEOIP,CN,Domestic - GEOIP,CN,Domestic
- MATCH,Others - MATCH,Others

Loading…
Cancel
Save