diff --git a/app/admin/controller/Database.php b/app/admin/controller/Database.php index 1653e29..6d51de6 100644 --- a/app/admin/controller/Database.php +++ b/app/admin/controller/Database.php @@ -107,7 +107,7 @@ class Database extends BaseController } // 执行还原数据库操作 - public function import(string $id) + public function import(int $id) { $list = $this->db->getFile('timeverif', $id); $this->db->setFile($list)->import(1); @@ -120,12 +120,12 @@ class Database extends BaseController $file_name = $name; //得到文件名 header("Content-type:text/html;charset=utf-8"); $file_name = iconv("utf-8","gb2312",$file_name); // 转换编码 - $file_sub_path = CMS_ROOT . '/public'.$this->config['path']; //确保文件在这个路径下面，换成你文件所在的路径 + $file_sub_path = $this->config['path']; //确保文件在这个路径下面，换成你文件所在的路径 $file_path = $file_sub_path . $file_name; # 将反斜杠 替换成正斜杠 $file_path = str_replace('\\','/',$file_path); if(!file_exists($file_path)){ - $this->error('下载文件不存在！');exit; //如果提示这个错误，很可能你的路径不对，可以打印$file_sub_path查看 + $this->error($file_path);exit; //如果提示这个错误，很可能你的路径不对，可以打印$file_sub_path查看 } $fp = fopen($file_path,"r"); // 以可读的方式打开这个文件 # 如果出现图片无法打开，可以在这个位置添加函数 diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index 0641cce..3e0e1ff 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -21,9 +21,14 @@ class Index extends BaseController $adminCount=Db::name('admin')->where('status','1')->count(); $userCount=Db::name('user')->where('status','1')->count(); $articleCount=Db::name('article')->where('status','1')->count(); + $install=false; + if (file_exists(CMS_ROOT . 'app/install')) { + $install=true; + } View::assign('adminCount', $adminCount); View::assign('userCount', $userCount); View::assign('articleCount', $articleCount); + View::assign('install', $install); return View(); } diff --git a/app/admin/middleware/Install.php b/app/admin/middleware/Install.php index 9d3999a..3ed541b 100644 --- a/app/admin/middleware/Install.php +++ b/app/admin/middleware/Install.php @@ -8,7 +8,7 @@ class Install public function handle($request, \Closure $next) { if (!is_installed()) { - return $request->isAjax()?vae_assign(202,'请先完成系统安装引导'):redirect((string)url('/install/index')); + return $request->isAjax()?to_assign(0,'请先完成系统安装引导'):redirect((string)url('/install/index')); } return $next($request); } diff --git a/app/admin/model/AdminLog.php b/app/admin/model/AdminLog.php index d811694..0809fb0 100644 --- a/app/admin/model/AdminLog.php +++ b/app/admin/model/AdminLog.php @@ -13,9 +13,7 @@ class AdminLog extends Model public function get_title($type) { $type_array=[ - 'Conf/web_submit'=>'网站信息', - 'Conf/email_submit'=>'邮箱配置', - 'Conf/wechat_submit'=>'微信配置', + 'Conf/conf_submit'=>'配置信息', 'Menu/post_submit'=>'菜单', 'Menu/delete'=>'菜单', 'Rule/post_submit'=>'节点', diff --git a/app/admin/view/common/ueditor.html b/app/admin/view/common/ueditor.html index c38136f..018461c 100644 --- a/app/admin/view/common/ueditor.html +++ b/app/admin/view/common/ueditor.html @@ -13,7 +13,7 @@ if(readonly=='true'){ read=true; } - var toolbar=['fullscreen', 'source', 'undo', 'redo','|','fontsize','bold', 'italic', 'underline','forecolor', 'strikethrough', 'superscript', 'subscript','|', 'removeformat', 'formatmatch', 'autotypeset', 'pasteplain','link','unlink','|','justifyleft','justifycenter','justifyright','justifyjustify','|', 'insertorderedlist', 'insertunorderedlist','simpleupload', 'insertimage', 'inserttable', 'selectall', 'cleardoc']; + var toolbar=['fullscreen', 'source', 'undo', 'redo','|','fontsize','bold', 'italic', 'underline','forecolor', 'strikethrough', 'superscript', 'subscript','|', 'removeformat', 'formatmatch', 'insertcode', 'pasteplain','link','unlink','|','justifyleft','justifycenter','justifyright','justifyjustify','|', 'insertorderedlist', 'insertunorderedlist','simpleupload', 'insertimage', 'inserttable', 'selectall', 'cleardoc']; if(toolbarArray && toolbarArray.length>0){ toolbar=toolbarArray; } diff --git a/app/admin/view/index/main.html b/app/admin/view/index/main.html index 4fe4f83..e3f8731 100644 --- a/app/admin/view/index/main.html +++ b/app/admin/view/index/main.html @@ -123,6 +123,11 @@
系统信息
+ {if condition="($install == true)"} + + + + {/if} diff --git a/app/home/middleware/Install.php b/app/home/middleware/Install.php index b98aa8a..838f820 100644 --- a/app/home/middleware/Install.php +++ b/app/home/middleware/Install.php @@ -8,7 +8,7 @@ class Install public function handle($request, \Closure $next) { if (!is_installed()) { - return $request->isAjax()?vae_assign(202,'请先完成系统安装引导'):redirect((string)url('/install/index')); + return $request->isAjax()?to_assign(0,'请先完成系统安装引导'):redirect((string)url('/install/index')); } return $next($request); diff --git a/app/home/view/user/info_edit.html b/app/home/view/user/info_edit.html index 03b9ac5..59fedbc 100644 --- a/app/home/view/user/info_edit.html +++ b/app/home/view/user/info_edit.html @@ -135,16 +135,6 @@ email = $('[name="email"]').val(), mobile = $('[name="mobile"]').val(); - $.ajax({ - url: "http://i.slambase.cn:8081/v1/user", - data: "{'user_id':'ceshi'}", - type: 'post', - contentType: "application/json;charset=UTF-8",//指定消息请求类型 - success: function (res) { - console.log(res); - } - }) - return false; if (truename == '') { layer.msg('真实姓名不能为空'); return; diff --git a/app/install/data/gougucms.sql b/app/install/data/gougucms.sql index 3a16516..5dd47f4 100644 --- a/app/install/data/gougucms.sql +++ b/app/install/data/gougucms.sql @@ -520,6 +520,7 @@ CREATE TABLE `cms_user` ( `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态 -1删除 0禁用 1正常 ', `last_login_time` int(11) NOT NULL DEFAULT '0' COMMENT '最后登录时间', `last_login_ip` varchar(20) NOT NULL DEFAULT '' COMMENT '最后登录IP', + `login_num` int(11) NOT NULL DEFAULT '0', `register_time` int(11) NOT NULL DEFAULT '0' COMMENT '注册时间', `register_ip` varchar(20) NOT NULL DEFAULT '' COMMENT '注册IP', `wx_platform` int(11) NOT NULL DEFAULT 0 COMMENT '首次注册来自于哪个微信平台', @@ -529,6 +530,7 @@ CREATE TABLE `cms_user` ( -- ---------------------------- -- Table structure for `cms_user_log` -- ---------------------------- +DROP TABLE IF EXISTS `cms_user_log`; CREATE TABLE `cms_user_log` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', `uid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '用户ID', @@ -543,7 +545,7 @@ CREATE TABLE `cms_user_log` ( `param_id` int(11) unsigned NOT NULL COMMENT '操作ID', `param` text COMMENT '参数json格式', `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0删除 1正常', - `create_time` int(11) NOT NULL DEFAULT '0' '创建时间', + `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户操作日志表'; diff --git a/app/install/view/index/step3.html b/app/install/view/index/step3.html index aff0065..c08b5a1 100644 --- a/app/install/view/index/step3.html +++ b/app/install/view/index/step3.html @@ -35,8 +35,8 @@
-

数据库配置


+

数据库配置


@@ -129,7 +129,7 @@
-
提醒：发现app目录下的install文件夹没删除，为了系统的安全,请手动去删除。
服务器系统 {:get_system_info('os')}