peihaoyu/TaoLer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新多处链接，温馨通道

Browse Source
This commit is contained in:
taoser 2021-07-07 17:17:58 +08:00
parent b79b427640
commit 032426f71e
21 changed files with 136 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/controller/Set.php
View File

@ -34,7 +34,7 @@ class Set extends AdminController
public function website()
{
if(Request::isPost()){
$data = Request::only(['webname','template','cache','upsize','uptype','blackname','webtitle','keywords','descript','copyright']);
$data = Request::only(['webname','template','cache','upsize','uptype','blackname','webtitle','keywords','descript','icp','copyright']);
$result = Db::name('system')->cache('system')->where('id', 1)->update($data);
if($result){
return json(['code'=>0,'msg'=>'更新成功']);

2
app/admin/model/Slider.php
View File

@ -13,7 +13,7 @@ class Slider extends Model
public function getSlidTypeAttr($value)
{
$slid_type = [1=>'首页幻灯',2=>'通用右底',3=>'首页赞助',4=>'文章赞助',5=>'分类赞助',6=>'友情链接'];
$slid_type = [1=>'首页幻灯',2=>'通用右底',3=>'首页赞助',4=>'文章赞助',5=>'分类赞助',6=>'友情链接',7=>'温馨通道',8=>'头部菜单',9=>'页脚链接'];
return $slid_type[$value];
}

8
app/admin/view/set/system/website.html
View File

@ -67,7 +67,7 @@
<div class="layui-form-item">
<label class="layui-form-label">上传文件类型</label>
<div class="layui-input-block">
<input type="text" name="uptype" value="{$sysInfo.uptype}r" class="layui-input">
<input type="text" name="uptype" value="{$sysInfo.uptype}" placeholder="请依照格式image:jgp|png,多个组合用,分开" class="layui-input">
</div>
</div>
@ -96,6 +96,12 @@
<textarea name="descript" class="layui-textarea">{$sysInfo.descript}</textarea>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备案号</label>
<div class="layui-input-inline">
<input type="text" name="icp" value="{$sysInfo.icp}" class="layui-input">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">版权信息</label>
<div class="layui-input-inline" style="width: 500px;">

5
app/admin/view/slider/add.html
View File

@ -15,6 +15,9 @@
<option value="4">4文章赞助</option>
<option value="5">5分类赞助</option>
<option value="6">6友情链接</option>
<option value="7">7温馨通道</option>
<option value="8">8头部菜单</option>
<option value="9">9页脚链接</option>
</select>
</div>
</div>
@ -54,7 +57,7 @@
<div class="layui-form-item">
<label class="layui-form-label">图片</label>
<div class="layui-input-inline">
<input type="text" name="slid_img" lay-verify="" placeholder="位置1,2需上传图片" autocomplete="off" class="layui-input" >
<input type="text" name="slid_img" lay-verify="" placeholder="位置1,2需上传;位8需贴icon图标" autocomplete="off" class="layui-input" >
</div>
<button style="float: left;" type="button" class="layui-btn" id="layuiadmin-upload-slid-img">选图</button>
</div>

5
app/admin/view/slider/edit.html
View File

@ -14,6 +14,9 @@
<option {if condition="$slider.slid_type eq 4"} selected {/if} value="4">4文章赞助</option>
<option {if condition="$slider.slid_type eq 5"} selected {/if} value="5">5分类赞助</option>
<option {if condition="$slider.slid_type eq 6"} selected {/if} value="6">6友情链接</option>
<option {if condition="$slider.slid_type eq 7"} selected {/if} value="7">7温馨通道</option>
<option {if condition="$slider.slid_type eq 8"} selected {/if} value="8">8头部菜单</option>
<option {if condition="$slider.slid_type eq 9"} selected {/if} value="9">9页脚链接</option>
</select>
</div>
</div>
@ -53,7 +56,7 @@
<div class="layui-form-item">
<label class="layui-form-label">图片</label>
<div class="layui-input-inline">
<input type="text" name="slid_img" lay-verify="" placeholder="置1,2需上传图片上传图片" autocomplete="off" class="layui-input" value="{$slider.slid_img}">
<input type="text" name="slid_img" lay-verify="" placeholder="位置1,2需上传;位8需贴icon图标" autocomplete="off" class="layui-input" value="{$slider.slid_img}">
</div>
<button style="float: left;" type="button" class="layui-btn" dataid="{$slider.id}" id="layuiadmin-upload-slid-img">选图</button>
</div>

4
app/admin/view/slider/index.html
View File

@ -33,7 +33,7 @@
<tr>
<th>{$vo.id}</th>
<th>{$vo.slid_name}</th>
<th>{if condition="$vo.slid_img != ''"}<img src="{$vo.slid_img}" height="40" width="80" />{/if}</th>
<th>{notempty name="$vo.slid_img"}{if $vo.slid_type == '头部菜单'}<div><i class="layui-icon {$vo.slid_img}"></i></div>{else /}<img src="{$vo.slid_img}" height="40" width="80" />{/if}{/notempty}</th>
<th>{$vo.slid_type}</th>
<th><a href="{$vo.slid_href}" target="_blank">{$vo.slid_href}</a></th>
<th>{$vo.slid_color}</th>
@ -82,7 +82,7 @@
title: '添加广告',
content: 'add.html',
maxmin: true,
area : ['460px' , '490px'],
area : ['460px' , '530px'],
btn: ['确定', '取消'],
yes: function(index, layero){
var iframeWindow = window['layui-layer-iframe'+ index]

30
app/common/controller/BaseController.php
View File

@ -260,7 +260,35 @@ abstract class BaseController
{
//1.查询分类表获取所有分类
$sysInfo = Db::name('system')->cache('system',3600)->find(1);
View::assign('sysInfo',$sysInfo);
//头部链接
$head_links = Cache::get('headlinks');
if(!$head_links){
$head_links = Db::name('slider')->where(['slid_status'=>1,'delete_time'=>0,'slid_type'=>8])->whereTime('slid_over','>=',time())->field('slid_name,slid_img,slid_href')->select();
Cache::set('headlinks',$head_links,3600);
}
//页脚链接
$foot_links = Cache::get('footlinks');
if(!$foot_links){
$foot_links = Db::name('slider')->where(['slid_status'=>1,'delete_time'=>0,'slid_type'=>9])->whereTime('slid_over','>=',time())->field('slid_name,slid_href')->select();
Cache::set('footlinks',$foot_links,3600);
}
View::assign(['sysInfo'=>$sysInfo,'headlinks'=>$head_links,'footlinks'=>$foot_links]);
}
//返回上传文件配置类型
protected function getExtType($ext)
{
$extType = Db::name('system')->where('id',1)->value('uptype');
$extArr = explode(',',$extType);
foreach ($extArr as $v){
$fileMime = stristr($v,':',true);//返回字符:前字符串
if($ext == $fileMime){
$arr = explode('|',stristr($v,':')); //返回:后字符串
//var_dump($arr);
return $arr;
}
return [];
}
}

29
app/index/controller/Article.php
View File

@ -256,7 +256,7 @@ class Article extends BaseController
{
$file = request()->file('file');
try {
validate(['file'=>['fileSize'=>'102400','fileExt'=>['jpg','jpeg','png']]])
validate(['file'=>['fileSize'=>'1024000','fileExt'=>$this->getExtType('image')]])
->check(['file'=>$file]);
} catch (ValidateException $e) {
@ -285,7 +285,7 @@ class Article extends BaseController
{
$file = request()->file('file');
try {
validate(['file'=>'fileSize:1024000|fileExt:jpg,zip'])
validate(['file'=>['fileSize'=>'1024000','fileExt'=>$this->getExtType('file')]])
->check(['file'=>$file]);
$savename = \think\facade\Filesystem::disk('public')->putFile('article_zip',$file);
} catch (ValidateException $e) {
@ -307,7 +307,7 @@ class Article extends BaseController
{
$file = request()->file('file');
try {
validate(['file'=>'fileSize:102400000|fileExt:mp4,mp3'])
validate(['file'=>['fileSize'=>'102400000','fileExt'=>$this->getExtType('mp4')]])
->check(['file'=>$file]);
$savename = \think\facade\Filesystem::disk('public')->putFile('video',$file);
} catch (ValidateException $e) {
@ -324,6 +324,29 @@ class Article extends BaseController
return json($res);
}
//上传音频
public function upAudio()
{
$file = request()->file('file');
try {
validate(['file'=>['fileSize'=>'10240000','fileExt'=>$this->getExtType('mp3')]])
->check(['file'=>$file]);
$savename = \think\facade\Filesystem::disk('public')->putFile('audio',$file);
} catch (ValidateException $e) {
return json(['status'=>-1,'msg'=>$e->getMessage()]);
}
$upload = Config::get('filesystem.disks.public.url');
if($savename){
$name_path =str_replace('\\',"/",$upload.'/'.$savename);
$res = ['status'=>0,'msg'=>'上传成功','url'=> $name_path];
}else{
$res = ['status'=>-1,'msg'=>'上传错误'];
}
return json($res);
}
//附件下载
public function download($id)
{

29
app/index/controller/Index.php
View File

@ -55,6 +55,16 @@ class Index extends BaseController
Cache::set('flinks',$friend_links,3600);
}
//温馨通道
$fast_links = Cache::get('fastlinks');
if(!$fast_links){
$fast_links = Db::name('slider')->where(['slid_status'=>1,'delete_time'=>0,'slid_type'=>7])->whereTime('slid_over','>=',time())->field('slid_name,slid_href')->select();
Cache::set('fastlinks',$fast_links,3600);
}
//友情链接申请
$adminEmail = Db::name('user')->where('id',1)->cache(true)->value('email');
$vs = [
'slider' => $sliders,
'artTop' => $artTop,
@ -63,7 +73,9 @@ class Index extends BaseController
'type' => $types,
'ad_index' => $ad_index,
'ad_comm' => $ad_comm,
'fastlinks' => $fast_links,
'flinks' => $friend_links,
'adminEmail' => $adminEmail,
'jspage' => '',
];
View::assign($vs);
@ -92,14 +104,25 @@ class Index extends BaseController
'counts' => $counts
];
//友情链接
$friend_links = Db::name('slider')->where(['slid_status'=>1,'delete_time'=>0,'slid_type'=>6])->whereTime('slid_over','>=',time())->field('slid_name,slid_href')->select();
//首页右栏
$ad_comm = Cache::get('adcomm');
if(!$ad_comm){
$ad_comm = Db::name('slider')->where(['slid_status'=>1,'delete_time'=>0,'slid_type'=>2])->whereTime('slid_over','>=',time())->select();
Cache::set('adcomm',$ad_comm,3600);
}
//温馨通道
$fast_links = Cache::get('fastlinks');
if(!$fast_links){
$fast_links = Db::name('slider')->where(['slid_status'=>1,'delete_time'=>0,'slid_type'=>7])->whereTime('slid_over','>=',time())->field('slid_name,slid_href')->select();
Cache::set('fastlinks',$fast_links,3600);
}
// 查询热议
//$article = new Article()1;
$artHot = Article::getArtHot(10);
View::assign($searchs);
View::assign(['flinks'=>$friend_links,'artHot'=>$artHot,'jspage'=>'']);
View::assign(['fastlinks'=>$fast_links,'ad_comm'=>$ad_comm,'artHot'=>$artHot,'jspage'=>'']);
return View::fetch('search');
}

4
app/install/data/taoler.sql
View File

@ -480,7 +480,7 @@ CREATE TABLE `tao_system` (
`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',
`uptype` varchar(50) NOT NULL DEFAULT '' COMMENT '上传文件类型',
`uptype` varchar(100) NOT NULL DEFAULT '' COMMENT '上传文件类型',
`copyright` varchar(80) NOT NULL DEFAULT '' COMMENT '版权',
`keywords` tinytext NOT NULL COMMENT '网站关键字',
`descript` tinytext NOT NULL COMMENT '网站描述',
@ -503,7 +503,7 @@ CREATE TABLE `tao_system` (
-- ----------------------------
-- Records of tao_system
-- ----------------------------
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="https://www.aieok.com" target="_blank">TaoLer</a>', 'TaoLer,轻社区系统,bbs,论坛,Thinkphp6,layui,fly模板,', '这是一个Taoler轻社区论坛系统', '1', '1', '1', '0.0.0.0', '管理员|admin|审核员|超级|垃圾', '1.6.3', '', 'http://api.aieok.com', 'http://api.aieok.com/v1/cy', 'http://api.aieok.com/v1/upload/check', 'http://api.aieok.com/v1/upload/api', '1581221008', '1577419197');
INSERT INTO `tao_system` VALUES ('1', 'TaoLer社区演示站', '轻论坛系统', 'http://www.xxx.com', 'taoler', '/storage/logo/logo.png', '10', '2048', 'image:png|gif|jpg|jpeg,file:zip|rar,video:mp4,audio:mp3|m4a', '<a href="https://www.aieok.com" target="_blank">TaoLer</a>', 'TaoLer,轻社区系统,bbs,论坛,Thinkphp6,layui,fly模板,', '这是一个Taoler轻社区论坛系统', '1', '1', '1', '0.0.0.0', '管理员|admin|审核员|超级|垃圾', '1.6.3', '', 'http://api.aieok.com', 'http://api.aieok.com/v1/cy', 'http://api.aieok.com/v1/upload/check', 'http://api.aieok.com/v1/upload/api', '1581221008', '1577419197');
-- ----------------------------
-- Table structure for tao_user

2
config/taoler.php
View File

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

2
public/static/res/mods/index.js
View File

@ -397,7 +397,7 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'imgcom'],
var loding,audio = layero.find('input[name="audio"]');
upload.render({
url: videoUrl
url: audioUrl
,elem: '#fly-jie-audio-upload .upload-audio'
,accept: 'audio'
,acceptMime: 'audio/mp3'

2
view/taoler/index/article/cate.html
View File

@ -50,7 +50,7 @@
</span>
</div>
<div class="fly-list-badge">
{if ($art.is_hot == 1)} <span class="layui-badge layui-bg-red">{:lang('hot')}</span> {/if}
{if ($art.is_hot == 1)}<i class="layui-icon layui-icon-fire layui-hide-md" style="font-size: 20px; color: #FF5722;"></i><span class="layui-badge layui-bg-red layui-hide-xs">{:lang('hot')}</span> {/if}
</div>
</li>
{/volist}

2
view/taoler/index/article/detail.html
View File

@ -135,7 +135,7 @@
{if (session('user_id') == $vo.user.id) && (getLimtTime($vo.create_time) < 2) OR ($user.auth ?? '')}
<span type="edit">{:lang('edit')}</span>
<span type="del">{:lang('delete')}</span>
{if $vo.cai == 0 && session('user_id') == $article.user_id /}
{if $vo.cai == 0 && (session('user_id') == $article.user_id) OR ($user.auth ?? '') /}
<span class="jieda-accept" type="accept">{:lang('accept')}</span>
{/if}
{/if}

2
view/taoler/index/index/index.html
View File

@ -107,7 +107,7 @@ var signJsonUrl = "{:url('sign/signJson')}";
$('#friend-link').on('click', function(){
layer.open({
title: '申请友链',
content: '发送邮件至：changlin_zhao@qq.com ',
content: '发送邮件至：{$adminEmail} ',
yes: function(index, layero){
layer.close(index);
}

17
view/taoler/index/index/search.html
View File

@ -55,10 +55,9 @@
<div class="layui-col-md4">
<!--温馨通道-->
<div class="fly-panel">
<h3 class="fly-panel-title">温馨通道</h3>
<h3 class="fly-panel-title">{:lang('links list')}</h3>
{include file="public/index-static" /}
</div>
<dl class="fly-panel fly-list-one">
<dt class="fly-panel-title">本周热议</dt>
{volist name="artHot" id="vo" empty="还没有帖子"}
@ -68,16 +67,12 @@
</dd>
{/volist}
</dl>
<div class="fly-panel">
<div class="fly-panel-title">
这里可作为广告区域
<!--自定义-->
<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>
<div class="fly-panel-main">
<a href="#" target="_blank" class="fly-zanzhu" time-limit="2017.09.25-2099.01.01" style="background-color: #5FB878;">TaoLer旗舰之作</a>
</div>
</div>
{include file="public/flink" /}
</div>
</div>

8
view/taoler/index/public/footer.html
View File

@ -1,9 +1,10 @@
<div class="fly-footer html5plus-hide">
<p> Copyright &copy; {:date('Y')}{$sysInfo.copyright|raw}v{:config('taoler.version')}</p>
<p>
<a href="#" target="_blank">站务反馈</a>
<a href="#" target="_blank">获取本站源码</a>
<a href="#" target="_blank">微信公众号</a>
{volist name="footlinks" id="vo"}
<a href="{$vo.slid_href}" target="_blank">{$vo.slid_name}</a>
{/volist}
<a href="https://beian.miit.gov.cn/#/Integrated/recordQuery" target="_blank">{$sysInfo.icp}</a>
</p>
</div>
@ -17,6 +18,7 @@ var messageNums = "{:url('message/nums')}",
articleAdd = "{:url('Article/add')}",
textImgUpload = "{:url('article/textImgUpload')}",
videoUrl = "{:url('article/upVideo')}",
audioUrl = "{:url('article/upAudio')}",
searchUrl = "{:url('index/search')}",
langUrl = "{:url('index/language')}",
replyNum = "{:lang('replies')}";

16
view/taoler/index/public/header.html
View File

@ -4,15 +4,11 @@
<img src="{$sysInfo.logo}" alt="layui" width="135" height="37">
</a>
<ul class="layui-nav fly-nav layui-hide-xs">
<li class="layui-nav-item layui-this">
<a href="/"><i class="iconfont icon-jiaoliu"></i>{:lang('discuss')}</a>
</li>
{volist name="headlinks" id="vo"}
<li class="layui-nav-item">
<a href="case/case.html"><i class="iconfont icon-iconmingxinganli"></i>{:lang('case')}</a>
</li>
<li class="layui-nav-item">
<a href="{:url('doc/timeline')}" target="_blank"><i class="iconfont icon-ui"></i>{:lang('timeline')}</a>
<a href="{$vo.slid_href}"><i class="layui-icon {$vo.slid_img}"></i>{$vo.slid_name}</a>
</li>
{/volist}
</ul>
<ul class="layui-nav fly-nav-user">
@ -53,9 +49,9 @@
<a href="{:url('login/reg')}">{:lang('register')}</a>
</li>
<li class="layui-nav-item" >
<select name="language" lay-filter="language" lay-verify="" id="language">
<option value="cn" {if cookie('think_lang')=='zh-cn'} selected{/if} >中文简体</option>
<option value="tw" {if cookie('think_lang')=='zh-tw'} selected{/if} >中文繁体</option>
<select name="language" style="width:50px;" lay-filter="language" lay-verify="" id="language">
<option value="cn" {if cookie('think_lang')=='zh-cn'} selected{/if} >简体</option>
<option value="tw" {if cookie('think_lang')=='zh-tw'} selected{/if} >繁体</option>
<option value="en" {if cookie('think_lang')=='en-us'} selected{/if} >English</option>
</select>
</li>

2
view/taoler/index/public/index-forumlist.html
View File

@ -32,6 +32,6 @@
</span>
</div>
<div class="fly-list-badge">
{if ($art.is_hot == 1)} <span class="layui-badge layui-bg-red">{:lang('hot')}</span> {/if}
{if ($art.is_hot == 1)}<i class="layui-icon layui-icon-fire layui-hide-md" style="font-size: 20px; color: #FF5722;"></i> <span class="layui-badge layui-bg-red layui-hide-xs">{:lang('hot')}</span> {/if}
</div>
</li>

21
view/taoler/index/public/index-static.html
View File

@ -1,23 +1,10 @@
<div class="layui-row fly-panel-main" style="padding: 15px;">
<div class="layui-clear fly-list-quick">
{volist name="fastlinks" id="vo"}
<div class="layui-col-xs6">
<div><a href="https://gitee.com/toogee/TaoLer/repository/archive/master.zip" target="_blank"> 程序下载 </a></div>
<div><a href="{$vo.slid_href}" target="_blank">{$vo.slid_name}</a></div>
</div>
<div class="layui-col-xs6">
<div><a href="{:url('article/detail',['id'=>25])}" target="_blank"> 应用说明 </a></div>
{/volist}
<a name="signin"> </a>
</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>

2
view/taoler/index/public/index-topforum.html
View File

@ -31,6 +31,6 @@
</span>
</div>
<div class="fly-list-badge">
{if ($top.is_top == 1)} <span class="layui-badge layui-bg-black" >{:lang('top')}</span> {/if}
{if ($top.is_top == 1)}<i class="layui-icon layui-icon-top layui-hide-md" style="font-size: 25px; color: #000000;"></i> <span class="layui-badge layui-bg-black layui-hide-xs" >{:lang('top')}</span> {/if}
</div>
</li>