From 8d5d727c3869b4bcdb14ba2976ee50fef703e605 Mon Sep 17 00:00:00 2001
From: toogee <changlin_zhao@qq.com>
Date: Sun, 10 May 2020 18:52:02 +0800
Subject: [PATCH] template add

---
 app/admin/controller/Set.php                  |   5 +-
 app/install/data/taoler.sql                   |  22 ++-
 config/view.php                               |   5 +-
 extend/taoler/com/Files.php                   |  15 ++
 view/README.md                                |   1 -
 view/{index/public => install}/404.html       |   4 +-
 view/{ => taoler}/admin/.gitignore            |   0
 view/{ => taoler}/admin/admin/add.html        |   0
 view/{ => taoler}/admin/admin/edit.html       |   0
 view/{ => taoler}/admin/admin/index.html      |   0
 view/{ => taoler}/admin/auth_access/add.html  |   0
 view/{ => taoler}/admin/auth_access/edit.html |   0
 .../{ => taoler}/admin/auth_access/index.html |   0
 view/{ => taoler}/admin/auth_group/role.html  |   0
 .../admin/auth_group/roleadd.html             |   0
 .../admin/auth_group/roleedit.html            |   0
 view/{ => taoler}/admin/auth_rule/add.html    |   0
 view/{ => taoler}/admin/auth_rule/edit.html   |   0
 view/{ => taoler}/admin/auth_rule/index.html  |   0
 view/{ => taoler}/admin/forum/list.html       |   0
 view/{ => taoler}/admin/forum/listform.html   |   0
 view/{ => taoler}/admin/forum/replys.html     |   0
 view/{ => taoler}/admin/forum/replysform.html |   0
 view/{ => taoler}/admin/forum/tags.html       |   0
 view/{ => taoler}/admin/forum/tagsform.html   |   0
 view/{ => taoler}/admin/index/home.html       |   0
 view/{ => taoler}/admin/index/index.html      |   0
 view/{ => taoler}/admin/key_auth/add.html     |   0
 view/{ => taoler}/admin/key_auth/edit.html    |   0
 view/{ => taoler}/admin/key_auth/index.html   |   4 +-
 view/{ => taoler}/admin/login/forget.html     |   0
 view/{ => taoler}/admin/login/login.html      |   0
 view/{ => taoler}/admin/login/reg.html        |   0
 view/{ => taoler}/admin/notice/edit.html      |   0
 view/{ => taoler}/admin/notice/index.html     |   0
 view/{ => taoler}/admin/public/base.html      |   0
 view/{ => taoler}/admin/public/header.html    |   0
 view/{ => taoler}/admin/public/page_tabs.html |   0
 view/{ => taoler}/admin/public/side_menu.html |   0
 .../{ => taoler}/admin/set/system/server.html |   0
 .../admin/set/system/signedit.html            |   0
 .../admin/set/system/vipedit.html             |   0
 .../admin/set/system/website.html             |  11 ++
 view/{ => taoler}/admin/set/user/info.html    |   0
 view/{ => taoler}/admin/set/user/repass.html  |   0
 view/{ => taoler}/admin/slider/add.html       |   0
 view/{ => taoler}/admin/slider/edit.html      |   0
 view/{ => taoler}/admin/slider/index.html     |   0
 view/{ => taoler}/admin/upgrade/index.html    |   0
 view/{ => taoler}/admin/upgrade/keyedit.html  |   0
 view/{ => taoler}/admin/user/list.html        |   0
 view/{ => taoler}/admin/user/useredit.html    |   0
 view/{ => taoler}/admin/user/userform.html    |   0
 view/{ => taoler}/index/.gitignore            |   0
 view/{ => taoler}/index/article/add.html      |   0
 view/{ => taoler}/index/article/cate.html     |   0
 view/{ => taoler}/index/article/detail.html   |   0
 view/{ => taoler}/index/article/edit.html     |   0
 view/taoler/index/doc/timeline.html           | 157 ++++++++++++++++++
 view/{ => taoler}/index/error/404.html        |   0
 view/{ => taoler}/index/index/index.html      |   0
 view/{ => taoler}/index/index/search.html     |   0
 view/{ => taoler}/index/login/forget.html     |   0
 view/{ => taoler}/index/login/login.html      |   0
 view/{ => taoler}/index/login/reg.html        |   0
 view/{ => taoler}/index/other/404.html        |   0
 view/{ => taoler}/index/other/notice.html     |   0
 view/{ => taoler}/index/other/tips.html       |   0
 view/{ => taoler}/index/public/.gitignore     |   0
 view/{ => taoler/index/public}/404.html       |   0
 view/{ => taoler}/index/public/base.html      |   0
 view/{ => taoler}/index/public/column.html    |   2 +-
 view/{ => taoler}/index/public/filter.html    |   0
 view/{ => taoler}/index/public/flink.html     |   0
 view/{ => taoler}/index/public/footer.html    |   0
 view/{ => taoler}/index/public/header.html    |   0
 view/{ => taoler}/index/public/js.html        |   0
 view/{ => taoler}/index/public/jump.html      |   0
 view/{ => taoler}/index/public/layout.html    |   0
 view/{ => taoler}/index/public/link.html      |   0
 view/{ => taoler}/index/public/sign.html      |   0
 .../index/public/user-nav.html--}             |   4 +-
 view/{ => taoler}/index/public/user.html      |   0
 view/{ => taoler}/index/sign/lists.html       |   0
 view/{ => taoler}/index/user/activate.html    |   0
 view/{ => taoler}/index/user/home.html        |   0
 view/{ => taoler}/index/user/index.html       |   0
 view/{ => taoler}/index/user/message.html     |   0
 view/{ => taoler}/index/user/post.html        |   0
 view/{ => taoler}/index/user/set.html         |   0
 view/{ => taoler}/index/user/upimg.html       |   0
 view/{ => taoler}/index/user/user.html        |   0
 92 files changed, 217 insertions(+), 13 deletions(-)
 delete mode 100644 view/README.md
 rename view/{index/public => install}/404.html (93%)
 rename view/{ => taoler}/admin/.gitignore (100%)
 rename view/{ => taoler}/admin/admin/add.html (100%)
 rename view/{ => taoler}/admin/admin/edit.html (100%)
 rename view/{ => taoler}/admin/admin/index.html (100%)
 rename view/{ => taoler}/admin/auth_access/add.html (100%)
 rename view/{ => taoler}/admin/auth_access/edit.html (100%)
 rename view/{ => taoler}/admin/auth_access/index.html (100%)
 rename view/{ => taoler}/admin/auth_group/role.html (100%)
 rename view/{ => taoler}/admin/auth_group/roleadd.html (100%)
 rename view/{ => taoler}/admin/auth_group/roleedit.html (100%)
 rename view/{ => taoler}/admin/auth_rule/add.html (100%)
 rename view/{ => taoler}/admin/auth_rule/edit.html (100%)
 rename view/{ => taoler}/admin/auth_rule/index.html (100%)
 rename view/{ => taoler}/admin/forum/list.html (100%)
 rename view/{ => taoler}/admin/forum/listform.html (100%)
 rename view/{ => taoler}/admin/forum/replys.html (100%)
 rename view/{ => taoler}/admin/forum/replysform.html (100%)
 rename view/{ => taoler}/admin/forum/tags.html (100%)
 rename view/{ => taoler}/admin/forum/tagsform.html (100%)
 rename view/{ => taoler}/admin/index/home.html (100%)
 rename view/{ => taoler}/admin/index/index.html (100%)
 rename view/{ => taoler}/admin/key_auth/add.html (100%)
 rename view/{ => taoler}/admin/key_auth/edit.html (100%)
 rename view/{ => taoler}/admin/key_auth/index.html (97%)
 rename view/{ => taoler}/admin/login/forget.html (100%)
 rename view/{ => taoler}/admin/login/login.html (100%)
 rename view/{ => taoler}/admin/login/reg.html (100%)
 rename view/{ => taoler}/admin/notice/edit.html (100%)
 rename view/{ => taoler}/admin/notice/index.html (100%)
 rename view/{ => taoler}/admin/public/base.html (100%)
 rename view/{ => taoler}/admin/public/header.html (100%)
 rename view/{ => taoler}/admin/public/page_tabs.html (100%)
 rename view/{ => taoler}/admin/public/side_menu.html (100%)
 rename view/{ => taoler}/admin/set/system/server.html (100%)
 rename view/{ => taoler}/admin/set/system/signedit.html (100%)
 rename view/{ => taoler}/admin/set/system/vipedit.html (100%)
 rename view/{ => taoler}/admin/set/system/website.html (95%)
 rename view/{ => taoler}/admin/set/user/info.html (100%)
 rename view/{ => taoler}/admin/set/user/repass.html (100%)
 rename view/{ => taoler}/admin/slider/add.html (100%)
 rename view/{ => taoler}/admin/slider/edit.html (100%)
 rename view/{ => taoler}/admin/slider/index.html (100%)
 rename view/{ => taoler}/admin/upgrade/index.html (100%)
 rename view/{ => taoler}/admin/upgrade/keyedit.html (100%)
 rename view/{ => taoler}/admin/user/list.html (100%)
 rename view/{ => taoler}/admin/user/useredit.html (100%)
 rename view/{ => taoler}/admin/user/userform.html (100%)
 rename view/{ => taoler}/index/.gitignore (100%)
 rename view/{ => taoler}/index/article/add.html (100%)
 rename view/{ => taoler}/index/article/cate.html (100%)
 rename view/{ => taoler}/index/article/detail.html (100%)
 rename view/{ => taoler}/index/article/edit.html (100%)
 create mode 100644 view/taoler/index/doc/timeline.html
 rename view/{ => taoler}/index/error/404.html (100%)
 rename view/{ => taoler}/index/index/index.html (100%)
 rename view/{ => taoler}/index/index/search.html (100%)
 rename view/{ => taoler}/index/login/forget.html (100%)
 rename view/{ => taoler}/index/login/login.html (100%)
 rename view/{ => taoler}/index/login/reg.html (100%)
 rename view/{ => taoler}/index/other/404.html (100%)
 rename view/{ => taoler}/index/other/notice.html (100%)
 rename view/{ => taoler}/index/other/tips.html (100%)
 rename view/{ => taoler}/index/public/.gitignore (100%)
 rename view/{ => taoler/index/public}/404.html (100%)
 rename view/{ => taoler}/index/public/base.html (100%)
 rename view/{ => taoler}/index/public/column.html (99%)
 rename view/{ => taoler}/index/public/filter.html (100%)
 rename view/{ => taoler}/index/public/flink.html (100%)
 rename view/{ => taoler}/index/public/footer.html (100%)
 rename view/{ => taoler}/index/public/header.html (100%)
 rename view/{ => taoler}/index/public/js.html (100%)
 rename view/{ => taoler}/index/public/jump.html (100%)
 rename view/{ => taoler}/index/public/layout.html (100%)
 rename view/{ => taoler}/index/public/link.html (100%)
 rename view/{ => taoler}/index/public/sign.html (100%)
 rename view/{index/public/user-nav.html => taoler/index/public/user-nav.html--} (93%)
 rename view/{ => taoler}/index/public/user.html (100%)
 rename view/{ => taoler}/index/sign/lists.html (100%)
 rename view/{ => taoler}/index/user/activate.html (100%)
 rename view/{ => taoler}/index/user/home.html (100%)
 rename view/{ => taoler}/index/user/index.html (100%)
 rename view/{ => taoler}/index/user/message.html (100%)
 rename view/{ => taoler}/index/user/post.html (100%)
 rename view/{ => taoler}/index/user/set.html (100%)
 rename view/{ => taoler}/index/user/upimg.html (100%)
 rename view/{ => taoler}/index/user/user.html (100%)

