调整包结构
This commit is contained in:
parent
2812f3423e
commit
b5e2569d7c
@ -9,27 +9,40 @@
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>#if(title)#(title) - #end优乐园社区</title>
|
||||
<title>#if(title)#(title) - #end Redbbs社区</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
|
||||
<meta http-equiv="Cache-Control" content="max-age=7200" />
|
||||
<meta name="keywords" content="#(keywords??'优乐园')">
|
||||
<meta name="description" content="#(description??'优乐园社区')">
|
||||
<meta name="keywords" content="#(keywords??'redkale')">
|
||||
<meta name="description" content="#(description??'redkale框架，redkale社区')">
|
||||
<link rel="stylesheet" href="/res/layui/css/layui.css">
|
||||
<link rel="stylesheet" href="/res/css/global.css">
|
||||
<!--background-color: #4a184c;-->
|
||||
<style>
|
||||
.layui-bg-black,.layui-btn,.layui-laypage .layui-laypage-curr .layui-laypage-em{background-image: linear-gradient(350deg, #330335, #AB5D7C);}
|
||||
.laypage-main{border:1px solid #a25677!important;}
|
||||
.laypage-main *{border-right:#a25677;border-bottom:#a25677;}
|
||||
.layui-nav *{font-size:16px}
|
||||
.layui-nav-tree .layui-nav-child dd.layui-this, .layui-nav-tree .layui-nav-child dd.layui-this a, .layui-nav-tree .layui-this, .layui-nav-tree .layui-this>a, .layui-nav-tree .layui-this>a:hover
|
||||
{background-color:#4a184c;}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div class="fly-header layui-bg-black">
|
||||
<div class="layui-container">
|
||||
<a class="fly-logo" href="/">
|
||||
<img src="/res/images/logo.png" alt="优乐园社区">
|
||||
<a class="fly-logo" href="/" style="font-size: 30px;color: #fff;">
|
||||
Redbbs
|
||||
<!--<img src="/res/images/logo.png" alt="优乐园社区">-->
|
||||
</a>
|
||||
<ul class="layui-nav fly-nav layui-hide-xs">
|
||||
<li class="layui-nav-item layui-this">
|
||||
<a href="/">首页</a>
|
||||
<a href="/">社区</a>
|
||||
</li>
|
||||
<li class="layui-nav-item">
|
||||
<a href="/">交流</a>
|
||||
<a href="http://redkale.org/" target="_blank">Redkale框架</a>
|
||||
</li>
|
||||
<li class="layui-nav-item">
|
||||
<a href="http://redkale.org/articles.html" target="_blank">技术文章</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@ -79,7 +92,7 @@
|
||||
#@main?()
|
||||
|
||||
<div class="fly-footer">
|
||||
<p><a href="http://b.1216.top/" target="_blank">优乐园社区</a> 2017 © <a href="http://1216.top/" target="_blank">http://1216.top</a></p>
|
||||
<p><a href="http://b.1216.top/" target="_blank">Redbbs</a> 2017 © <a href="http://1216.top/" target="_blank">http://1216.top</a></p>
|
||||
#define x()
|
||||
<p>
|
||||
<a href="http://fly.layui.com/jie/3147/" target="_blank">付费计划</a>
|
||||
@ -99,11 +112,13 @@
|
||||
<div class="fly-panel fly-column">
|
||||
<div class="layui-container">
|
||||
<ul class="layui-clear">
|
||||
<li class="layui-hide-xs #@columned('')"><a href="/">首页</a></li>
|
||||
<li class="layui-hide-xs #@columned('')"><a href="/">全部</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>
|
||||
|
||||
|
||||
@ -19,12 +19,15 @@
|
||||
<div class="layui-input-block">
|
||||
<select lay-verify="required" name="type">
|
||||
<option></option>
|
||||
<!--[内容栏目]10求助，20分享，30建议，40公告，50动态-->
|
||||
<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>
|
||||
<!--[内容栏目]10求助，20分享，30建议，40公告，50动态-->
|
||||
<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>
|
||||
<!--高级权限开放类别-->
|
||||
#if(mine.userId?? == 100001)
|
||||
<option value="40" #if(bean.type?? == 40) selected #end>公告</option>
|
||||
<option value="50" #if(bean.type?? == 50) selected #end>动态</option>
|
||||
#end
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -138,7 +138,7 @@ pre{padding: 10px 15px; margin: 10px 0; font-size: 12px; border-left: 6px solid
|
||||
/* 头部 */
|
||||
.fly-header{position: fixed; left: 0; top: 0; z-index: 10000; width: 100%; height: 60px; border-bottom: 1px solid #404553; border-right: 1px solid #404553; border-radius: 0;}
|
||||
.fly-logo{position: absolute; left: 15px; top: 11px;}
|
||||
.fly-nav{margin-left: 110px;}
|
||||
.fly-nav{margin-left: 130px;}
|
||||
.fly-nav a i{position: absolute; left: 25px; top: 0; padding-right: 10px; font-size: 26px;}
|
||||
.fly-nav a .icon-shouye, .nav a .icon-shezhi{top: 2px;}
|
||||
|
||||
|
||||
@ -618,7 +618,7 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'face'], f
|
||||
//固定Bar
|
||||
util.fixbar({
|
||||
bar1: ''
|
||||
,bgcolor: '#009688'
|
||||
,bgcolor: '#4a184c'
|
||||
,click: function(type){
|
||||
if(type === 'bar1'){
|
||||
//layer.msg('打开 index.js，开启发表新帖的路径');
|
||||
|
||||
@ -12,7 +12,6 @@ import java.io.File;
|
||||
public class BaseService implements Service {
|
||||
|
||||
protected final int sessionExpireSeconds = 30 * 60;
|
||||
protected final int contentinfoExpireSeconds = 30 * 60;
|
||||
|
||||
@Resource(name = "SERVER_ROOT")
|
||||
protected File webroot;
|
||||
|
||||
@ -3,7 +3,7 @@ package com.lxyer.bbs.base;
|
||||
import com.jfinal.kit.Kv;
|
||||
import com.jfinal.template.Engine;
|
||||
import com.jfinal.template.Template;
|
||||
import com.lxyer.bbs.service.UserService;
|
||||
import com.lxyer.bbs.base.user.UserService;
|
||||
import org.redkale.net.http.HttpContext;
|
||||
import org.redkale.net.http.HttpRequest;
|
||||
import org.redkale.net.http.HttpResponse;
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
package com.lxyer.bbs.base;
|
||||
|
||||
import com.jfinal.template.Engine;
|
||||
import org.redkale.net.http.RestService;
|
||||
import org.redkale.service.Service;
|
||||
import org.redkale.util.AnyValue;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.io.File;
|
||||
|
||||
/**
|
||||
* Created by Lxy at 2017/10/1 8:41.
|
||||
*/
|
||||
@RestService(automapping = false)
|
||||
public class EnjoyService extends Engine implements Service {
|
||||
@Resource(name = "SERVER_ROOT")
|
||||
protected File webroot;
|
||||
|
||||
@Override
|
||||
public void init(AnyValue config) {
|
||||
setBaseTemplatePath(webroot.getPath());
|
||||
|
||||
addSharedObject("EJ", new EJ());
|
||||
addSharedFunction("/_t/layout.html");
|
||||
}
|
||||
}
|
||||
@ -16,8 +16,8 @@ import java.nio.file.StandardCopyOption;
|
||||
@RestService(automapping = true, comment = "文件服务")
|
||||
public class FileService extends BaseService {
|
||||
|
||||
private static final String dir = "/var/www/upload/bbs/";
|
||||
private static final String view = "http://img.1216.top/bbs/";
|
||||
private static final String dir = "/var/www/upload/redbbs/";
|
||||
private static final String view = "http://img.1216.top/redbbs/";
|
||||
private static final String format = "%1$tY%1$tm%1$td%1$tH%1$tM%1$tS";
|
||||
|
||||
@RestMapping(name = "upload", comment = "文件上传")
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
package com.lxyer.bbs.base.bean;
|
||||
package com.lxyer.bbs.base.user;
|
||||
|
||||
import com.lxyer.bbs.base.entity.User;
|
||||
import org.redkale.net.http.RestSessionid;
|
||||
import org.redkale.source.FilterBean;
|
||||
import org.redkale.util.Comment;
|
||||
@ -1,6 +1,5 @@
|
||||
package com.lxyer.bbs.base.entity;
|
||||
package com.lxyer.bbs.base.user;
|
||||
|
||||
import com.lxyer.bbs.base.bean.UserInfo;
|
||||
import org.redkale.convert.ConvertColumn;
|
||||
import org.redkale.convert.ConvertType;
|
||||
import org.redkale.convert.json.JsonConvert;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.lxyer.bbs.base.bean;
|
||||
package com.lxyer.bbs.base.user;
|
||||
|
||||
import org.redkale.source.FilterBean;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.lxyer.bbs.base.bean;
|
||||
package com.lxyer.bbs.base.user;
|
||||
|
||||
import org.redkale.convert.ConvertColumn;
|
||||
import org.redkale.convert.ConvertType;
|
||||
@ -1,12 +1,12 @@
|
||||
package com.lxyer.bbs.service;
|
||||
package com.lxyer.bbs.base.user;
|
||||
|
||||
import com.lxyer.bbs.base.BaseService;
|
||||
import com.lxyer.bbs.base.LxyKit;
|
||||
import com.lxyer.bbs.base.RetCodes;
|
||||
import com.lxyer.bbs.base.bean.LoginBean;
|
||||
import com.lxyer.bbs.base.bean.UserBean;
|
||||
import com.lxyer.bbs.base.bean.UserInfo;
|
||||
import com.lxyer.bbs.base.entity.User;
|
||||
import com.lxyer.bbs.base.user.LoginBean;
|
||||
import com.lxyer.bbs.base.user.UserBean;
|
||||
import com.lxyer.bbs.base.user.UserInfo;
|
||||
import com.lxyer.bbs.base.user.User;
|
||||
import org.redkale.net.http.RestMapping;
|
||||
import org.redkale.net.http.RestParam;
|
||||
import org.redkale.net.http.RestService;
|
||||
@ -20,8 +20,6 @@ import org.redkale.util.SelectColumn;
|
||||
import org.redkale.util.Sheet;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Objects;
|
||||
import java.util.Random;
|
||||
@ -1,7 +1,6 @@
|
||||
package com.lxyer.bbs.base.entity;
|
||||
package com.lxyer.bbs.comment;
|
||||
|
||||
import com.lxyer.bbs.base.LxyKit;
|
||||
import com.lxyer.bbs.base.bean.CommentInfo;
|
||||
import org.redkale.convert.json.JsonConvert;
|
||||
|
||||
import javax.persistence.*;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.lxyer.bbs.base.bean;
|
||||
package com.lxyer.bbs.comment;
|
||||
|
||||
import org.redkale.convert.json.JsonConvert;
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
package com.lxyer.bbs.service;
|
||||
package com.lxyer.bbs.comment;
|
||||
|
||||
import com.lxyer.bbs.base.BaseService;
|
||||
import com.lxyer.bbs.base.RetCodes;
|
||||
import com.lxyer.bbs.base.bean.CommentInfo;
|
||||
import com.lxyer.bbs.base.entity.ActLog;
|
||||
import com.lxyer.bbs.base.entity.Comment;
|
||||
import com.lxyer.bbs.base.entity.Content;
|
||||
import com.lxyer.bbs.base.entity.User;
|
||||
import com.lxyer.bbs.content.Content;
|
||||
import com.lxyer.bbs.base.user.User;
|
||||
import com.lxyer.bbs.base.user.UserService;
|
||||
import org.redkale.net.http.RestMapping;
|
||||
import org.redkale.net.http.RestParam;
|
||||
import org.redkale.net.http.RestService;
|
||||
@ -22,7 +21,6 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static com.lxyer.bbs.base.RetCodes.*;
|
||||
import static java.util.Arrays.asList;
|
||||
|
||||
/**
|
||||
* Created by Lxy at 2017/11/29 10:00.
|
||||
@ -1,8 +1,7 @@
|
||||
package com.lxyer.bbs.base.entity;
|
||||
package com.lxyer.bbs.content;
|
||||
|
||||
import com.jfinal.kit.Kv;
|
||||
import com.lxyer.bbs.base.LxyKit;
|
||||
import com.lxyer.bbs.base.bean.ContentInfo;
|
||||
import org.redkale.convert.json.JsonConvert;
|
||||
|
||||
import javax.persistence.*;
|
||||
@ -177,7 +176,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, "动态");
|
||||
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);
|
||||
@ -1,4 +1,4 @@
|
||||
package com.lxyer.bbs.base.bean;
|
||||
package com.lxyer.bbs.content;
|
||||
|
||||
import org.redkale.convert.json.JsonConvert;
|
||||
import org.redkale.source.FilterBean;
|
||||
@ -1,4 +1,4 @@
|
||||
package com.lxyer.bbs.base.bean;
|
||||
package com.lxyer.bbs.content;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
package com.lxyer.bbs.service;
|
||||
package com.lxyer.bbs.content;
|
||||
|
||||
import com.lxyer.bbs.base.BaseService;
|
||||
import com.lxyer.bbs.base.LxyKit;
|
||||
import com.lxyer.bbs.base.RetCodes;
|
||||
import com.lxyer.bbs.base.bean.ContentInfo;
|
||||
import com.lxyer.bbs.base.user.UserService;
|
||||
import com.lxyer.bbs.content.ContentInfo;
|
||||
import com.lxyer.bbs.base.entity.ActLog;
|
||||
import com.lxyer.bbs.base.entity.Content;
|
||||
import com.lxyer.bbs.base.entity.User;
|
||||
import com.lxyer.bbs.content.Content;
|
||||
import com.lxyer.bbs.base.user.User;
|
||||
import org.redkale.net.http.RestMapping;
|
||||
import org.redkale.net.http.RestParam;
|
||||
import org.redkale.net.http.RestService;
|
||||
@ -2,10 +2,14 @@ package com.lxyer.bbs.servlet;
|
||||
|
||||
import com.jfinal.kit.Kv;
|
||||
import com.lxyer.bbs.base.BaseServlet;
|
||||
import com.lxyer.bbs.base.bean.*;
|
||||
import com.lxyer.bbs.base.entity.User;
|
||||
import com.lxyer.bbs.service.CommentService;
|
||||
import com.lxyer.bbs.service.ContentService;
|
||||
import com.lxyer.bbs.base.user.User;
|
||||
import com.lxyer.bbs.base.user.UserBean;
|
||||
import com.lxyer.bbs.base.user.UserInfo;
|
||||
import com.lxyer.bbs.comment.CommentInfo;
|
||||
import com.lxyer.bbs.content.ContentBean;
|
||||
import com.lxyer.bbs.content.ContentInfo;
|
||||
import com.lxyer.bbs.comment.CommentService;
|
||||
import com.lxyer.bbs.content.ContentService;
|
||||
import org.redkale.net.http.*;
|
||||
import org.redkale.source.FilterExpress;
|
||||
import org.redkale.source.FilterNode;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user