diff --git a/app/admin/controller/Upgrade.php b/app/admin/controller/Upgrade.php index 1dd6e4e..43b6a2b 100644 --- a/app/admin/controller/Upgrade.php +++ b/app/admin/controller/Upgrade.php @@ -3,11 +3,11 @@ * 升级包规定的目录结构 * xxx_版本号.zip(如：xxx_1.0.0.zip) * | - * |————mysql + * |————runtime * | | - * | |___mysql_update.sql(更新脚本) //create table test(id init(11)); create table test2(id init(11)); + * | |___update.sql(更新脚本) //create table test(id init(11)); create table test2(id init(11)); * - * | |___mysql_rockback.sql（回滚脚本） //drop table test; //drop table test2; + * | |___rockback.sql（回滚脚本） //drop table test; //drop table test2; * | * |____php * @@ -273,7 +273,7 @@ class Upgrade extends AdminController } //升级sql操作 - $upSql = $zipPath.'runtime/mysql_update.sql'; + $upSql = $zipPath.'runtime/update.sql'; if(file_exists($upSql)) { $sqlRes = $this->db_update($upSql); diff --git a/app/index/controller/Error.php b/app/index/controller/Error.php index cb2d0fb..56486fe 100644 --- a/app/index/controller/Error.php +++ b/app/index/controller/Error.php @@ -2,11 +2,13 @@ namespace app\index\controller; use think\facade\View; +use app\common\controller\BaseController; -class Error +class Error extends BaseController { public function __call($method, $args) { - return View::fetch('../view/404'); + View::assign('jspage',''); + return View::fetch('../../404'); } } \ No newline at end of file diff --git a/app/index/route/route.php b/app/index/route/route.php index ef4d7d8..d61dfdb 100644 --- a/app/index/route/route.php +++ b/app/index/route/route.php @@ -19,8 +19,8 @@ Route::group(function () { 'ename' => '\w+', 'page' => '\d+', ]); - Route::rule('add','article/add'); - Route::rule('edit/[:id]','article/edit'); + Route::rule('add','Article/add'); + Route::rule('edit/[:id]','Article/edit'); //Route::rule('del/:id','article/delete'); }); Route::group(function () { diff --git a/config/app.php b/config/app.php index e2ea10b..c0953dd 100644 --- a/config/app.php +++ b/config/app.php @@ -22,7 +22,8 @@ return [ // 域名绑定（自动多应用模式有效） 'domain_bind' => [ //'www' => 'index', - //'admin' => 'admin' + //'adm' => 'admin', + //'api' => 'api' ], // 禁止URL访问的应用列表（自动多应用模式有效） 'deny_app_list' => [], @@ -33,10 +34,10 @@ return [ // 错误显示信息,非调试模式有效 'error_message' => '页面错误！请稍后再试～', // 显示错误信息 - 'show_error_msg' => false, + 'show_error_msg' => true, //异常页面模板 'http_exception_template' => [ - 404 => '../view/404.html', - 500 => '../view/404.html' + 404 => '404.html', + 500 => '404.html' ] ]; diff --git a/config/taoler.php b/config/taoler.php index 05602d7..0b08acd 100644 --- a/config/taoler.php +++ b/config/taoler.php @@ -7,7 +7,7 @@ return [ //应用名,此项不可更改 'appname' => 'TaoLer', //版本配置 - 'version' => '1.8.2', + 'version' => '1.8.3', //加盐 'salt' => 'taoler', //数据库备份目录 @@ -17,9 +17,9 @@ return [ 'email_notice' => 0, 'cate_show' => 0, 'area_show' => 0, - 'regist_check' => 0, - 'posts_check' => 0, - 'commnets_check' => 0, + 'regist_check' => 1, + 'posts_check' => 1, + 'commnets_check' => 1, ] diff --git a/config/view.php b/config/view.php index 2caf977..8832391 100644 --- a/config/view.php +++ b/config/view.php @@ -16,7 +16,7 @@ return [ // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法 'auto_rule' => 1, // 模板目录名 - 'view_dir_name' => 'view/'.$template, + 'view_dir_name' => 'view\\'.$template, // 模板后缀 'view_suffix' => 'html', // 模板文件名分隔符 diff --git a/view/404.html b/view/404.html index aafec2c..9ea13b2 100644 --- a/view/404.html +++ b/view/404.html @@ -9,7 +9,7 @@