diff --git a/app/admin/controller/Set.php b/app/admin/controller/Set.php
index 4f0ccf5..3730204 100644
--- a/app/admin/controller/Set.php
+++ b/app/admin/controller/Set.php
@@ -9,6 +9,7 @@ use app\admin\model\System;
 use app\admin\model\MailServer;
 use think\facade\Config;
 use think\exception\ValidateException;
+use taoler\com\Files;
 
 class Set extends AdminController
 {
@@ -23,8 +24,8 @@ class Set extends AdminController
 		$mailserver = MailServer::find(1);
 		$sysInfo = Db::name('system')->find(1);
 		$syscy = $this->check($sysInfo['base_url']);
-		
-        View::assign(['sysInfo'=>$sysInfo,'syscy'=>$syscy,'mailserver'=>$mailserver]);
+		$template = Files::getDirName('../view');
+        View::assign(['sysInfo'=>$sysInfo,'syscy'=>$syscy,'mailserver'=>$mailserver,'template'=>$template]);
 		return View::fetch('set/system/website');
     }
 	
diff --git a/app/install/data/taoler.sql b/app/install/data/taoler.sql
index 485f69d..5eb46dd 100644
--- a/app/install/data/taoler.sql
+++ b/app/install/data/taoler.sql
@@ -298,7 +298,7 @@ CREATE TABLE `tao_slider` (
 ) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 
 INSERT INTO `tao_slider` VALUES ('1', 'CODING', '1', '/storage/slider/F1.jpg', '#', '', '1574870400', '1575043200', '1', '0', '0', '0');
