From 8b6fd6e2cfab3cdc212fe9c9a6bce80bf77ddba2 Mon Sep 17 00:00:00 2001
From: devlike <devlike@163.com>
Date: Wed, 21 Feb 2018 20:49:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E9=85=8D=E7=BD=AE=E5=90=8E=E8=B7=AF=E7=94=B1=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E7=BC=93=E5=AD=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/model/Sites.php   | 30 ++++++++--------------------
 extend/seven/behavior/BindDomain.php |  5 +++--
 2 files changed, 11 insertions(+), 24 deletions(-)

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']);
         }
     }