-

页面或者数据被 纸飞机运到火星了，啥都看不到了…

+

页面或者数据被 纸飞机啊！运到火星了，啥都看不到了…

@@ -17,7 +17,7 @@ {block name="script"} - -{/block} \ No newline at end of file diff --git a/view/view/taoler/index/article/detail.html b/view/view/taoler/index/article/detail.html deleted file mode 100644 index 4cd03f1..0000000 --- a/view/view/taoler/index/article/detail.html +++ /dev/null @@ -1,335 +0,0 @@ -{extend name="public/base" /} - -{block name="title"}{$article.title}-{$sysInfo.webname}{/block} -{block name="keywords"}{$article.title},{$article.tags}{/block} -{block name="description"}{$article.title},{:getArtContent($article.content)}{/block} -{block name="link"}{/block} -{block name="column"}
{include file="/public/column" /}
{/block} -{block name="content"} -
-
-
-
-

{$article.title} -
-

- - {$comments->count()} - {$pv} - - -
- - {$article.user.name} - - -
- - {if config('taoler.config.area_show') == 1}{:getAsing($article.user.area_id) ?: '无'}{/if} - {$article.user.nickname ?: $article.user.name} - -
-
-
- {if ($user.auth ?? '')} - - {if($article.is_top == 0)} - - {else /} - {:lang('cancel topping')} - {/if} - {if($article.is_hot == 0)} - - {else /} - {:lang('cancel hoting')} - {/if} - {if($article.is_reply == 1)} - - {else /} - {:lang('enable reply')} - {/if} - {:lang('title color')} - {/if} - {if(session('user_name')==$article.user.name || ($user.auth ?? ''))} - {:lang('edit')} - {/if} -
-
- -
- -
- - -
- - -
-
{$article.content|raw}
- {notempty name="$article.upzip"} -
- - -
- {/notempty} -
- -
- 评论 {$comments->count()} - -
{$comments|raw}
- {if condition="$article.is_reply == 1"} -
-
- -
- -
-
-
- - - -
-
- {else /} -
本帖已设置禁止回复
- {/if} -
-
-
-
-
{:lang('sponsor')}- - {:lang('i want to join')} -
-
- {volist name="ad_comm" id="vo"} - {$vo.slid_name} - {/volist} -
-
-
-
{:lang('hot post list')}
- {volist name="artHot" id="vo"} -
- {$vo.title} - {$vo.comments_count} -
- {/volist} -
-
- {volist name="ad_art" id="vo"} - - {/volist} -
- -
-
-{include file="public/menu" /} - -
-
-
- -
-{/block} -{block name="script"} - -{/block} \ No newline at end of file diff --git a/view/view/taoler/index/article/edit.html b/view/view/taoler/index/article/edit.html deleted file mode 100644 index b287a7b..0000000 --- a/view/view/taoler/index/article/edit.html +++ /dev/null @@ -1,270 +0,0 @@ -{extend name="public/base" /} - -{block name="title"}编辑帖子{/block} -{block name="link"}{/block} -{block name="column"}{/block} -{block name="content"} -
{include file="public/menu" /}
-
-
- -
-
-
    -
  • {:lang('edit post')}
    • -
