From 63ec3c43565b9967e2b8f27f43b569c9215aa93d Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Tue, 20 Oct 2020 10:12:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=9B=B4=E6=8E=A5=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E5=89=8D=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/route/index.php      |  5 ++++-
 app/common.php                 | 39 +++++++++++++++++++++++++++++++++-
 config/app.php                 |  5 ++++-
 route/app.php                  |  3 +--
 view/admin/common/_header.html |  3 ++-
 5 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/app/admin/route/index.php b/app/admin/route/index.php
index f3e9077..21f996c 100644
--- a/app/admin/route/index.php
+++ b/app/admin/route/index.php
@@ -1,2 +1,5 @@
 <?php
-use think\facade\Route;
\ No newline at end of file
+use think\facade\Route;
+Route::rule('a:uid', 'Post/read');
+Route::rule('i[:category_id]/s[:sub_category_id]/p[:page]', 'Index/index');
+
diff --git a/app/common.php b/app/common.php
index 5f7ce97..a8da43f 100644
--- a/app/common.php
+++ b/app/common.php
@@ -20,6 +20,7 @@ use think\File;
 use think\facade\Filesystem;
 use app\model\UploadFiles;
 use think\facade\Session;
+use think\app\Url;
 
 function json_message($data = [], $code = 0, $msg = '')
 {
@@ -256,4 +257,40 @@ function check_permission($key,$admin_id = null)
   }
 
   return false;
-}
\ No newline at end of file
+}
+
+
+/**
+ * 多应用下的url生成器
+ * 在这里的@后面跟随的首先被认为成应用名而不是源文档的域名(或子域名)
+ * 程序会尝试找到应用对应的域名来生成地址,如果没找到,则按照源文档的逻辑执行
+ * @param string $url 
+ * @param array $vars
+ * @param boolean $suffix
+ * @param boolean $domain
+ * @return void
+ */
+function app_url(string $url = '', array $vars = [], $suffix = true, $domain = false)
+{
+
+  $url_result = explode('@', $url);
+
+  // 在这里,@首先认为是应用名,而不是域名(或子域名)
+  if (isset($url_result[1])) {
+    $app_default_doamin = config('app.app_default_doamin');
+    if (empty($app_default_doamin)) {
+      $app_domain_bind = config('app.domain_bind');
+
+      if (!empty($app_domain_bind)) {
+        $app_default_doamin = array_flip($app_domain_bind);
+      }
+    }
+
+    if (isset($app_default_doamin[$url_result[1]]) && $app_default_doamin[$url_result[1]] != '*') {
+
+      $url = $url_result[0] . "@" . $app_default_doamin[$url_result[1]];
+    }
+  }
+
+  return url($url, $vars, $suffix, $domain);
+}
diff --git a/config/app.php b/config/app.php
index 2da750e..bd93738 100644
--- a/config/app.php
+++ b/config/app.php
@@ -23,11 +23,14 @@ return [
     'app_map'          => [],
     // 域名绑定（自动多应用模式有效）
     'domain_bind'      => [
-      'www'=>'index',
       '*'=>'index',
+      'www'=>'index',
       'admin'=>'admin',
       'api'=>'api',
     ],
+    // 应用默认域名（自动多应用模式有效,为空时采用domain_bind的设置键值对换,适合跨应用生成url）
+    'app_default_doamin'      => [],
+    
     // 禁止URL访问的应用列表（自动多应用模式有效）
     'deny_app_list'    => [],
 
diff --git a/route/app.php b/route/app.php
index 7b2f51b..6b17cdc 100644
--- a/route/app.php
+++ b/route/app.php
@@ -8,5 +8,4 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-use think\facade\Route;
-
+use think\facade\Route;
\ No newline at end of file
diff --git a/view/admin/common/_header.html b/view/admin/common/_header.html
index 2fc532c..0b62c60 100644
--- a/view/admin/common/_header.html
+++ b/view/admin/common/_header.html
@@ -1,5 +1,6 @@
 <div class="layui-header">
-  <a class="layui-logo" href="{:url('index/Index/index')}" target="_blank">{:get_system_config('site_name')}</a>
+
+  <a class="layui-logo" href="{:app_url('index/index@index')}" target="_blank">{:get_system_config('site_name')}</a>
   <!-- 头部区域（可配合layui已有的水平导航） PC端显示 -->
   <ul class="layui-nav layui-layout-left layui-hide-xs pc-nav-container">
     <li class="layui-nav-item header-nav-item" data-name="Index"><a href="{:url('admin/Index/index')}">首页</a></li>