hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复编辑站点配置后路由规则缓存bug

pull/41/head
devlike 2018-02-21 20:49:13 +08:00
parent 2808709fd3
commit 8b6fd6e2cf
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
application/common/model/Sites.php
View File

@ -44,34 +44,20 @@ class Sites extends Model
if (empty($v['domain']) && empty($v['url'])) continue; if (empty($v['domain']) && empty($v['url'])) continue;
if($v['domain']=='www') continue; if($v['domain']=='www') continue;
//只绑定一种语言,设置为默认语言 $multilang = explode(',', $v['lang']);
if(!strpos(',', $v['lang'])) { foreach ($multilang as $key => $lang) {
$vars = '?user_site_id=' . $v['id'] . '&lang=' . $v['lang']; $vars = '?user_site_id=' . $v['id'] . '&lang=' . $lang;
if (!empty($v['domain'])) { if (!empty($v['domain'])) {
$rules[] = ['s' => $v['domain'], 'p' => $vars]; $rules[] = ['s' => ($lang != 'zh-cn'?$lang.'.':'') . $v['domain'], 'p' => 'index'.$vars];
$rules[] = ['s' => 'admin.'.$v['domain'], 'p' => 'admin'.$vars];
} }
if (!empty($v['url'])) { if (!empty($v['url'])) {
$rules[] = ['s' => $v['url'], 'p' => $vars]; $rules[] = ['s' => ($lang != 'zh-cn'?$lang.'.':'') . $v['url'], 'p' => 'index'.$vars];
} }
} }
else{
$multilang = explode(',', $v['lang']);
foreach ($multilang as $key => $lang) {
if ($lang != 'zh-cn') {
$vars = '?user_site_id=' . $v['id'] . '&lang=' . $lang;
if (!empty($v['domain'])) {
$rules[] = ['s' => $lang . '.' . $v['domain'], 'p' => $vars];
}
if (!empty($v['url'])) {
$rules[] = ['s' => $lang . '.' . $v['url'], 'p' => $vars];
}
}
}
}
\think\Cache::set('rules', $rules, 86400);
return $rules;
} }
\think\Cache::set('rules', $rules, 86400);
return $rules;
} }

5
extend/seven/behavior/BindDomain.php
View File

@ -20,8 +20,9 @@ class BindDomain
} }
foreach($rules as $k => $v){ foreach($rules as $k => $v){
Route::domain($v['s'], 'index'. $v['p']); Route::domain($v['s'], $v['p']);
Route::domain('admin.'.$v['s'], 'admin'. $v['p']); //Route::domain($v['s'], 'index'. $v['p']);
//Route::domain('admin.'.$v['s'], 'admin'. $v['p']);
} }
} }