-
-
- - -
-
- -
- -
-
-
- -
- - - -
-
- {if ($user.auth == 1)} -
-
-
-
- {/if} -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
- -
-
-
-
- -
- -
-
发表后无法更改飞吻
-
-
-
-
- -
- -
- -
-
- -
-
- -
- -
- -
-
-
-
- {volist name="tags" id="vo" } - - {/volist} -
-
-
- -
- -
-
- captcha -
-
-
- -
- -
-
-
-
-
-
-{/block} - -{block name="script"} - -{/block} \ No newline at end of file diff --git a/view/view/taoler/index/login/forget.html b/view/view/taoler/index/login/forget.html deleted file mode 100644 index 2d366a3..0000000 --- a/view/view/taoler/index/login/forget.html +++ /dev/null @@ -1,186 +0,0 @@ -{extend name="public/base" /} - -{block name="title"}{:lang('retrieve password')}{/block} -{block name="column"}{/block} -{block name="content"} -
{include file="public/menu" /}
-
-
-
-
    -
  • {:lang('login')}
    • -
  • {if cache('repass')==2}{:lang('reset password')}{else /}{:lang('retrieve password')}{/if}
    • -
-
-
- {//验证码} - {if cache('repass') == 'postcode'} -
-
- -
- -
-
-
- - {:lang('go back')} -
-
- {elseif cache('repass') == 'resetpass' /} - -
{:lang('reset password')}
-
-
- -
- -
-
{:lang('6-16 characters')}
-
-
- -
- -
-
-
- -
- -
-
- -
- captcha -
- -
-
-
- - -
-
-
该重置密码链接已失效，请重新校验您的信息
-
非法链接，请重新校验您的信息
- {else /} - {//发邮件} -
-
- -
- -
-
-
- -
- -
-
- -
captcha
- -
-
-
- -
-
- {/if} -
-
-
-
-
-{/block} - -{block name="script"} - -{/block} diff --git a/view/view/taoler/index/login/reg.html b/view/view/taoler/index/login/reg.html deleted file mode 100644 index 29a43f3..0000000 --- a/view/view/taoler/index/login/reg.html +++ /dev/null @@ -1,105 +0,0 @@ -{extend name="public:base" /} - -{block name="title"}注册账号{/block} -{block name="column"}{/block} -{block name="content"} -
{include file="public/menu" /}
-
-
-
- -
-
-
-
- -
- -
-
-
- -
- -
-
{:lang('the only way to get back your password')}
-
-
- -
- -
-
{:lang('strong type encryption')}
-
-
- -
- -
-
-
- -
- -
-
- -
- captcha -
- -
-
-
- -
- -
-
-
-
-
-
-{/block} - -{block name="script"} - -{/block} diff --git a/view/view/taoler/index/public/user.html b/view/view/taoler/index/public/user.html deleted file mode 100644 index 87f4af2..0000000 --- a/view/view/taoler/index/public/user.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - 用户中心 - - - - - - - {block name="css"}{/block} - - -{include file="public/header" /} -
-{include file="public/user-nav" /} -
- {block name="content"} - {/block} -
-
-{include file="public/footer" /} - -{block name="script"} - -{/block} - - \ No newline at end of file diff --git a/view/view/taoler/index/user/set.html b/view/view/taoler/index/user/set.html deleted file mode 100644 index 3a9ce21..0000000 --- a/view/view/taoler/index/user/set.html +++ /dev/null @@ -1,171 +0,0 @@ -{extend name="public/user" /} - -{block name="content"} -
- -
-
-
- - -
- -
-
如果您在邮箱已激活的情况下，变更了邮箱，需重新验证邮箱。
-
-
- -
- -
-
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- -
-
-
-

建议尺寸168*168，支持jpg、png、gif，最大不能超过50KB

- - - -
-
-
- -
- -
- -
- -
-
-
- -
- -
-
6到16个字符
-
-
- -
- -
-
-
- -
-
- -
-
    -
  • - - 已成功绑定，您可以使用QQ帐号直接登录Fly社区，当然，您也可以 - 解除绑定 - - -
    • -
  • - - - - 立即绑定 - ，即可使用微博帐号登录Fly社区 -
    • -
-
-
-
-{/block} - -{block name="script"} - -{/block} \ No newline at end of file