新增账户激活，优化分类分页

README.md

@@ -7,8 +7,8 @@
  * 后台：http://adm.aieok.com:888
  * 账号：test
  * 密码：test123
- * 版本：TaoLer 1.8.1
+ * 版本：TaoLer 1.8.2
- * 日期：2021.8.4
+ * 日期：2021.8.5
 
 #### 项目地址
 

app/admin/controller/Login.php

@@ -26,13 +26,13 @@ class Login extends AdminController
 			}
 
 			$user = new \app\admin\model\Admin();
-			$res = $user->login($data);
+			$result = $user->login($data);
 
-			if ($res == 1) {
+			if ($result == 1) {
 				$res = ['code'=>0,'msg'=>'登陆成功', 'url'=>(string) url('index/index')];
 				//$res['data']['access_token'] = $data['__token__'];
 			} else {
-				$res = ['code'=>-1,'msg'=>$res,'url'=>'admin/login'];
+				$res = ['code'=>-1,'msg'=>$result,'url'=>(string) url('admin/login')];
 			}
 			return json($res);
 		}

app/admin/controller/Set.php

@@ -141,7 +141,7 @@ class Set extends AdminController
         $upRes = $uploads->put('file','logo',2000,'image','uniqid');
         $logoJson = $upRes->getData();
 		if($logoJson['status'] == 0){
-			$result = Db::name('system')->where('id', 1)->update(['logo'=>$logoJson['url']]);
+			$result = Db::name('system')->where('id', 1)->cache('system')->update(['logo'=>$logoJson['url']]);
 			if($result){
 				$res = ['code'=>0,'msg'=>'上传logo成功'];
 			} else {

app/admin/controller/Upgrade.php

@@ -226,19 +226,6 @@ class Upgrade extends AdminController
         //$package_name = str_replace('.zip','',$package_file);
 
         Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'success','progress'=>'50%','msg'=>'升级文件解压成功！']);
-
-		//升级sql操作
-        $upSql = $zipPath.'runtime/mysql_update.sql';
-		if(file_exists($upSql))
-		{
-			$sqlRes = $this->db_update($upSql);
-			$upDate = $sqlRes->getData();
-			if($upDate['code'] == -1){
-				return json(['code'=>-1,'msg'=>$upDate['msg']]);
-			}
-			//删除sql语句
-			unlink($upSql);
-		}
 		
 		//升级PHP
         if(is_dir($zipPath))
@@ -284,6 +271,19 @@ class Upgrade extends AdminController
 			Files::delDirAndFile($this->upload_dir);
 			Files::delDirAndFile($this->backup_dir);
         }
+		
+		//升级sql操作
+        $upSql = $zipPath.'runtime/mysql_update.sql';
+		if(file_exists($upSql))
+		{
+			$sqlRes = $this->db_update($upSql);
+			$upDate = $sqlRes->getData();
+			if($upDate['code'] == -1){
+				return json(['code'=>-1,'msg'=>$upDate['msg']]);
+			}
+			//删除sql语句
+			unlink($upSql);
+		}
 
         Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'success','progress'=>'100%','msg'=>'升级成功！']);
         //更新系统的版本号了

app/admin/view/set/system/website.html

@@ -7,11 +7,11 @@
         <div class="layui-card">
           <div class="layui-card-body">
 		  
-            <div class="layui-tab layui-tab-brief" lay-filter="component-tabs-brief">
+            <div class="layui-tab layui-tab-brief" lay-filter="website-tabs-brief">
               <ul class="layui-tab-title">
                 <li class="layui-this" lay-id="website">网站设置</li>
                 <li lay-id="email">邮箱服务</li>
-				<li lay-id="email">服务配置</li>
+				<li lay-id="config">服务配置</li>
               </ul>
               <div class="layui-tab-content">
                 <div class="layui-tab-item layui-show">
@@ -265,6 +265,7 @@
     var $ = layui.$
 	,form = layui.form
 	,upload = layui.upload;