-INSERT INTO `tao_slider` VALUES ('3', '通用右栏底部广告', '2', '/storage/slider/20200101/851c0b88a72590293bcb45454bdce056.jpg', 'http://www.aieok.com', '', '1571155200', '1609344000', '1', '0', '0', '0');
+INSERT INTO `tao_slider` VALUES ('3', '通用右栏底部广告', '2', '/storage/slider/20200101/851c0b88a72590293bcb45454bdce056.jpg', 'https://www.aieok.com', '', '1571155200', '1609344000', '1', '0', '0', '0');
 
 
 DROP TABLE IF EXISTS `tao_system`;
@@ -307,6 +307,7 @@ CREATE TABLE `tao_system` (
   `webname` varchar(20) NOT NULL COMMENT '网站名称',
   `webtitle` varchar(30) NOT NULL,
   `domain` varchar(50) NOT NULL,
+  `template` varchar(30) NOT NULL DEFAULT '' COMMENT '模板',
   `logo` varchar(70) NOT NULL DEFAULT '' COMMENT '网站logo',
   `cache` tinyint(5) NOT NULL DEFAULT '0' COMMENT '缓存时间分钟',
   `upsize` int(5) NOT NULL DEFAULT '0' COMMENT '上传文件大小KB',
@@ -329,7 +330,7 @@ CREATE TABLE `tao_system` (
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='系统配置表';
 
-INSERT INTO `tao_system` VALUES ('1', 'TaoLer社区演示站', '轻论坛系统', 'http://www.xxx.com', '/storage/logo/logo.png', '10', '2048', 'png|gif|jpg|jpeg|zip|rarr', '<a href=\"http://www.aieok.com\" target=\"_blank\">aieok.com 版权所有</a>', 'TaoLer,轻社区系统,bbs,论坛,Thinkphp6,layui,fly模板,', '这是一个Taoler轻社区论坛系统', '1', '1', '1', '0.0.0.0', '管理员|admin|审核员|超级|垃圾', '1.0.0', '', 'http://www.aieok.com/api/index/cy', 'http://www.aieok.com/api/upload/check', 'http://www.aieok.com/api/upload/api', '1581221008', '1577419197');
+INSERT INTO `tao_system` VALUES ('1', 'TaoLer社区演示站', '轻论坛系统', 'http://www.xxx.com', 'taoler', '/storage/logo/logo.png', '10', '2048', 'png|gif|jpg|jpeg|zip|rarr', '<a href=\"http://www.aieok.com\" target=\"_blank\">aieok.com 版权所有</a>', 'TaoLer,轻社区系统,bbs,论坛,Thinkphp6,layui,fly模板,', '这是一个Taoler轻社区论坛系统', '1', '1', '1', '0.0.0.0', '管理员|admin|审核员|超级|垃圾', '1.0.0', '', 'http://www.aieok.com/api/index/cy', 'http://www.aieok.com/api/upload/check', 'http://www.aieok.com/api/upload/api', '1581221008', '1577419197');
 
 
 DROP TABLE IF EXISTS `tao_user`;
@@ -435,3 +436,20 @@ CREATE TABLE `tao_user_zan` (
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
+DROP TABLE IF EXISTS `tao_webconfig`;
+CREATE TABLE `tao_webconfig` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ename` varchar(30) NOT NULL COMMENT '英文名',
+  `cname` varchar(50) NOT NULL COMMENT '中文名',
+  `form_type` varchar(10) DEFAULT '' COMMENT '表单类型',
+  `conf_type` tinyint(1) NOT NULL DEFAULT '1' COMMENT '配置类型1论坛2网店3企业站',
+  `values` varchar(255) NOT NULL,
+  `value` varchar(60) NOT NULL COMMENT '默认值',
+  `sort` tinyint(2) NOT NULL DEFAULT '20',
+  `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
+  `update_time` int(11) NOT NULL DEFAULT '0' COMMENT '更新时间',
+  `delete_time` int(11) NOT NULL DEFAULT '0' COMMENT '删除时间',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+
+INSERT INTO `tao_webconfig` VALUES ('1', 'template', '', '', '0', '', 'taoler', '20', '0', '0', '0');
diff --git a/config/view.php b/config/view.php
index 01259a0..190f4c0 100644
--- a/config/view.php
+++ b/config/view.php
@@ -2,6 +2,9 @@
 // +----------------------------------------------------------------------
 // | 模板设置
 // +----------------------------------------------------------------------
+use think\facade\Db;
+
+$template = Db::name('system')->where('id',1)->value('template');
 
 return [
     // 模板引擎类型使用Think
@@ -9,7 +12,7 @@ return [
     // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法
     'auto_rule'     => 1,
     // 模板目录名
-    'view_dir_name' => 'view',
+    'view_dir_name' => 'view/'.$template,
     // 模板后缀
     'view_suffix'   => 'html',
     // 模板文件名分隔符
diff --git a/extend/taoler/com/Files.php b/extend/taoler/com/Files.php
index 5f23988..6073673 100644
--- a/extend/taoler/com/Files.php
+++ b/extend/taoler/com/Files.php
@@ -5,6 +5,21 @@ use RecursiveIteratorIterator;
 use RecursiveDirectoryIterator;
 class Files
 {
+	//��ȡĿ¼����Ŀ¼��
+	public static function getDirName($path)
+	{
+		if (is_dir($path)) {
+			$arr = array();
+			$data = scandir($path);
+			foreach ($data as $value){
+				if($value !='.' && $value != '..' && !stripos($value,".")){
+				  $arr[] = strtolower($value);
+				}
+			  }
+			 return array_merge(array_diff($arr, array('install')));
+		}
+	}
+	
 	//�����ļ��м����ļ���
 	public static function create_dirs($path)
 	{
diff --git a/view/README.md b/view/README.md
deleted file mode 100644
index 360eb24..0000000
--- a/view/README.md
+++ /dev/null
@@ -1 +0,0 @@
-如果不使用模板，可以删除该目录
\ No newline at end of file
diff --git a/view/index/public/404.html b/view/install/404.html
similarity index 93%
rename from view/index/public/404.html
rename to view/install/404.html
index 25bed51..50a5d7a 100644
--- a/view/index/public/404.html
+++ b/view/install/404.html
@@ -10,8 +10,8 @@
   <link rel="stylesheet" href="/static/res/css/global.css" charset="utf-8">
 </head>
 <body>
-<include file="./index/public/header.html" />
-<include file="./index/public/column" />
+<include file="./taoler/index/public/header.html" />
+<include file="./taoler/index/public/column" />
 <div class="layui-container fly-marginTop">
 	<div class="fly-panel">
 	  <div class="fly-none">
diff --git a/view/admin/.gitignore b/view/taoler/admin/.gitignore
similarity index 100%
rename from view/admin/.gitignore
rename to view/taoler/admin/.gitignore
diff --git a/view/admin/admin/add.html b/view/taoler/admin/admin/add.html
similarity index 100%
rename from view/admin/admin/add.html
rename to view/taoler/admin/admin/add.html
diff --git a/view/admin/admin/edit.html b/view/taoler/admin/admin/edit.html
similarity index 100%
rename from view/admin/admin/edit.html
rename to view/taoler/admin/admin/edit.html
diff --git a/view/admin/admin/index.html b/view/taoler/admin/admin/index.html
similarity index 100%
rename from view/admin/admin/index.html
rename to view/taoler/admin/admin/index.html
diff --git a/view/admin/auth_access/add.html b/view/taoler/admin/auth_access/add.html
similarity index 100%
rename from view/admin/auth_access/add.html
rename to view/taoler/admin/auth_access/add.html
diff --git a/view/admin/auth_access/edit.html b/view/taoler/admin/auth_access/edit.html
similarity index 100%
rename from view/admin/auth_access/edit.html
rename to view/taoler/admin/auth_access/edit.html
diff --git a/view/admin/auth_access/index.html b/view/taoler/admin/auth_access/index.html
similarity index 100%
rename from view/admin/auth_access/index.html
rename to view/taoler/admin/auth_access/index.html
diff --git a/view/admin/auth_group/role.html b/view/taoler/admin/auth_group/role.html
similarity index 100%
rename from view/admin/auth_group/role.html
rename to view/taoler/admin/auth_group/role.html
diff --git a/view/admin/auth_group/roleadd.html b/view/taoler/admin/auth_group/roleadd.html
similarity index 100%
rename from view/admin/auth_group/roleadd.html
rename to view/taoler/admin/auth_group/roleadd.html
diff --git a/view/admin/auth_group/roleedit.html b/view/taoler/admin/auth_group/roleedit.html
similarity index 100%
rename from view/admin/auth_group/roleedit.html
rename to view/taoler/admin/auth_group/roleedit.html
diff --git a/view/admin/auth_rule/add.html b/view/taoler/admin/auth_rule/add.html
similarity index 100%
rename from view/admin/auth_rule/add.html
rename to view/taoler/admin/auth_rule/add.html
diff --git a/view/admin/auth_rule/edit.html b/view/taoler/admin/auth_rule/edit.html
similarity index 100%
rename from view/admin/auth_rule/edit.html
rename to view/taoler/admin/auth_rule/edit.html
diff --git a/view/admin/auth_rule/index.html b/view/taoler/admin/auth_rule/index.html
similarity index 100%
rename from view/admin/auth_rule/index.html
rename to view/taoler/admin/auth_rule/index.html
diff --git a/view/admin/forum/list.html b/view/taoler/admin/forum/list.html
similarity index 100%
rename from view/admin/forum/list.html
rename to view/taoler/admin/forum/list.html
diff --git a/view/admin/forum/listform.html b/view/taoler/admin/forum/listform.html
similarity index 100%
rename from view/admin/forum/listform.html
rename to view/taoler/admin/forum/listform.html
diff --git a/view/admin/forum/replys.html b/view/taoler/admin/forum/replys.html
similarity index 100%
rename from view/admin/forum/replys.html
rename to view/taoler/admin/forum/replys.html
diff --git a/view/admin/forum/replysform.html b/view/taoler/admin/forum/replysform.html
similarity index 100%
rename from view/admin/forum/replysform.html
rename to view/taoler/admin/forum/replysform.html
diff --git a/view/admin/forum/tags.html b/view/taoler/admin/forum/tags.html
similarity index 100%
rename from view/admin/forum/tags.html
rename to view/taoler/admin/forum/tags.html
diff --git a/view/admin/forum/tagsform.html b/view/taoler/admin/forum/tagsform.html
similarity index 100%
rename from view/admin/forum/tagsform.html
rename to view/taoler/admin/forum/tagsform.html
diff --git a/view/admin/index/home.html b/view/taoler/admin/index/home.html
similarity index 100%
rename from view/admin/index/home.html
rename to view/taoler/admin/index/home.html
diff --git a/view/admin/index/index.html b/view/taoler/admin/index/index.html
similarity index 100%
rename from view/admin/index/index.html
rename to view/taoler/admin/index/index.html
diff --git a/view/admin/key_auth/add.html b/view/taoler/admin/key_auth/add.html
similarity index 100%
rename from view/admin/key_auth/add.html
rename to view/taoler/admin/key_auth/add.html
diff --git a/view/admin/key_auth/edit.html b/view/taoler/admin/key_auth/edit.html
similarity index 100%
rename from view/admin/key_auth/edit.html
rename to view/taoler/admin/key_auth/edit.html
diff --git a/view/admin/key_auth/index.html b/view/taoler/admin/key_auth/index.html
similarity index 97%
rename from view/admin/key_auth/index.html
rename to view/taoler/admin/key_auth/index.html
index 8117248..e3bcead 100644
--- a/view/admin/key_auth/index.html
+++ b/view/taoler/admin/key_auth/index.html
@@ -5,7 +5,7 @@
     <div class="layui-row layui-col-space15">
       <div class="layui-col-md12">
         <div class="layui-card">
-          <div class="layui-card-header">版本发布</div>
+          <div class="layui-card-header">授权管理</div>
           <div class="layui-card-body">
             
             <div class="layui-form" wid100 lay-filter="">
@@ -32,7 +32,7 @@
 					  <tr>
 						<th>{$vo.id}</th>
 						<th>{$vo.user}</th>
-						<th>{$vo.domain}</th>
+						<th><a href="{$vo.domain}" target="_blank">{$vo.domain}</a></th>
 						<th>{$vo.key}</th>
 						<th>{$vo.auth_level}</th>
 						<th>{$vo.status?'正常':'禁用'}</th>
diff --git a/view/admin/login/forget.html b/view/taoler/admin/login/forget.html
similarity index 100%
rename from view/admin/login/forget.html
rename to view/taoler/admin/login/forget.html
diff --git a/view/admin/login/login.html b/view/taoler/admin/login/login.html
similarity index 100%
rename from view/admin/login/login.html
rename to view/taoler/admin/login/login.html
diff --git a/view/admin/login/reg.html b/view/taoler/admin/login/reg.html
similarity index 100%
rename from view/admin/login/reg.html
rename to view/taoler/admin/login/reg.html
diff --git a/view/admin/notice/edit.html b/view/taoler/admin/notice/edit.html
similarity index 100%
rename from view/admin/notice/edit.html
rename to view/taoler/admin/notice/edit.html
diff --git a/view/admin/notice/index.html b/view/taoler/admin/notice/index.html
similarity index 100%
rename from view/admin/notice/index.html
rename to view/taoler/admin/notice/index.html
diff --git a/view/admin/public/base.html b/view/taoler/admin/public/base.html
similarity index 100%
rename from view/admin/public/base.html
rename to view/taoler/admin/public/base.html
diff --git a/view/admin/public/header.html b/view/taoler/admin/public/header.html
similarity index 100%
rename from view/admin/public/header.html
rename to view/taoler/admin/public/header.html
diff --git a/view/admin/public/page_tabs.html b/view/taoler/admin/public/page_tabs.html
similarity index 100%
rename from view/admin/public/page_tabs.html
rename to view/taoler/admin/public/page_tabs.html
diff --git a/view/admin/public/side_menu.html b/view/taoler/admin/public/side_menu.html
similarity index 100%
rename from view/admin/public/side_menu.html
rename to view/taoler/admin/public/side_menu.html
diff --git a/view/admin/set/system/server.html b/view/taoler/admin/set/system/server.html
similarity index 100%
rename from view/admin/set/system/server.html
rename to view/taoler/admin/set/system/server.html
diff --git a/view/admin/set/system/signedit.html b/view/taoler/admin/set/system/signedit.html
similarity index 100%
rename from view/admin/set/system/signedit.html
rename to view/taoler/admin/set/system/signedit.html
diff --git a/view/admin/set/system/vipedit.html b/view/taoler/admin/set/system/vipedit.html
similarity index 100%
rename from view/admin/set/system/vipedit.html
rename to view/taoler/admin/set/system/vipedit.html
diff --git a/view/admin/set/system/website.html b/view/taoler/admin/set/system/website.html
similarity index 95%
rename from view/admin/set/system/website.html
rename to view/taoler/admin/set/system/website.html
index b80edf5..cc408bc 100644
--- a/view/admin/set/system/website.html
+++ b/view/taoler/admin/set/system/website.html
@@ -27,6 +27,17 @@
 						  <input type="text" name="domain" lay-verify="url" value="{$sysInfo.domain}" class="layui-input">
 						</div>
 					  </div>
+					  <div class="layui-form-item">
+						<label class="layui-form-label">模板切换</label>
+						<div class="layui-input-block">
+						  <select name="template" lay-verify="required">
+							<option value=""></option>
+							{volist name="template" id="vo"}
+							<option {if condition="$sysInfo.template eq $vo"} selected {/if} value="{$vo}">{$vo}</option>
+							{/volist}
+						  </select>
+						</div>
+					  </div>
 					  <div class="layui-form-item">
 						<label class="layui-form-label">LOGO</label>
 						<div class="layui-input-block">
diff --git a/view/admin/set/user/info.html b/view/taoler/admin/set/user/info.html
similarity index 100%
rename from view/admin/set/user/info.html
rename to view/taoler/admin/set/user/info.html
diff --git a/view/admin/set/user/repass.html b/view/taoler/admin/set/user/repass.html
similarity index 100%
rename from view/admin/set/user/repass.html
rename to view/taoler/admin/set/user/repass.html
diff --git a/view/admin/slider/add.html b/view/taoler/admin/slider/add.html
similarity index 100%
rename from view/admin/slider/add.html
rename to view/taoler/admin/slider/add.html
diff --git a/view/admin/slider/edit.html b/view/taoler/admin/slider/edit.html
similarity index 100%
rename from view/admin/slider/edit.html
rename to view/taoler/admin/slider/edit.html
diff --git a/view/admin/slider/index.html b/view/taoler/admin/slider/index.html
similarity index 100%
rename from view/admin/slider/index.html
rename to view/taoler/admin/slider/index.html
diff --git a/view/admin/upgrade/index.html b/view/taoler/admin/upgrade/index.html
similarity index 100%
rename from view/admin/upgrade/index.html
rename to view/taoler/admin/upgrade/index.html
diff --git a/view/admin/upgrade/keyedit.html b/view/taoler/admin/upgrade/keyedit.html
similarity index 100%
rename from view/admin/upgrade/keyedit.html
rename to view/taoler/admin/upgrade/keyedit.html
diff --git a/view/admin/user/list.html b/view/taoler/admin/user/list.html
similarity index 100%
rename from view/admin/user/list.html
rename to view/taoler/admin/user/list.html
diff --git a/view/admin/user/useredit.html b/view/taoler/admin/user/useredit.html
similarity index 100%
rename from view/admin/user/useredit.html
rename to view/taoler/admin/user/useredit.html
diff --git a/view/admin/user/userform.html b/view/taoler/admin/user/userform.html
similarity index 100%
rename from view/admin/user/userform.html
rename to view/taoler/admin/user/userform.html
diff --git a/view/index/.gitignore b/view/taoler/index/.gitignore
similarity index 100%
rename from view/index/.gitignore
rename to view/taoler/index/.gitignore
diff --git a/view/index/article/add.html b/view/taoler/index/article/add.html
similarity index 100%
rename from view/index/article/add.html
rename to view/taoler/index/article/add.html
diff --git a/view/index/article/cate.html b/view/taoler/index/article/cate.html
similarity index 100%
rename from view/index/article/cate.html
rename to view/taoler/index/article/cate.html
diff --git a/view/index/article/detail.html b/view/taoler/index/article/detail.html
similarity index 100%
rename from view/index/article/detail.html
rename to view/taoler/index/article/detail.html
diff --git a/view/index/article/edit.html b/view/taoler/index/article/edit.html
similarity index 100%
rename from view/index/article/edit.html
rename to view/taoler/index/article/edit.html
diff --git a/view/taoler/index/doc/timeline.html b/view/taoler/index/doc/timeline.html
new file mode 100644
index 0000000..e6c9a04
--- /dev/null
+++ b/view/taoler/index/doc/timeline.html
@@ -0,0 +1,157 @@
+{extend name="public:base" /}
+
+{block name="title"}{$sysInfo.webname}-{$sysInfo.webtitle}{/block}
+{block name="keywords"}{$sysInfo.keywords}{/block}
+{block name="description"}{$sysInfo.descript}{/block}
+{block name="column"}{include file="public/column" /}{/block}
+
+{block name="content"}
+<div class="layui-container">
+  <div class="layui-row layui-col-space15">
+  
+    <div class="layui-col-md8">
+		<!--首页幻灯-->
+		<div class="fly-panel layui-hide-xs"> 
+		  <div class="layui-row fly-panel-main" style="padding: 15px;"> 
+		   <div class="layui-carousel fly-topline" id="FLY_topline" > 
+			<div carousel-item=""> 
+			{volist name="slider" id="vo"}
+			 <div time-limit="2019-04-18 0:0:0" > 
+			  <a href="{$vo.slid_href}" target="_blank" rel="nofollow"> <img src="{$vo.slid_img}" alt="{$vo.slid_name}" /> </a> 
+			 </div> 
+			{/volist} 
+			</div> 
+		   </div> 
+		  </div>
+		</div> 
+		<!--更新日志-->
+		<div class="layui-card">
+			<div class="layui-card-header"><h1 class="site-h1">更新日志</h1></div>
+			<div class="layui-card-body">
+				<ul class="layui-timeline">
+				{volist name="timeline" id="vo"}
+				<li class="layui-timeline-item">
+					<i class="layui-icon layui-timeline-axis"></i>
+					<div class="layui-timeline-content layui-text">
+					  <h3 class="layui-timeline-title">{$vo.timeline_title}<span class="layui-badge-rim">{$vo.create_time|date='Y-m-d'}</span></h3>
+					   {$vo.timeline_content|raw}
+					</div>
+				  </li>
+				{/volist}  
+				</ul> 
+			</div>
+		</div>		
+    </div>
+	<!--右栏-->
+    <div class="layui-col-md4">
+      <div class="fly-panel">
+        <h3 class="fly-panel-title">温馨通道</h3>
+        <div class="layui-row fly-panel-main" style="padding: 15px;">
+          <div class="layui-clear fly-list-quick">
+            <div class="layui-col-xs6">
+              <div><a href="https://gitee.com/toogee/TaoLer/repository/archive/master.zip" target="_blank"> 程序下载 </a></div>
+            </div>
+            <div class="layui-col-xs6">
+              <div><a href="{:url('article/detail',['id'=>25])}" target="_blank"> 应用说明 </a></div>
+            </div>
+            <div class="layui-col-xs6">
+              <div><a href="#" target="_blank"> 申请Key </a></div>
+            </div>
+            <div class="layui-col-xs6">
+              <div><a href="https://gitee.com/toogee/TaoLer" target="_blank"> Git 仓库 </a></div>
+            </div>
+            <div class="layui-col-xs6">
+              <div><a href="{:url('doc/timeline')}" target="_blank">版本更新日志</a></div>
+            </div>
+            <div class="layui-col-xs6">
+              <div><a href="#" target="_blank"> 关于积分 </a></div>
+            </div>
+            <a name="signin"> </a></div>
+        </div>
+      </div>
+
+	<div class="fly-panel"> 
+		<div class="fly-panel-title"> 钻级赞助商 <span class="fly-mid"></span> 
+			<a href="/" class="fly-link fly-joinad">我要加入</a> 
+		</div> 
+	<div class="fly-panel-main" style="padding: 13px 15px;"> 
+	{volist name="ad_index" id="vo"}
+		<a href="{$vo.slid_href}" target="_blank" rel="nofollow" class="fly-zanzhu" style="background-color: {$vo.slid_color};">{$vo.slid_name}</a>
+	{/volist}
+	<!--a href="/" target="_blank" rel="nofollow" class="fly-zanzhu  fly-zanzhu-img" ><img src="//11886.png" alt="topjui"></a--> 
+	</div>
+	</div>
+
+      <dl class="fly-panel fly-list-one">
+        <dt class="fly-panel-title">本周热议</dt>
+        {volist name="artHot" id="vo"}
+		<dd>
+          <a href="{:url('article/detail',['id' => $vo.id])}">{$vo.title}</a>
+          <span><i class="iconfont icon-pinglun1"></i> {$vo.comments_count}</span>
+        </dd>
+		{/volist}
+
+        <!-- 无数据时 -->
+        <!--
+        <div class="fly-none">没有相关数据</div>
+        -->
+      </dl>
+
+      <div class="fly-panel">
+        <div class="fly-panel-title">
+          官方产品
+		</div> 
+        <div class="fly-panel-main">
+          <a href="http://www.aieok.com" target="_blank" class="fly-zanzhu" style="background-color: #5FB878;">TaoLer 1.0 - 旗舰之作</a>
+        </div>
+      </div>
+	  <div class="fly-panel" style="padding: 20px 0; text-align: center;">
+		{volist name="ad_comm" id="vo"}		
+		  <a href="{$vo.slid_href}" target="_blank"><img src="{$vo.slid_img}" style="max-width: 100%;"></a>
+		{/volist}
+       </div>
+	  
+	{include file="public/flink" /}
+    </div>
+	
+  </div>
+</div>
+{/block}
+
+{block name="script"}
+<script>
+    layui.use(['form', 'layer'], function() {
+        var layer = layui.layer;
+        var $ = layui.jquery;
+        var jifenname = "金币";
+
+	$('#friend-link').on('click', function(){
+		layer.open({
+		  title: '申请友链',
+		  content: '发送邮件至：changlin_zhao@qq.com ',
+		  yes: function(index, layero){
+				layer.close(index);
+			}
+		});
+		return false;
+	});
+	
+</script>
+<script>
+    layui.cache.page = 'index';
+    layui.cache.user = {
+        username: '{$user.name??'游客'}'
+        ,uid: {$user.id ? $user.id : -1}
+        ,avatar: '{$user.name? $user['user_img']:'/static/res/images/avatar/00.jpg'}'
+        ,experience: 83
+        ,sex: '{if condition="$user['sex'] eq 0"}男{else/}女{/if}'
+    };
+    layui.config({
+        version: "3.0.0"
+        ,base: '/static/res/mods/'
+    }).extend({
+        fly: 'index'
+    }).use('fly');
+</script>
+
+{/block}
\ No newline at end of file
diff --git a/view/index/error/404.html b/view/taoler/index/error/404.html
similarity index 100%
rename from view/index/error/404.html
rename to view/taoler/index/error/404.html
diff --git a/view/index/index/index.html b/view/taoler/index/index/index.html
similarity index 100%
rename from view/index/index/index.html
rename to view/taoler/index/index/index.html
diff --git a/view/index/index/search.html b/view/taoler/index/index/search.html
similarity index 100%
rename from view/index/index/search.html
rename to view/taoler/index/index/search.html
diff --git a/view/index/login/forget.html b/view/taoler/index/login/forget.html
similarity index 100%
rename from view/index/login/forget.html
rename to view/taoler/index/login/forget.html
diff --git a/view/index/login/login.html b/view/taoler/index/login/login.html
similarity index 100%
rename from view/index/login/login.html
rename to view/taoler/index/login/login.html
diff --git a/view/index/login/reg.html b/view/taoler/index/login/reg.html
similarity index 100%
rename from view/index/login/reg.html
rename to view/taoler/index/login/reg.html
diff --git a/view/index/other/404.html b/view/taoler/index/other/404.html
similarity index 100%
rename from view/index/other/404.html
rename to view/taoler/index/other/404.html
diff --git a/view/index/other/notice.html b/view/taoler/index/other/notice.html
similarity index 100%
rename from view/index/other/notice.html
rename to view/taoler/index/other/notice.html
diff --git a/view/index/other/tips.html b/view/taoler/index/other/tips.html
similarity index 100%
rename from view/index/other/tips.html
rename to view/taoler/index/other/tips.html
diff --git a/view/index/public/.gitignore b/view/taoler/index/public/.gitignore
similarity index 100%
rename from view/index/public/.gitignore
rename to view/taoler/index/public/.gitignore
diff --git a/view/404.html b/view/taoler/index/public/404.html
similarity index 100%
rename from view/404.html
rename to view/taoler/index/public/404.html
diff --git a/view/index/public/base.html b/view/taoler/index/public/base.html
similarity index 100%
rename from view/index/public/base.html
rename to view/taoler/index/public/base.html
diff --git a/view/index/public/column.html b/view/taoler/index/public/column.html
similarity index 99%
rename from view/index/public/column.html
rename to view/taoler/index/public/column.html
index b9416de..519587e 100644
--- a/view/index/public/column.html
+++ b/view/taoler/index/public/column.html
@@ -13,7 +13,7 @@
     {if session('?user_id')}
       <li class="layui-hide-xs layui-hide-sm layui-show-md-inline-block"><a href="{:url('user/post')}">我发表的贴</a></li> 
       <li class="layui-hide-xs layui-hide-sm layui-show-md-inline-block"><a href="{:url('user/post#collection')}">我收藏的贴</a></li>
-	{/if}
+	  {/if}
     </ul> 
     
     <div class="fly-column-right layui-hide-xs"> 
diff --git a/view/index/public/filter.html b/view/taoler/index/public/filter.html
similarity index 100%
rename from view/index/public/filter.html
rename to view/taoler/index/public/filter.html
diff --git a/view/index/public/flink.html b/view/taoler/index/public/flink.html
similarity index 100%
rename from view/index/public/flink.html
rename to view/taoler/index/public/flink.html
diff --git a/view/index/public/footer.html b/view/taoler/index/public/footer.html
similarity index 100%
rename from view/index/public/footer.html
rename to view/taoler/index/public/footer.html
diff --git a/view/index/public/header.html b/view/taoler/index/public/header.html
similarity index 100%
rename from view/index/public/header.html
rename to view/taoler/index/public/header.html
diff --git a/view/index/public/js.html b/view/taoler/index/public/js.html
similarity index 100%
rename from view/index/public/js.html
rename to view/taoler/index/public/js.html
diff --git a/view/index/public/jump.html b/view/taoler/index/public/jump.html
similarity index 100%
rename from view/index/public/jump.html
rename to view/taoler/index/public/jump.html
diff --git a/view/index/public/layout.html b/view/taoler/index/public/layout.html
similarity index 100%
rename from view/index/public/layout.html
rename to view/taoler/index/public/layout.html
diff --git a/view/index/public/link.html b/view/taoler/index/public/link.html
similarity index 100%
rename from view/index/public/link.html
rename to view/taoler/index/public/link.html
diff --git a/view/index/public/sign.html b/view/taoler/index/public/sign.html
similarity index 100%
rename from view/index/public/sign.html
rename to view/taoler/index/public/sign.html
diff --git a/view/index/public/user-nav.html b/view/taoler/index/public/user-nav.html--
similarity index 93%
rename from view/index/public/user-nav.html
rename to view/taoler/index/public/user-nav.html--
index c530dcc..06f07db 100644
--- a/view/index/public/user-nav.html
+++ b/view/taoler/index/public/user-nav.html--
@@ -17,12 +17,12 @@
             我的帖子
         </a>
     </li>
-    <li class="layui-nav-item {if($Request.action=='message')}layui-this{/if}">
+    <!--li class="layui-nav-item {if($Request.action=='message')}layui-this{/if}">
         <a href="{:url('index/user/message')}">
             <i class="layui-icon">&#xe611;</i>
             我的消息
         </a>
-    </li>
+    </li-->
 	
 	<li class="layui-nav-item " >
         <a href="{:url('user/home',['id'=>session('user_id')])}">
diff --git a/view/index/public/user.html b/view/taoler/index/public/user.html
similarity index 100%
rename from view/index/public/user.html
rename to view/taoler/index/public/user.html
diff --git a/view/index/sign/lists.html b/view/taoler/index/sign/lists.html
similarity index 100%
rename from view/index/sign/lists.html
rename to view/taoler/index/sign/lists.html
diff --git a/view/index/user/activate.html b/view/taoler/index/user/activate.html
similarity index 100%
rename from view/index/user/activate.html
rename to view/taoler/index/user/activate.html
diff --git a/view/index/user/home.html b/view/taoler/index/user/home.html
similarity index 100%
rename from view/index/user/home.html
rename to view/taoler/index/user/home.html
diff --git a/view/index/user/index.html b/view/taoler/index/user/index.html
similarity index 100%
rename from view/index/user/index.html
rename to view/taoler/index/user/index.html
diff --git a/view/index/user/message.html b/view/taoler/index/user/message.html
similarity index 100%
rename from view/index/user/message.html
rename to view/taoler/index/user/message.html
diff --git a/view/index/user/post.html b/view/taoler/index/user/post.html
similarity index 100%
rename from view/index/user/post.html
rename to view/taoler/index/user/post.html
diff --git a/view/index/user/set.html b/view/taoler/index/user/set.html
similarity index 100%
rename from view/index/user/set.html
rename to view/taoler/index/user/set.html
diff --git a/view/index/user/upimg.html b/view/taoler/index/user/upimg.html
similarity index 100%
rename from view/index/user/upimg.html
rename to view/taoler/index/user/upimg.html
diff --git a/view/index/user/user.html b/view/taoler/index/user/user.html
similarity index 100%
rename from view/index/user/user.html
rename to view/taoler/index/user/user.html