From 206cddf1f6b2b73c1466d45b27f0be659abc4915 Mon Sep 17 00:00:00 2001 From: toogee Date: Tue, 12 May 2020 14:48:25 +0800 Subject: [PATCH 1/2] template admin remove --- app/admin/config/view.php | 25 +++++++++++++++++++ .../admin => app/admin/view}/.gitignore | 0 .../admin => app/admin/view}/admin/add.html | 0 .../admin => app/admin/view}/admin/edit.html | 0 .../admin => app/admin/view}/admin/index.html | 0 .../admin/view}/auth_access/add.html | 0 .../admin/view}/auth_access/edit.html | 0 .../admin/view}/auth_access/index.html | 0 .../admin/view}/auth_group/role.html | 0 .../admin/view}/auth_group/roleadd.html | 0 .../admin/view}/auth_group/roleedit.html | 0 .../admin/view}/auth_rule/add.html | 0 .../admin/view}/auth_rule/edit.html | 0 .../admin/view}/auth_rule/index.html | 0 .../admin => app/admin/view}/forum/list.html | 0 .../admin/view}/forum/listform.html | 0 .../admin/view}/forum/replys.html | 0 .../admin/view}/forum/replysform.html | 0 .../admin => app/admin/view}/forum/tags.html | 0 .../admin/view}/forum/tagsform.html | 0 .../admin => app/admin/view}/index/home.html | 0 .../admin => app/admin/view}/index/index.html | 0 .../admin/view}/key_auth/add.html | 0 .../admin/view}/key_auth/edit.html | 0 .../admin/view}/key_auth/index.html | 0 .../admin/view}/login/forget.html | 0 .../admin => app/admin/view}/login/login.html | 0 .../admin => app/admin/view}/login/reg.html | 0 .../admin => app/admin/view}/notice/edit.html | 0 .../admin/view}/notice/index.html | 0 .../admin => app/admin/view}/public/base.html | 0 .../admin/view}/public/header.html | 0 .../admin/view}/public/page_tabs.html | 0 .../admin/view}/public/side_menu.html | 0 .../admin/view}/set/system/server.html | 0 .../admin/view}/set/system/signedit.html | 0 .../admin/view}/set/system/vipedit.html | 0 .../admin/view}/set/system/website.html | 0 .../admin/view}/set/user/info.html | 0 .../admin/view}/set/user/repass.html | 0 .../admin => app/admin/view}/slider/add.html | 0 .../admin => app/admin/view}/slider/edit.html | 0 .../admin/view}/slider/index.html | 0 .../admin/view}/upgrade/index.html | 0 .../admin/view}/upgrade/keyedit.html | 0 .../admin => app/admin/view}/user/list.html | 0 .../admin/view}/user/useredit.html | 0 .../admin/view}/user/userform.html | 0 48 files changed, 25 insertions(+) create mode 100644 app/admin/config/view.php rename {view/taoler/admin => app/admin/view}/.gitignore (100%) rename {view/taoler/admin => app/admin/view}/admin/add.html (100%) rename {view/taoler/admin => app/admin/view}/admin/edit.html (100%) rename {view/taoler/admin => app/admin/view}/admin/index.html (100%) rename {view/taoler/admin => app/admin/view}/auth_access/add.html (100%) rename {view/taoler/admin => app/admin/view}/auth_access/edit.html (100%) rename {view/taoler/admin => app/admin/view}/auth_access/index.html (100%) rename {view/taoler/admin => app/admin/view}/auth_group/role.html (100%) rename {view/taoler/admin => app/admin/view}/auth_group/roleadd.html (100%) rename {view/taoler/admin => app/admin/view}/auth_group/roleedit.html (100%) rename {view/taoler/admin => app/admin/view}/auth_rule/add.html (100%) rename {view/taoler/admin => app/admin/view}/auth_rule/edit.html (100%) rename {view/taoler/admin => app/admin/view}/auth_rule/index.html (100%) rename {view/taoler/admin => app/admin/view}/forum/list.html (100%) rename {view/taoler/admin => app/admin/view}/forum/listform.html (100%) rename {view/taoler/admin => app/admin/view}/forum/replys.html (100%) rename {view/taoler/admin => app/admin/view}/forum/replysform.html (100%) rename {view/taoler/admin => app/admin/view}/forum/tags.html (100%) rename {view/taoler/admin => app/admin/view}/forum/tagsform.html (100%) rename {view/taoler/admin => app/admin/view}/index/home.html (100%) rename {view/taoler/admin => app/admin/view}/index/index.html (100%) rename {view/taoler/admin => app/admin/view}/key_auth/add.html (100%) rename {view/taoler/admin => app/admin/view}/key_auth/edit.html (100%) rename {view/taoler/admin => app/admin/view}/key_auth/index.html (100%) rename {view/taoler/admin => app/admin/view}/login/forget.html (100%) rename {view/taoler/admin => app/admin/view}/login/login.html (100%) rename {view/taoler/admin => app/admin/view}/login/reg.html (100%) rename {view/taoler/admin => app/admin/view}/notice/edit.html (100%) rename {view/taoler/admin => app/admin/view}/notice/index.html (100%) rename {view/taoler/admin => app/admin/view}/public/base.html (100%) rename {view/taoler/admin => app/admin/view}/public/header.html (100%) rename {view/taoler/admin => app/admin/view}/public/page_tabs.html (100%) rename {view/taoler/admin => app/admin/view}/public/side_menu.html (100%) rename {view/taoler/admin => app/admin/view}/set/system/server.html (100%) rename {view/taoler/admin => app/admin/view}/set/system/signedit.html (100%) rename {view/taoler/admin => app/admin/view}/set/system/vipedit.html (100%) rename {view/taoler/admin => app/admin/view}/set/system/website.html (100%) rename {view/taoler/admin => app/admin/view}/set/user/info.html (100%) rename {view/taoler/admin => app/admin/view}/set/user/repass.html (100%) rename {view/taoler/admin => app/admin/view}/slider/add.html (100%) rename {view/taoler/admin => app/admin/view}/slider/edit.html (100%) rename {view/taoler/admin => app/admin/view}/slider/index.html (100%) rename {view/taoler/admin => app/admin/view}/upgrade/index.html (100%) rename {view/taoler/admin => app/admin/view}/upgrade/keyedit.html (100%) rename {view/taoler/admin => app/admin/view}/user/list.html (100%) rename {view/taoler/admin => app/admin/view}/user/useredit.html (100%) rename {view/taoler/admin => app/admin/view}/user/userform.html (100%) diff --git a/app/admin/config/view.php b/app/admin/config/view.php new file mode 100644 index 0000000..01259a0 --- /dev/null +++ b/app/admin/config/view.php @@ -0,0 +1,25 @@ + 'Think', + // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法 + 'auto_rule' => 1, + // 模板目录名 + 'view_dir_name' => 'view', + // 模板后缀 + 'view_suffix' => 'html', + // 模板文件名分隔符 + 'view_depr' => DIRECTORY_SEPARATOR, + // 模板引擎普通标签开始标记 + 'tpl_begin' => '{', + // 模板引擎普通标签结束标记 + 'tpl_end' => '}', + // 标签库标签开始标记 + 'taglib_begin' => '{', + // 标签库标签结束标记 + 'taglib_end' => '}', +]; diff --git a/view/taoler/admin/.gitignore b/app/admin/view/.gitignore similarity index 100% rename from view/taoler/admin/.gitignore rename to app/admin/view/.gitignore diff --git a/view/taoler/admin/admin/add.html b/app/admin/view/admin/add.html similarity index 100% rename from view/taoler/admin/admin/add.html rename to app/admin/view/admin/add.html diff --git a/view/taoler/admin/admin/edit.html b/app/admin/view/admin/edit.html similarity index 100% rename from view/taoler/admin/admin/edit.html rename to app/admin/view/admin/edit.html diff --git a/view/taoler/admin/admin/index.html b/app/admin/view/admin/index.html similarity index 100% rename from view/taoler/admin/admin/index.html rename to app/admin/view/admin/index.html diff --git a/view/taoler/admin/auth_access/add.html b/app/admin/view/auth_access/add.html similarity index 100% rename from view/taoler/admin/auth_access/add.html rename to app/admin/view/auth_access/add.html diff --git a/view/taoler/admin/auth_access/edit.html b/app/admin/view/auth_access/edit.html similarity index 100% rename from view/taoler/admin/auth_access/edit.html rename to app/admin/view/auth_access/edit.html diff --git a/view/taoler/admin/auth_access/index.html b/app/admin/view/auth_access/index.html similarity index 100% rename from view/taoler/admin/auth_access/index.html rename to app/admin/view/auth_access/index.html diff --git a/view/taoler/admin/auth_group/role.html b/app/admin/view/auth_group/role.html similarity index 100% rename from view/taoler/admin/auth_group/role.html rename to app/admin/view/auth_group/role.html diff --git a/view/taoler/admin/auth_group/roleadd.html b/app/admin/view/auth_group/roleadd.html similarity index 100% rename from view/taoler/admin/auth_group/roleadd.html rename to app/admin/view/auth_group/roleadd.html diff --git a/view/taoler/admin/auth_group/roleedit.html b/app/admin/view/auth_group/roleedit.html similarity index 100% rename from view/taoler/admin/auth_group/roleedit.html rename to app/admin/view/auth_group/roleedit.html diff --git a/view/taoler/admin/auth_rule/add.html b/app/admin/view/auth_rule/add.html similarity index 100% rename from view/taoler/admin/auth_rule/add.html rename to app/admin/view/auth_rule/add.html diff --git a/view/taoler/admin/auth_rule/edit.html b/app/admin/view/auth_rule/edit.html similarity index 100% rename from view/taoler/admin/auth_rule/edit.html rename to app/admin/view/auth_rule/edit.html diff --git a/view/taoler/admin/auth_rule/index.html b/app/admin/view/auth_rule/index.html similarity index 100% rename from view/taoler/admin/auth_rule/index.html rename to app/admin/view/auth_rule/index.html diff --git a/view/taoler/admin/forum/list.html b/app/admin/view/forum/list.html similarity index 100% rename from view/taoler/admin/forum/list.html rename to app/admin/view/forum/list.html diff --git a/view/taoler/admin/forum/listform.html b/app/admin/view/forum/listform.html similarity index 100% rename from view/taoler/admin/forum/listform.html rename to app/admin/view/forum/listform.html diff --git a/view/taoler/admin/forum/replys.html b/app/admin/view/forum/replys.html similarity index 100% rename from view/taoler/admin/forum/replys.html rename to app/admin/view/forum/replys.html diff --git a/view/taoler/admin/forum/replysform.html b/app/admin/view/forum/replysform.html similarity index 100% rename from view/taoler/admin/forum/replysform.html rename to app/admin/view/forum/replysform.html diff --git a/view/taoler/admin/forum/tags.html b/app/admin/view/forum/tags.html similarity index 100% rename from view/taoler/admin/forum/tags.html rename to app/admin/view/forum/tags.html diff --git a/view/taoler/admin/forum/tagsform.html b/app/admin/view/forum/tagsform.html similarity index 100% rename from view/taoler/admin/forum/tagsform.html rename to app/admin/view/forum/tagsform.html diff --git a/view/taoler/admin/index/home.html b/app/admin/view/index/home.html similarity index 100% rename from view/taoler/admin/index/home.html rename to app/admin/view/index/home.html diff --git a/view/taoler/admin/index/index.html b/app/admin/view/index/index.html similarity index 100% rename from view/taoler/admin/index/index.html rename to app/admin/view/index/index.html diff --git a/view/taoler/admin/key_auth/add.html b/app/admin/view/key_auth/add.html similarity index 100% rename from view/taoler/admin/key_auth/add.html rename to app/admin/view/key_auth/add.html diff --git a/view/taoler/admin/key_auth/edit.html b/app/admin/view/key_auth/edit.html similarity index 100% rename from view/taoler/admin/key_auth/edit.html rename to app/admin/view/key_auth/edit.html diff --git a/view/taoler/admin/key_auth/index.html b/app/admin/view/key_auth/index.html similarity index 100% rename from view/taoler/admin/key_auth/index.html rename to app/admin/view/key_auth/index.html diff --git a/view/taoler/admin/login/forget.html b/app/admin/view/login/forget.html similarity index 100% rename from view/taoler/admin/login/forget.html rename to app/admin/view/login/forget.html diff --git a/view/taoler/admin/login/login.html b/app/admin/view/login/login.html similarity index 100% rename from view/taoler/admin/login/login.html rename to app/admin/view/login/login.html diff --git a/view/taoler/admin/login/reg.html b/app/admin/view/login/reg.html similarity index 100% rename from view/taoler/admin/login/reg.html rename to app/admin/view/login/reg.html diff --git a/view/taoler/admin/notice/edit.html b/app/admin/view/notice/edit.html similarity index 100% rename from view/taoler/admin/notice/edit.html rename to app/admin/view/notice/edit.html diff --git a/view/taoler/admin/notice/index.html b/app/admin/view/notice/index.html similarity index 100% rename from view/taoler/admin/notice/index.html rename to app/admin/view/notice/index.html diff --git a/view/taoler/admin/public/base.html b/app/admin/view/public/base.html similarity index 100% rename from view/taoler/admin/public/base.html rename to app/admin/view/public/base.html diff --git a/view/taoler/admin/public/header.html b/app/admin/view/public/header.html similarity index 100% rename from view/taoler/admin/public/header.html rename to app/admin/view/public/header.html diff --git a/view/taoler/admin/public/page_tabs.html b/app/admin/view/public/page_tabs.html similarity index 100% rename from view/taoler/admin/public/page_tabs.html rename to app/admin/view/public/page_tabs.html diff --git a/view/taoler/admin/public/side_menu.html b/app/admin/view/public/side_menu.html similarity index 100% rename from view/taoler/admin/public/side_menu.html rename to app/admin/view/public/side_menu.html diff --git a/view/taoler/admin/set/system/server.html b/app/admin/view/set/system/server.html similarity index 100% rename from view/taoler/admin/set/system/server.html rename to app/admin/view/set/system/server.html diff --git a/view/taoler/admin/set/system/signedit.html b/app/admin/view/set/system/signedit.html similarity index 100% rename from view/taoler/admin/set/system/signedit.html rename to app/admin/view/set/system/signedit.html diff --git a/view/taoler/admin/set/system/vipedit.html b/app/admin/view/set/system/vipedit.html similarity index 100% rename from view/taoler/admin/set/system/vipedit.html rename to app/admin/view/set/system/vipedit.html diff --git a/view/taoler/admin/set/system/website.html b/app/admin/view/set/system/website.html similarity index 100% rename from view/taoler/admin/set/system/website.html rename to app/admin/view/set/system/website.html diff --git a/view/taoler/admin/set/user/info.html b/app/admin/view/set/user/info.html similarity index 100% rename from view/taoler/admin/set/user/info.html rename to app/admin/view/set/user/info.html diff --git a/view/taoler/admin/set/user/repass.html b/app/admin/view/set/user/repass.html similarity index 100% rename from view/taoler/admin/set/user/repass.html rename to app/admin/view/set/user/repass.html diff --git a/view/taoler/admin/slider/add.html b/app/admin/view/slider/add.html similarity index 100% rename from view/taoler/admin/slider/add.html rename to app/admin/view/slider/add.html diff --git a/view/taoler/admin/slider/edit.html b/app/admin/view/slider/edit.html similarity index 100% rename from view/taoler/admin/slider/edit.html rename to app/admin/view/slider/edit.html diff --git a/view/taoler/admin/slider/index.html b/app/admin/view/slider/index.html similarity index 100% rename from view/taoler/admin/slider/index.html rename to app/admin/view/slider/index.html diff --git a/view/taoler/admin/upgrade/index.html b/app/admin/view/upgrade/index.html similarity index 100% rename from view/taoler/admin/upgrade/index.html rename to app/admin/view/upgrade/index.html diff --git a/view/taoler/admin/upgrade/keyedit.html b/app/admin/view/upgrade/keyedit.html similarity index 100% rename from view/taoler/admin/upgrade/keyedit.html rename to app/admin/view/upgrade/keyedit.html diff --git a/view/taoler/admin/user/list.html b/app/admin/view/user/list.html similarity index 100% rename from view/taoler/admin/user/list.html rename to app/admin/view/user/list.html diff --git a/view/taoler/admin/user/useredit.html b/app/admin/view/user/useredit.html similarity index 100% rename from view/taoler/admin/user/useredit.html rename to app/admin/view/user/useredit.html diff --git a/view/taoler/admin/user/userform.html b/app/admin/view/user/userform.html similarity index 100% rename from view/taoler/admin/user/userform.html rename to app/admin/view/user/userform.html From bf750611cc11d82f6766356ad5186270af3945ab Mon Sep 17 00:00:00 2001 From: toogee Date: Tue, 12 May 2020 21:07:15 +0800 Subject: [PATCH 2/2] comment order --- app/index/controller/Article.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index/controller/Article.php b/app/index/controller/Article.php index 12b4f3b..2aa1eaa 100644 --- a/app/index/controller/Article.php +++ b/app/index/controller/Article.php @@ -158,7 +158,7 @@ class Article extends BaseController ])->find($id); Cache::tag('tagArtDetail')->set('article_'.$id,$article,3600); } - $comments = $article->comments()->where('status',1)->paginate(10); + $comments = $article->comments()->where('status',1)->order(['cai'=>'asc','create_time'=>'asc'])->paginate(10); $article->inc('pv')->update(); $pv = Db::name('article')->field('pv')->where('id',$id)->value('pv');