+	var element  =layui.element ;
 		
 	//LOGO选完文件后不自动上传
 	  upload.render({
@@ -278,19 +279,12 @@
 		,bindAction: '#logo-upload-button'
 		,done: function(res){
 		  if(res.code == 0){
-				layer.msg(res.msg,{
+				layer.msg(res.msg,{icon:6,tiye:2000
-					icon:6,
-					tiye:2000
 				},function(){
 					location.reload();
 				});
 			} else {
-				layer.open({
+				layer.open({title:"上传失败",content:res.msg,icon:5,anim:6});
-					title:"上传失败",
-					content:res.msg,
-					icon:5,
-					anim:6
-				});
 			}
 		}
 	  });
@@ -300,8 +294,6 @@
 	$.post("{:url('admin/set/config')}",field,function(res){
         if(res.code == 0){
 				layer.msg(res.msg,{icon:6,tiye:2000
-				},function(){
-					location.reload();
 				});
 			} else {
 				layer.open({title:"设置失败",content:res.msg,icon:5,anim:6});
@@ -315,8 +307,6 @@
 	$.post("{:url('admin/set/sendMailCode')}",field,function(res){
         if(res.code == 0){
 				layer.msg(res.msg,{icon:6,tiye:2000
-				},function(){
-					location.reload();
 				});
 			} else {
 				layer.open({title:"设置失败",content:res.msg,icon:5,anim:6});
@@ -331,8 +321,6 @@
 	$.post("{:url('admin/set/activeMailServer')}",field,function(res){
         if(res.code == 0){
 				layer.msg(res.msg,{icon:6,tiye:2000
-				},function(){
-					location.reload();
 				});
 			} else {
 				layer.open({title:"设置失败",content:res.msg,icon:5,anim:6});
@@ -340,6 +328,18 @@
     });
     return false;
   });
+  
+   //显示当前tab
+  if(location.hash){
+    element.tabChange('website-tabs-brief', location.hash.replace(/^#/, ''));
+  }
+
+  element.on('tab(website-tabs-brief)', function(){
+    var othis = $(this), layid = othis.attr('lay-id');
+    if(layid){
+      location.hash = layid;
+    }
+  });
 	
 	
   });

app/common/controller/BaseController.php

@@ -69,7 +69,7 @@ class BaseController extends BaseCtrl
 		$user = Cache::get('user'.$id);
 		if(!$user){
 			//1.查询用户
-			$user = Db::name('user')->field('id,name,nickname,user_img,sex,area_id,auth,city,email,sign,point,vip,create_time')->find($id);
+			$user = Db::name('user')->field('id,name,nickname,user_img,sex,area_id,auth,city,email,active,sign,point,vip,create_time')->find($id);
 			Cache::tag('user')->set('user'.$id,$user,600);
 		}
         

app/common/model/User.php

@@ -140,7 +140,7 @@ class User extends Model
     {
         $userId = $data['user_id'];
         $user = User::where('id',$userId)->find();
-        $result = $user->allowField(['email','nickname','sex','city','area_id','sign'])->save($data);
+        $result = $user->allowField(['email','active','nickname','sex','city','area_id','sign'])->save($data);
         if($result){
             return 1;
         }else{

app/index/controller/Active.php

@@ -0,0 +1,51 @@
+<?php
+namespace app\index\controller;
+
+use app\common\controller\BaseController;
+use think\facade\Db;
+use think\facade\Cache;
+use think\facade\Request;
+use think\facade\View;
+
+
+class Active extends BaseController
+{	
+
+	//api首页
+	public function index()
+	{
+		View::assign(['jspage'=>'']);
+		return View::fetch('index');
+    }
+
+	//api首页
+	public function email()
+	{
+		if(Request::isPost()){
+			$url = Request::param('url');
+			$atime = substr($url,0,10);
+			$mde = substr($url,10,32);
+			$uid = substr($url,42);
+			$t = time() - $atime;
+			$mins = floor(($t%3600)/60);
+			if($mins > 10){
+				return json(['code'=>-1,'msg'=>'已超时']);
+			}
+			$user = Db::name('user')->find($uid);
+			$umail = md5($user['email']);
+			if($umail == $mde){
+				$result = Db::name('user')->update(['id'=>$uid,'active'=>1]);
+				if($result){
+					Cache::delete('user'.$this->uid);
+					return json(['code'=>0,'msg'=>'激活成功','url'=>(string) url('login/index')]);
+				}else{
+					return json(['code'=>-1,'msg'=>'激活失败！']);
+				}
+			} else {
+				return json(['code'=>-1,'msg'=>'请求错误！']);
+			}
+		}
+
+    }
+
+}

app/index/controller/Article.php

@@ -62,6 +62,7 @@ class Article extends BaseController
         //分类列表
         $article = new ArticleModel();
 		$artList = $article->getCateList($ename,$type,$page,$url,$suffix);
+		$count = $artList->total();
 
 		//	热议文章
 		$artHot = $article->getArtHot(10);
@@ -73,7 +74,7 @@ class Article extends BaseController
         //分类钻展赞助
         $ad_comm = $ad->getSliderList(6);
 		
-		View::assign(['type'=>$type,'artList'=>$artList,'artHot'=>$artHot,'ad_cateImg'=>$ad_cateImg,'ad_comm'=>$ad_comm,'jspage'=>'jie']);
+		View::assign(['type'=>$type,'artList'=>$artList,'artHot'=>$artHot,'ad_cateImg'=>$ad_cateImg,'ad_comm'=>$ad_comm,'jspage'=>'jie','count'=>$count,'page'=>$page,'url'=>$url]);
 		return View::fetch('article/'.$tpl.'/cate');
     }
 

app/index/controller/User.php

@@ -117,6 +117,10 @@ class User extends BaseController
 			if(!$result){
 				$this->error($validate->getError());
 			} else {
+				$mail = Db::name('user')->where('id',$this->uid)->value('email');
+				if($data['email'] !== $mail){
+					$data['active'] = 0;
+				}
                 $user = new userModel;
                 $result = $user->setNew($data);
 				if($result == 1){
@@ -151,7 +155,7 @@ class User extends BaseController
 				if($dirPath !== './static/res/images/avatar'){ //防止删除默认头像
 					unlink('.'.$imgPath);
 				}
-			}  
+			}
             $result = Db::name('user')
                 ->where('id',$this->uid)
                 ->update(['user_img'=>$name_path]);
@@ -202,18 +206,34 @@ class User extends BaseController
         return View::fetch();
     }
 
-	
 	//邮箱激活
 	public function activate()
 	{
-		$this->isLogin();
+		//管理员邮箱
-		$user = UserModel::find($this->uid);
+		$adminEmail = Db::name('user')->where('id',1)->cache(true)->value('email');
-		$this->assign('user',$user);
+		View::assign('adminEmail',$adminEmail);
-		return view();
+		 return View::fetch();
+	}
+	
+	//邮箱激活
+	public function active()
+	{
+
+		if(Request::isPost()){
+			$email = Request::param('email');
+			$url = Request::domain().Request::root().'/active/index?url='.time().md5($email).$this->uid;
+			$content = "Hi亲爱的{$this->showUser($this->uid)['name']}:</br>您正在进行邮箱激活，请在10分钟内完成激活。 <a href='{$url}' target='_blank' >请点击进行激活</a> </br>若无法跳转请复制链接激活：{$url}";
+			$res = mailto($email,'邮箱激活',$content);
+			if($res){
+				return json(['status'=>0]);
+			}else{
+				return json(['status'=>-1,'发送邮件出错！']);
+			}
+		}
 	}
 	
 	//修改密码
-	public function setpass()
+	public function setPass()
 	{
 		if(Request::isAjax()){
 			$data = Request::param();
@@ -226,7 +246,8 @@ class User extends BaseController
 		$result = $user->setpass($data);
 			if($result == 1) {
 				Session::clear();
-				return $this->success('密码修改成功 请登录', '/login');
+				Cookie::delete('auth');
+				return $this->success('密码修改成功 请登录', (string) url('login/index'));
 			} else {
 				return $this->error($result);
 			}

app/install/data/taoler.sql

@@ -379,7 +379,6 @@ CREATE TABLE `tao_mail_server` (
   `port` tinyint(2) NOT NULL COMMENT '邮箱端口',
   `nickname` varchar(20) NOT NULL DEFAULT '' COMMENT '昵称',
   `password` varchar(16) NOT NULL COMMENT '邮箱密码',
-  `active` tinyint(1) NOT NULL DEFAULT '0' COMMENT '邮箱服务1激活0未激活',
   `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
@@ -387,7 +386,7 @@ CREATE TABLE `tao_mail_server` (
 -- ----------------------------
 -- Records of tao_mail_server
 -- ----------------------------
-INSERT INTO `tao_mail_server` VALUES ('1', 'xxxx@aliyun.com', 'smtp.aliyun.com', '25', 'user', '123456', '0', '0');
+INSERT INTO `tao_mail_server` VALUES ('1', 'xxxx@aliyun.com', 'smtp.aliyun.com', '25', 'user', '123456', '0');
 
 -- ----------------------------
 -- Table structure for tao_message
@@ -507,6 +506,7 @@ CREATE TABLE `tao_user` (
   `password` varchar(32) NOT NULL COMMENT '密码',
   `phone` varchar(11) NOT NULL DEFAULT '' COMMENT '手机',
   `email` varchar(50) NOT NULL DEFAULT '' COMMENT '邮箱',
+  `active` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1激活账户0未激活',
   `nickname` varchar(16) NOT NULL DEFAULT '' COMMENT '昵称',
   `city` varchar(50) NOT NULL DEFAULT '' COMMENT '归属地',
   `sex` enum('0','1') NOT NULL DEFAULT '0' COMMENT '性别0男1女',
@@ -533,7 +533,7 @@ CREATE TABLE `tao_user` (
 -- ----------------------------
 -- Records of tao_user
 -- ----------------------------
-INSERT INTO `tao_user` VALUES ('1', 'admin', '95d6f8d0d0c3b45e5dbe4057da1b149e', '2147483647', 'admin@qq.com', '管理员', '北京市', '1', '这是一个社区系统', '/static/res/images/avatar/00.jpg', '1', '0', '1', '1', '0', '127.0.0.1', '0', '0', '0', '0', '1579053025', '1578469091', '0');
+INSERT INTO `tao_user` VALUES ('1', 'admin', '95d6f8d0d0c3b45e5dbe4057da1b149e', '2147483647', 'admin@qq.com', '0', '管理员', '北京市', '1', '这是一个社区系统', '/static/res/images/avatar/00.jpg', '1', '0', '1', '1', '0', '127.0.0.1', '0', '0', '0', '0', '1579053025', '1578469091', '0');
 
 -- ----------------------------
 -- Table structure for tao_user_area

config/taoler.php

@@ -7,7 +7,7 @@ return [
 	//应用名,此项不可更改
 	'appname'	=> 'TaoLer',
     //版本配置
-    'version'   => '1.8.1',
+    'version'   => '1.8.2',
 	//加盐
 	'salt'		=> 'taoler',
 	//数据库备份目录

public/static/res/mods/index.js

@@ -949,7 +949,7 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'imgcom'],
 
   //发送激活邮件
   fly.activate = function(email){
-    fly.json('/api/activate/', {}, function(res){
+    fly.json(actvateEmaiUrl, {"email":email}, function(res){
       if(res.status === 0){
         layer.alert('已成功将激活链接发送到了您的邮箱，接受可能会稍有延迟，请注意查收。', {
           icon: 1

view/taoler/index/active/index.html

@@ -0,0 +1,36 @@
+{extend name="public:base" /}
+
+{block name="title"}{$sysInfo.webname}-{$sysInfo.webtitle}{/block}
+{block name="column"}{include file="public/column" /}{/block}
+
+{block name="content"}
+<div class="layui-container">
+  <div class="layui-row layui-col-space15">
+	<div style="width:500px; margin: 0 auto; font-size:30px;" id="active">账户激活成功</div>
+  </div>
+</div>
+{include file="public/menu" /}
+{/block}
+
+{block name="script"}
+<script>
+layui.use(function(){
+var $ = layui.jquery;
+var url = "{$Request.param.url}";
+$(function(){
+	$.post("{:url('Active/email')}",{"url": url},function(data){
+		if(data.code == 0){
+			layer.msg(data.msg,{icon:6,tiye:2000},function(){
+				location.href = data.url;
+			});
+		} else {
+			$("#active").html(data.msg);
+			layer.open({title:"账户激活失败",content:data.msg,icon:5,anim:6});
+		}
+		});
+	});
+	return false;
+});
+
+</script>
+{/block}

view/taoler/index/article/ask/cate.html

@@ -50,12 +50,8 @@
 		  </li>
 		  {/volist}
 		</ul>
-
+		<div style="text-align: center" id="pages"></div>
-        <div style="text-align: center" id="page">{$artList|raw}</div>
-		<!--div style="text-align: center" id="pages"></div-->
-
       </div>
-	  
     </div>
     <div class="layui-col-md4">
         <div class="fly-panel">
@@ -98,9 +94,11 @@
 	  //执行一个laypage实例
 	  laypage.render({
 		elem: 'pages' //注意，这里的 test1 是 ID，不用加 # 号
-		,count: 50 //数据总数，从服务端得到
+		,count: {$count} //数据总数，从服务端得到
 		,limit: 15
-		,curr :{$Request.param.page ?: 1} //获取起始页
+		,curr : {$page}
+		
+		 //获取起始页
 		,jump: function(obj, first){
 		//obj包含了当前分页的所有参数，比如：
 		//console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
@@ -110,6 +108,7 @@
 		if(!first){
 		  //do something
 		  //window.location.href= url+obj.curr+'&limit='+obj.limit+'#collection'; //跳转
+		  window.location.href = '{$url}'+obj.curr+'.html'; //跳转
 		}
 	  }
 	  });

view/taoler/index/article/cate.html

@@ -51,11 +51,8 @@
           </li>
 		    {/volist}	
         </ul>
-        <div style="text-align: center" id="page">{$artList|raw}</div>
+		<div style="text-align: center" id="pages"></div>
-		<!--div style="text-align: center" id="pages"></div-->
-
       </div>
-	  
     </div>
     <div class="layui-col-md4">
         <div class="fly-panel">
@@ -98,18 +95,19 @@
 	  //执行一个laypage实例
 	  laypage.render({
 		elem: 'pages' //注意，这里的 test1 是 ID，不用加 # 号
-		,count: 50 //数据总数，从服务端得到
+		,count: {$count} //数据总数，从服务端得到
 		,limit: 15
-		,curr :{$Request.param.page ?: 1} //获取起始页
+		,curr :{$page}
+		 //获取起始页
 		,jump: function(obj, first){
 		//obj包含了当前分页的所有参数，比如：
 		//console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
 		//console.log(obj.limit); //得到每页显示的条数
-		
 		//首次不执行
 		if(!first){
 		  //do something
 		  //window.location.href= url+obj.curr+'&limit='+obj.limit+'#collection'; //跳转
+		  window.location.href = '{$url}'+obj.curr+'.html'; //跳转
 		}
 	  }
 	  });

view/taoler/index/article/posts/cate.html

@@ -42,11 +42,8 @@
           </li>
 		    {/volist}	
         </ul>
-        <div style="text-align: center" id="page">{$artList|raw}</div>
+		<div style="text-align: center" id="pages"></div>
-		<!--div style="text-align: center" id="pages"></div-->
-
       </div>
-	  
     </div>
     <div class="layui-col-md4">
         <div class="fly-panel">
@@ -89,9 +86,11 @@
 	  //执行一个laypage实例
 	  laypage.render({
 		elem: 'pages' //注意，这里的 test1 是 ID，不用加 # 号
-		,count: 50 //数据总数，从服务端得到
+		,count: {$count} //数据总数，从服务端得到
 		,limit: 15
-		,curr :{$Request.param.page ?: 1} //获取起始页
+		,curr : {$page}
+		
+		 //获取起始页
 		,jump: function(obj, first){
 		//obj包含了当前分页的所有参数，比如：
 		//console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
@@ -101,6 +100,7 @@
 		if(!first){
 		  //do something
 		  //window.location.href= url+obj.curr+'&limit='+obj.limit+'#collection'; //跳转
+		  window.location.href = '{$url}'+obj.curr+'.html'; //跳转
 		}
 	  }
 	  });

view/taoler/index/user/activate.html

@@ -1,5 +1,6 @@
-{layout name="public:layout" /} 
+{extend name="public/user" /}
-
+<!--{layout name="public:layout" /} -->
+{block name="content"}
     <div class="layui-tab layui-tab-brief" lay-filter="user">
       <ul class="layui-tab-title">
         <li class="layui-this">
@@ -11,10 +12,14 @@
           <li class="layui-form-li">
             <label for="activate">您的邮箱：</label>
             <span class="layui-form-text">{$user.email}
-              <!-- <em style="color:#999;">（已成功激活）</em> -->
+			{if ($user.active == 1)}
+              <em style="color:#999;">（已成功激活）</em>
+			{else /}
               <em style="color:#c00;">（尚未激活）</em>
+			{/if}
             </span>
           </li>
+		  {if($user.active == 0)}
           <li class="layui-form-li" style="margin-top: 20px; line-height: 26px;">
             <div>
               1. 如果您未收到邮件，或激活链接失效，您可以
@@ -22,12 +27,19 @@
               <a class="layui-form-a" style="color:#4f99cf;" href="set.html">更换邮箱</a>；
             </div>
             <div>
-              2. 如果您始终没有收到 Fly 发送的邮件，请注意查看您邮箱中的垃圾邮件；
+              2. 如果您始终没有收到发送的邮件，请注意查看您邮箱中的垃圾邮件；
             </div>
             <div>
-              3. 如果你实在无法激活邮件，您还可以联系：admin@xx.com
+              3. 如果你实在无法激活邮件，您还可以联系管理员：{$adminEmail}
             </div>
           </li>
+		  {/if}
         </ul>
       </div>
     </div>
+{/block}
+{block name="script"}
+<script>
+var actvateEmaiUrl = "{:url('User/active')}";
+</script>
+{/block}