diff --git a/application/common/model/Sites.php b/application/common/model/Sites.php index fbd05660..36d15138 100644 --- a/application/common/model/Sites.php +++ b/application/common/model/Sites.php @@ -44,34 +44,20 @@ class Sites extends Model if (empty($v['domain']) && empty($v['url'])) continue; if($v['domain']=='www') continue; - //只绑定一种语言,设置为默认语言 - if(!strpos(',', $v['lang'])) { - $vars = '?user_site_id=' . $v['id'] . '&lang=' . $v['lang']; - + $multilang = explode(',', $v['lang']); + foreach ($multilang as $key => $lang) { + $vars = '?user_site_id=' . $v['id'] . '&lang=' . $lang; 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'])) { - $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; } diff --git a/extend/seven/behavior/BindDomain.php b/extend/seven/behavior/BindDomain.php index e53db439..b788c0ee 100644 --- a/extend/seven/behavior/BindDomain.php +++ b/extend/seven/behavior/BindDomain.php @@ -20,8 +20,9 @@ class BindDomain } foreach($rules as $k => $v){ - Route::domain($v['s'], 'index'. $v['p']); - Route::domain('admin.'.$v['s'], 'admin'. $v['p']); + Route::domain($v['s'], $v['p']); + //Route::domain($v['s'], 'index'. $v['p']); + //Route::domain('admin.'.$v['s'], 'admin'. $v['p']); } }