.
This commit is contained in:
parent
97a1796287
commit
66404fad9d
@ -5,9 +5,9 @@
|
||||
<!-- 详细配置说明见： http://redkale.org/redkale.html#redkale_confxml -->
|
||||
|
||||
<resources>
|
||||
<source name="redis" value="org.redkalex.cache.RedisCacheSource" xxx="16">
|
||||
<!--<source name="redis" value="org.redkalex.cache.RedisCacheSource" xxx="16">
|
||||
<node addr="120.24.230.60" port="6379"/>
|
||||
</source>
|
||||
</source>-->
|
||||
</resources>
|
||||
|
||||
<server protocol="HTTP" host="0.0.0.0" port="6060" root="root">
|
||||
|
||||
BIN
lib/redkale.jar
BIN
lib/redkale.jar
Binary file not shown.
BIN
libs/redbbs.jar
BIN
libs/redbbs.jar
Binary file not shown.
@ -1,4 +1,9 @@
|
||||
<!-- Created by Lxy at 2017/11/25 17:36. -->
|
||||
#define columned(e)
|
||||
#if(e == column??"") layui-this
|
||||
#end
|
||||
#end
|
||||
|
||||
#define layout()
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
@ -33,13 +38,17 @@
|
||||
<li class="layui-nav-item">
|
||||
<a class="fly-nav-avatar" href="javascript:;">
|
||||
<cite class="layui-hide-xs">#(mine.nickname)</cite>
|
||||
<!--
|
||||
<i class="iconfont icon-renzheng layui-hide-xs" title="认证信息：layui 作者"></i>
|
||||
<!--<i class="layui-badge fly-badge-vip layui-hide-xs">VIP3</i>-->
|
||||
<i class="layui-badge fly-badge-vip layui-hide-xs">VIP3</i>
|
||||
-->
|
||||
<img src="#(mine.avatar)">
|
||||
</a>
|
||||
<dl class="layui-nav-child">
|
||||
<dd><a href="/user/set"><i class="layui-icon"></i>基本设置</a></dd>
|
||||
<!--<dd><a href="/user/message"><i class="iconfont icon-tongzhi" style="top: 4px;"></i>我的消息</a></dd>-->
|
||||
<!--
|
||||
<dd><a href="/user/message"><i class="iconfont icon-tongzhi" style="top: 4px;"></i>我的消息</a></dd>
|
||||
-->
|
||||
<dd><a href="/user"><i class="layui-icon" style="margin-left: 2px; font-size: 22px;"></i>我的主页</a></dd>
|
||||
<hr style="margin: 5px 0;">
|
||||
<dd><a href="javascript:;" class="logout" style="text-align: center;">退出</a></dd>
|
||||
@ -68,12 +77,12 @@
|
||||
<div class="fly-panel fly-column">
|
||||
<div class="layui-container">
|
||||
<ul class="layui-clear">
|
||||
<li class="layui-hide-xs layui-this"><a href="/">首页</a></li>
|
||||
<li><a href="/column/qz">求助</a></li>
|
||||
<li><a href="/column/fx">分享<span class="layui-badge-dot"></span></a></li>
|
||||
<li><a href="/column/jy">建议</a></li>
|
||||
<li><a href="/column/gg">公告</a></li>
|
||||
<li><a href="/column/dt">动态</a></li>
|
||||
<li class="layui-hide-xs #@columned('')"><a href="/column/">首页</a></li>
|
||||
<li class="#@columned('qz')"><a href="/column/qz">求助</a></li>
|
||||
<li class="#@columned('fx')"><a href="/column/fx">分享<span class="layui-badge-dot"></span></a></li>
|
||||
<li class="#@columned('jy')"><a href="/column/jy">建议</a></li>
|
||||
<li class="#@columned('gg')"><a href="/column/gg">公告</a></li>
|
||||
<li class="#@columned('dt')"><a href="/column/dt">动态</a></li>
|
||||
<li class="layui-hide-xs layui-hide-sm layui-show-md-inline-block"><span class="fly-mid"></span></li>
|
||||
|
||||
<!-- 用户登入后显示 -->
|
||||
|
||||
@ -23,15 +23,15 @@
|
||||
<div class="fly-list-info">
|
||||
<a href="/user/#(x.userId)" link>
|
||||
<cite>#(x.nickname)</cite>
|
||||
<i class="iconfont icon-renzheng" title="认证信息：XXX"></i>
|
||||
<i class="layui-badge fly-badge-vip">VIP3</i>
|
||||
<!--<i class="iconfont icon-renzheng" title="认证信息：XXX"></i>
|
||||
<i class="layui-badge fly-badge-vip">VIP3</i>-->
|
||||
</a>
|
||||
<span>#(x.createTime)</span>
|
||||
|
||||
<span class="fly-list-kiss layui-hide-xs" title="悬赏飞吻"><i class="iconfont icon-kiss"></i> 60</span>
|
||||
<!--<span class="fly-list-kiss layui-hide-xs" title="悬赏飞吻"><i class="iconfont icon-kiss"></i> 60</span>-->
|
||||
<span class="layui-badge fly-badge-accept layui-hide-xs">已结</span>
|
||||
<span class="fly-list-nums">
|
||||
<i class="iconfont icon-pinglun1" title="回答"></i> 66
|
||||
<i class="iconfont icon-pinglun1" title="回答"></i> #(x.replyNum??0)
|
||||
</span>
|
||||
</div>
|
||||
<div class="fly-list-badge">
|
||||
@ -48,13 +48,13 @@
|
||||
<div class="fly-panel" style="margin-bottom: 0;">
|
||||
|
||||
<div class="fly-panel-title fly-filter">
|
||||
<a href="" class="layui-this">综合</a>
|
||||
<a href="/column" class="layui-this">综合</a>
|
||||
<span class="fly-mid"></span>
|
||||
<a href="">未结</a>
|
||||
<a href="/column?solved=0">未结</a>
|
||||
<span class="fly-mid"></span>
|
||||
<a href="">已结</a>
|
||||
<a href="/column?solved=1">已结</a>
|
||||
<span class="fly-mid"></span>
|
||||
<a href="">精华</a>
|
||||
<a href="/column?wonderful=1">精华</a>
|
||||
<span class="fly-filter-right layui-hide-xs">
|
||||
<a href="" class="layui-this">按最新</a>
|
||||
<span class="fly-mid"></span>
|
||||
@ -65,11 +65,11 @@
|
||||
<ul class="fly-list">
|
||||
#for(x : contents.rows??)
|
||||
<li>
|
||||
<a href="user/home.html" class="fly-avatar">
|
||||
<a href="/user/home.html" class="fly-avatar">
|
||||
<img src="#(x.avatar)" alt="#(x.nickname)">
|
||||
</a>
|
||||
<h2>
|
||||
<a class="layui-badge">动态</a>
|
||||
<a class="layui-badge">#(x.typeName)</a>
|
||||
<a href="/jie/detail/#(x.contentId)">#(x.title)</a>
|
||||
</h2>
|
||||
<div class="fly-list-info">
|
||||
@ -82,10 +82,12 @@
|
||||
</a>
|
||||
<span>#(x.createTime)</span>
|
||||
|
||||
<!--
|
||||
<span class="fly-list-kiss layui-hide-xs" title="悬赏飞吻"><i class="iconfont icon-kiss"></i> 60</span>
|
||||
<!--<span class="layui-badge fly-badge-accept layui-hide-xs">已结</span>-->
|
||||
<span class="layui-badge fly-badge-accept layui-hide-xs">已结</span>
|
||||
-->
|
||||
<span class="fly-list-nums">
|
||||
<i class="iconfont icon-pinglun1" title="回答"></i> 66
|
||||
<i class="iconfont icon-pinglun1" title="回答"></i> #(x.replyNum??0)
|
||||
</span>
|
||||
</div>
|
||||
<div class="fly-list-badge">
|
||||
@ -96,7 +98,7 @@
|
||||
</ul>
|
||||
<div style="text-align: center">
|
||||
<div class="laypage-main">
|
||||
<a href="/jie/all" class="laypage-next">更多求解</a>
|
||||
<a href="/column/" class="laypage-next">更多求解</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -131,7 +133,7 @@
|
||||
</div>
|
||||
#end
|
||||
|
||||
|
||||
#define xx()
|
||||
<div class="fly-panel fly-signin">
|
||||
<div class="fly-panel-title">
|
||||
签到
|
||||
@ -152,6 +154,7 @@
|
||||
-->
|
||||
</div>
|
||||
</div>
|
||||
#end
|
||||
|
||||
<!--最新加入-->
|
||||
<div class="fly-panel fly-rank fly-rank-reply" id="LAY_replyRank">
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
<select lay-verify="required" name="type">
|
||||
<option></option>
|
||||
<!--[内容栏目]10求助，20分享，30建议，40公告，50动态-->
|
||||
<option value="10">求助</option>
|
||||
<option value="20">分享</option>
|
||||
<option value="30">建议</option>
|
||||
<option value="40">公告</option>
|
||||
<option value="50">动态</option>
|
||||
<option value="10" #if(bean.type?? == 10) selected #end>求助</option>
|
||||
<option value="20" #if(bean.type?? == 20) selected #end>分享</option>
|
||||
<option value="30" #if(bean.type?? == 30) selected #end>建议</option>
|
||||
<option value="40" #if(bean.type?? == 40) selected #end>公告</option>
|
||||
<option value="50" #if(bean.type?? == 50) selected #end>动态</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -26,15 +26,15 @@
|
||||
<div class="fly-admin-box" data-id="#(bean.contentId)">
|
||||
<span class="layui-btn layui-btn-xs jie-admin" type="del">删除</span>
|
||||
#if(bean.top == 1)
|
||||
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="stick" rank="0" style="background-color:#ccc;">取消置顶</span>
|
||||
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="top" v="0" style="background-color:#ccc;">取消置顶</span>
|
||||
#else
|
||||
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="stick" rank="1">置顶</span>
|
||||
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="top" v="1">置顶</span>
|
||||
#end
|
||||
|
||||
#if(bean.wonderful == 1)
|
||||
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="status" rank="0" style="background-color:#ccc;">取消加精</span>
|
||||
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="wonderful" v="0" style="background-color:#ccc;">取消加精</span>
|
||||
#else
|
||||
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="status" rank="1">加精</span>
|
||||
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="wonderful" v="1">加精</span>
|
||||
#end
|
||||
</div>
|
||||
#end
|
||||
@ -75,7 +75,7 @@
|
||||
|
||||
<ul class="jieda" id="jieda">
|
||||
#for(x : comments.rows??)
|
||||
<li data-id="111" class="jieda-daan">
|
||||
<li data-id="#(x.commentId)" class="jieda-daan">
|
||||
<a name="item-1111111111"></a>
|
||||
<div class="detail-about detail-about-reply">
|
||||
<a class="fly-avatar" href="/user/#(x.userId)">
|
||||
|
||||
@ -1,19 +1,26 @@
|
||||
#@layout()
|
||||
|
||||
#define checked(e)
|
||||
#if(e == "wj" && solved == 0) class="layui-this"
|
||||
#elseif(e == "yj" && solved == 1) class="layui-this"
|
||||
#elseif(e == "jh" && wonderful == 1) class="layui-this"
|
||||
#elseif(e == "zh" && solved == -1 && wonderful == -1) class="layui-this"
|
||||
#end
|
||||
#end
|
||||
|
||||
#define main()
|
||||
<div class="layui-container">
|
||||
<div class="layui-row layui-col-space15">
|
||||
<div class="layui-col-md8">
|
||||
<div class="fly-panel" style="margin-bottom: 0;">
|
||||
|
||||
<div class="fly-panel-title fly-filter">
|
||||
<a href="" class="layui-this">综合</a>
|
||||
<a href="?" #@checked('zh')>综合</a>
|
||||
<span class="fly-mid"></span>
|
||||
<a href="">未结</a>
|
||||
<a href="?solved=0" #@checked('wj')>未结</a>
|
||||
<span class="fly-mid"></span>
|
||||
<a href="">已结</a>
|
||||
<a href="?solved=1" #@checked('yj')>已结</a>
|
||||
<span class="fly-mid"></span>
|
||||
<a href="">精华</a>
|
||||
<a href="?wonderful=1" #@checked('jh')>精华</a>
|
||||
<span class="fly-filter-right layui-hide-xs">
|
||||
<a href="" class="layui-this">按最新</a>
|
||||
<span class="fly-mid"></span>
|
||||
@ -25,11 +32,11 @@
|
||||
#for(x : contents.rows)
|
||||
<li>
|
||||
|
||||
<a href="user/#(x.userId)" class="fly-avatar">
|
||||
<a href="/user/#(x.userId)" class="fly-avatar">
|
||||
<img src="#(x.avatar??)" alt="#(x.nickname)">
|
||||
</a>
|
||||
<h2>
|
||||
<a class="layui-badge">分享</a>
|
||||
<a class="layui-badge">#(x.typeName)</a>
|
||||
<a href="/jie/detail/#(x.contentId)">#(x.title)</a>
|
||||
</h2>
|
||||
<div class="fly-list-info">
|
||||
@ -42,8 +49,10 @@
|
||||
</a>
|
||||
<span>#(x.createTime)</span>
|
||||
|
||||
<!--
|
||||
<span class="fly-list-kiss layui-hide-xs" title="悬赏飞吻"><i class="iconfont icon-kiss"></i> 60</span>
|
||||
<!--<span class="layui-badge fly-badge-accept layui-hide-xs">已结</span>-->
|
||||
<span class="layui-badge fly-badge-accept layui-hide-xs">已结</span>
|
||||
-->
|
||||
<span class="fly-list-nums">
|
||||
<i class="iconfont icon-pinglun1" title="回答"></i> #(x.replyNum??0)
|
||||
</span>
|
||||
@ -63,12 +72,7 @@
|
||||
</ul>
|
||||
|
||||
<div style="text-align: center">
|
||||
<div class="laypage-main"><span class="laypage-curr">1</span><a href="/jie/page/2/">2</a><a
|
||||
href="/jie/page/3/">3</a><a href="/jie/page/4/">4</a><a
|
||||
href="/jie/page/5/">5</a><span>…</span><a href="/jie/page/148/" class="laypage-last"
|
||||
title="尾页">尾页</a><a href="/jie/page/2/"
|
||||
class="laypage-next">下一页</a>
|
||||
</div>
|
||||
<div id="jie-laypage" class=""> </div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -86,6 +90,7 @@
|
||||
#end
|
||||
</dl>
|
||||
|
||||
#define x()
|
||||
<div class="fly-panel">
|
||||
<div class="fly-panel-title">
|
||||
这里可作为广告区域
|
||||
@ -95,7 +100,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
#define x()
|
||||
<div class="fly-panel fly-link">
|
||||
<h3 class="fly-panel-title">友情链接</h3>
|
||||
<dl class="fly-panel-main">
|
||||
@ -118,12 +122,9 @@
|
||||
#define js()
|
||||
<script>
|
||||
layui.cache.page = 'jie';
|
||||
layui.cache.actived = "#(actived??'all')";
|
||||
layui.cache.url = "#(url)";
|
||||
layui.cache.total = parseInt('#(contents.total??0)');
|
||||
layui.cache.curr = parseInt('#(curr??1)');
|
||||
|
||||
|
||||
layui.cache.user = {
|
||||
username: '游客'
|
||||
, uid: -1
|
||||
|
||||
@ -224,6 +224,14 @@ pre{padding: 10px 15px; margin: 10px 0; font-size: 12px; border-left: 6px solid
|
||||
.laypage-main *{padding: 0 20px; line-height: 36px; border-right: 1px solid #009E94; border-bottom: 1px solid #009E94; font-size: 14px;}
|
||||
.laypage-main .laypage-curr{background-color:#009E94; color:#fff;}
|
||||
|
||||
#jie-laypage .layui-laypage a, .layui-laypage span{
|
||||
padding: 0 20px;
|
||||
height: 36px;
|
||||
line-height: 36px;
|
||||
margin: 0 -1px 5px 0;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
/* 简易编辑器 */
|
||||
.fly-edit{position:relative; display: block; top: 1px; left:0; padding:0 10px; border: 1px solid #e6e6e6; border-radius: 2px 2px 0 0; background-color: #FBFBFB;}
|
||||
.fly-edit span{cursor:pointer; padding:0 10px; line-height: 38px; color:#009E94;}
|
||||
|
||||
@ -501,8 +501,8 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'face'], f
|
||||
,shadeClose: true
|
||||
,maxWidth: 10000
|
||||
,skin: 'fly-layer-search'
|
||||
,content: ['<form action="http://cn.bing.com/search">'
|
||||
,'<input autocomplete="off" placeholder="搜索内容，回车跳转" type="text" name="q">'
|
||||
,content: ['<form action="https://www.baidu.com/s">'
|
||||
,'<input autocomplete="off" placeholder="搜索内容，回车跳转" type="text" name="wd">'
|
||||
,'</form>'].join('')
|
||||
,success: function(layero){
|
||||
var input = layero.find('input');
|
||||
@ -513,7 +513,7 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'face'], f
|
||||
if(val.replace(/\s/g, '') === ''){
|
||||
return false;
|
||||
}
|
||||
input.val('site:layui.com '+ input.val());
|
||||
input.val(/*'site:layui.com '+ */input.val());
|
||||
});
|
||||
}
|
||||
})
|
||||
|
||||
@ -4,13 +4,14 @@
|
||||
|
||||
*/
|
||||
|
||||
layui.define('fly', function(exports){
|
||||
layui.define(['fly','laypage'], function(exports){
|
||||
|
||||
var $ = layui.jquery;
|
||||
var layer = layui.layer;
|
||||
var util = layui.util;
|
||||
var laytpl = layui.laytpl;
|
||||
var form = layui.form;
|
||||
var laypage = layui.laypage;
|
||||
var fly = layui.fly;
|
||||
|
||||
var gather = {}, dom = {
|
||||
@ -76,14 +77,12 @@ layui.define('fly', function(exports){
|
||||
del: function(div){
|
||||
layer.confirm('确认删除该求解么？', function(index){
|
||||
layer.close(index);
|
||||
fly.json('/api/jie-delete/', {
|
||||
id: div.data('id')
|
||||
fly.json('/os/content/set', {
|
||||
id: div.data('id')
|
||||
,v: -1
|
||||
,field:"status"
|
||||
}, function(res){
|
||||
if(res.status === 0){
|
||||
location.href = '/jie/';
|
||||
} else {
|
||||
layer.msg(res.msg);
|
||||
}
|
||||
location.href= "/";
|
||||
});
|
||||
});
|
||||
}
|
||||
@ -91,14 +90,12 @@ layui.define('fly', function(exports){
|
||||
//设置置顶、状态
|
||||
,set: function(div){
|
||||
var othis = $(this);
|
||||
fly.json('/api/jie-set/', {
|
||||
fly.json('/os/content/set', {
|
||||
id: div.data('id')
|
||||
,rank: othis.attr('rank')
|
||||
,v: othis.attr('v')
|
||||
,field: othis.attr('field')
|
||||
}, function(res){
|
||||
if(res.status === 0){
|
||||
location.reload();
|
||||
}
|
||||
location.reload();
|
||||
});
|
||||
}
|
||||
|
||||
@ -267,15 +264,43 @@ layui.define('fly', function(exports){
|
||||
|
||||
$("."+ layui.cache.actived).addClass("tab-this");
|
||||
|
||||
function getUrl(curr){
|
||||
var args=new Object();
|
||||
var query=location.search.substring(1);//获取查询串
|
||||
var pairs=query.split("&");//在逗号处断开
|
||||
for(var i=0;i<pairs.length;i++){
|
||||
var pos=pairs[i].indexOf('=');//查找name=value
|
||||
if(pos==-1){//如果没有找到就跳过
|
||||
continue;
|
||||
}
|
||||
var argname=pairs[i].substring(0,pos);//提取name
|
||||
var value=pairs[i].substring(pos+1);//提取value
|
||||
args[argname]=unescape(value);//存为属性
|
||||
}
|
||||
if(curr)args.curr = curr;
|
||||
|
||||
var url = location.href;
|
||||
url = url.substring(0, url.indexOf("?"));
|
||||
|
||||
var search = "?"
|
||||
for(x in args){
|
||||
console.log(search);
|
||||
search = search + x+ "=" +args[x] +"&";
|
||||
}
|
||||
return url+search;//返回对象
|
||||
}
|
||||
|
||||
if(layui.cache.curr){
|
||||
layui.laypage({
|
||||
cont:"jie-laypage"
|
||||
layui.laypage.render({
|
||||
elem:"jie-laypage"
|
||||
,curr:layui.cache.curr
|
||||
,pages: parseInt(layui.cache.total/15) + (layui.cache.total%15 > 0 ? 1:0)
|
||||
,count: layui.cache.total
|
||||
,limit:5
|
||||
,jump: function(obj, first){
|
||||
var curr = obj.curr;
|
||||
if(!first)
|
||||
location.href=layui.cache.url+"?curr="+curr;
|
||||
if(!first){
|
||||
location.href = getUrl(curr);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ public class ContentInfo implements Serializable {
|
||||
private int status = 1;
|
||||
|
||||
private String createTime;
|
||||
private String cateName;
|
||||
private String typeName;
|
||||
private String nickname = "";
|
||||
private String avatar = "";
|
||||
private int hadCollect = -1;
|
||||
@ -139,12 +139,12 @@ public class ContentInfo implements Serializable {
|
||||
this.createTime = createTime;
|
||||
}
|
||||
|
||||
public String getCateName() {
|
||||
return cateName;
|
||||
public String getTypeName() {
|
||||
return typeName;
|
||||
}
|
||||
|
||||
public void setCateName(String cateName) {
|
||||
this.cateName = cateName;
|
||||
public void setTypeName(String typeName) {
|
||||
this.typeName = typeName;
|
||||
}
|
||||
|
||||
public String getNickname() {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.lxyer.bbs.base.entity;
|
||||
|
||||
import com.jfinal.kit.Kv;
|
||||
import com.lxyer.bbs.base.LxyKit;
|
||||
import com.lxyer.bbs.base.bean.ContentInfo;
|
||||
import org.redkale.convert.json.JsonConvert;
|
||||
@ -176,6 +177,7 @@ public class Content implements java.io.Serializable {
|
||||
return JsonConvert.root().convertTo(this);
|
||||
}
|
||||
|
||||
private static final Kv types = Kv.by(10, "求助").set(20, "分享").set(30, "建议").set(40, "公告").set(50, "动态");
|
||||
public ContentInfo createContentInfo(){
|
||||
ContentInfo info = new ContentInfo();
|
||||
info.setContentId(contentId);
|
||||
@ -183,24 +185,15 @@ public class Content implements java.io.Serializable {
|
||||
info.setTitle(title);
|
||||
info.setContent(content);
|
||||
info.setCate(cate);
|
||||
info.setType(type);
|
||||
info.setViewNum(viewNum);
|
||||
info.setReplyNum(replyNum);
|
||||
info.setWonderful(wonderful);
|
||||
info.setTop(top);
|
||||
info.setSolved(solved);
|
||||
|
||||
info.setCateName(cateName());
|
||||
info.setTypeName(types.getOrDefault(type, "其他").toString());
|
||||
info.setCreateTime(LxyKit.dateFmt(createTime));
|
||||
return info;
|
||||
}
|
||||
|
||||
public String cateName(){
|
||||
switch (cate){
|
||||
case 1: return "Redkale框架综合";
|
||||
case 2: return "JFinal框架综合";
|
||||
case 3: return "Layui框架综合";
|
||||
case 4: return "JSON解析";
|
||||
default: return "其他";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -179,4 +179,10 @@ public class ContentService extends BaseService{
|
||||
return infos;
|
||||
}
|
||||
|
||||
@RestMapping(name = "set", comment = "内容操作")
|
||||
public RetResult contentSet(int id, String field, int v){
|
||||
source.updateColumn(Content.class, id, field, v);
|
||||
return RetResult.success();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -60,12 +60,18 @@ public class IndexServlet extends BaseServlet {
|
||||
@HttpMapping(url = "/column", auth = false, comment = "社区首页")
|
||||
public void column(HttpRequest request, HttpResponse response){
|
||||
String para = getPara();//空，qz，fx，jy，gg，dt，
|
||||
int solved = request.getIntParameter("solved", -1);
|
||||
int wonderful = request.getIntParameter("wonderful", -1);
|
||||
int curr = request.getIntParameter("curr", 1);
|
||||
|
||||
Kv column = Kv.by("qz", 10).set("fx", 20).set("jy", 30).set("gg", 40).set("dt", 50);//栏目
|
||||
|
||||
Flipper flipper = new Flipper().limit(30).sort("top DESC,createTime DESC");
|
||||
Flipper flipper = new Flipper().offset((curr-1) * 5).limit(5).sort("top DESC,createTime DESC");
|
||||
//帖子列表
|
||||
FilterNode filterNode = FilterNode.create("status", FilterExpress.NOTEQUAL, -1).and("type", column.getAs(para));
|
||||
if (solved > -1) filterNode.and("solved", solved);
|
||||
if (wonderful > -1) filterNode.and("wonderful", wonderful);
|
||||
|
||||
Sheet<ContentInfo> contents = contentService.contentQuery(flipper, filterNode);
|
||||
|
||||
//热议
|
||||
@ -73,7 +79,8 @@ public class IndexServlet extends BaseServlet {
|
||||
Sheet<ContentInfo> hotReply = contentService.contentQuery(flipper3, "");
|
||||
|
||||
|
||||
Kv kv = Kv.by("contents", contents).set("hotReply", hotReply);
|
||||
Kv kv = Kv.by("contents", contents).set("hotReply", hotReply)
|
||||
.set("solved", solved).set("wonderful", wonderful).set("column", para).set("curr", curr);
|
||||
finish("/jie/index.html", kv);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user