diff --git a/pom.xml b/pom.xml
index 128d49e..5621b61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,39 +7,26 @@
com.lxyer
redbbs
1.0-SNAPSHOT
-
- redbbs
- src
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- 11
- 11
-
-
-
-
org.redkale
redkale
- 2.0.0.alpha1
+ 2.0.0.rc3
org.redkalex
redkale-plugins
- 2.0.0.alpha1
+ 2.0.0.rc3
mysql
mysql-connector-java
- 5.1.34
+ 8.0.18
+
com.jfinal
enjoy
@@ -60,5 +47,18 @@
-->
-
+
+ redbbs
+ src
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 11
+ 11
+
+
+
+
\ No newline at end of file
diff --git a/root/res/mods/index.js b/root/res/mods/index.js
index f2121f7..91615e1 100644
--- a/root/res/mods/index.js
+++ b/root/res/mods/index.js
@@ -22,11 +22,6 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'face'], f
if(device.ie && device.ie < 8){
layer.alert('如果您非得使用 IE 浏览器访问社区，那么请使用 IE8+');
}
- //1216.top都统一访问到www.1216.top; 考虑SEO
- var addr = window.location.href
- if(addr.indexOf("1216.top") > -1 && addr.indexOf("www.1216.top") == -1){
- window.location.href = addr.replace("1216.top", "www.1216.top");
- }
layui.focusInsert = function(obj, str){
var result, val = obj.value;
diff --git a/src/net/tccn/bbs/base/ArangoKit.java b/src/net/tccn/bbs/base/ArangoKit.java
index bc30d22..7d51e20 100644
--- a/src/net/tccn/bbs/base/ArangoKit.java
+++ b/src/net/tccn/bbs/base/ArangoKit.java
@@ -17,7 +17,7 @@ public class ArangoKit {
protected static final boolean winos = System.getProperty("os.name").contains("Window");
- protected static Function chDev = (s) -> s + (winos ? "_dev" : "");
+ protected static Function chDev = (s) -> s + (winos ? "_dev" : "");
//Arango
protected static ArangoDB arangoDb = new ArangoDB.Builder().host("120.24.230.60", 8529).user("root").password("abc123").build();
@@ -50,6 +50,7 @@ public class ArangoKit {
public static long findInt(String aql) {
return dbDev.query(aql, long.class).first();
}
+
public static long findInt(String aql, Map para) {
return dbDev.query(aql, long.class).first();
}
diff --git a/src/net/tccn/bbs/base/ArangoService.java b/src/net/tccn/bbs/base/ArangoService.java
index 86a797c..2543b43 100644
--- a/src/net/tccn/bbs/base/ArangoService.java
+++ b/src/net/tccn/bbs/base/ArangoService.java
@@ -22,7 +22,7 @@ public class ArangoService extends BaseService {
protected static final boolean winos = System.getProperty("os.name").contains("Window");
- protected Function chDev = (s) -> s + (isDev ? "_dev" : "");
+ protected Function chDev = (s) -> s + (isDev ? "_dev" : "");
@Resource(name = "property.arango.host")
private String arangoHost = "127.0.0.1";
@@ -45,18 +45,20 @@ public class ArangoService extends BaseService {
@Override
public void init(AnyValue config) {
- System.out.println("isDev :" + isDev);
+ CompletableFuture.runAsync(() -> {
+ System.out.println("isDev :" + isDev);
- arangoDb = new ArangoDB.Builder().host(arangoHost, port).user(user).password(password).build();
- db = arangoDb.db(chDev.apply(database));
- colVisLog = db.collection(chDev.apply(VIS_LOG));
+ arangoDb = new ArangoDB.Builder().host(arangoHost, port).user(user).password(password).build();
+ db = arangoDb.db(chDev.apply(database));
+ colVisLog = db.collection(chDev.apply(VIS_LOG));
- if (!db.exists()) {
- db.create();
- }
- if (!colVisLog.exists()) {
- colVisLog.create();
- }
+ if (!db.exists()) {
+ db.create();
+ }
+ if (!colVisLog.exists()) {
+ colVisLog.create();
+ }
+ });
}
@RestMapping(auth = false)
@@ -79,6 +81,7 @@ public class ArangoService extends BaseService {
public static long findInt(String aql) {
return db.query(aql, long.class).first();
}
+
public static long findInt(String aql, Map para) {
return db.query(aql, long.class).first();
}
diff --git a/src/net/tccn/bbs/base/BaseService.java b/src/net/tccn/bbs/base/BaseService.java
index a3be2ea..dbd2de8 100644
--- a/src/net/tccn/bbs/base/BaseService.java
+++ b/src/net/tccn/bbs/base/BaseService.java
@@ -58,15 +58,15 @@ public class BaseService implements Service {
}
@RestMapping(ignore = true)
- public int currentUserid(String sessionid){
+ public int currentUserid(String sessionid) {
if (sessionid == null) return 0;
long userid = 0;
try {
userid = sessions.getLong(sessionid, 0);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
- return (int)userid;
+ return (int) userid;
}
}
diff --git a/src/net/tccn/bbs/base/BaseServlet.java b/src/net/tccn/bbs/base/BaseServlet.java
index 477fb26..51db0ee 100644
--- a/src/net/tccn/bbs/base/BaseServlet.java
+++ b/src/net/tccn/bbs/base/BaseServlet.java
@@ -22,6 +22,7 @@ import static net.tccn.bbs.base.kit.RetCodes.RET_USER_UNLOGIN;
/**
* Created by Lxy at 2017/10/3 13:39.
*/
+@HttpUserType(UserInfo.class)
public class BaseServlet extends HttpServlet {
protected static final boolean winos = System.getProperty("os.name").contains("Window");
@@ -61,26 +62,26 @@ public class BaseServlet extends HttpServlet {
}
String uri = request.getRequestURI();
- if (uri.startsWith("/res")){
+ if (uri.startsWith("/res")) {
File file = new File(webroot + uri);
response.finish(file);
return;
}
- if (uri.endsWith(".html")){
+ if (uri.endsWith(".html")) {
response.finish(HttpScope.refer(uri));
return;
}
//异步记录访问日志
final int userid = currentid;
- CompletableFuture.runAsync(()->{
+ CompletableFuture.runAsync(() -> {
Kv para = Kv.create();
- for (String key : request.getParameterNames()){
+ for (String key : request.getParameterNames()) {
para.set(key, request.getParameter(key));
}
Kv headers = Kv.create();
- request.getHeaders().forEach((k,v)->{
+ request.getHeaders().forEach((k, v) -> {
headers.set(k, request.getHeader(k));
});
@@ -106,9 +107,9 @@ public class BaseServlet extends HttpServlet {
@Override
protected void authenticate(HttpRequest request, HttpResponse response) throws IOException {
if (request.currentUser() == null) {
- if ("XMLHttpRequest".equals(request.getHeader("X-Requested-With"))){
+ if ("XMLHttpRequest".equals(request.getHeader("X-Requested-With"))) {
response.finish(RetCodes.retResult(RET_USER_UNLOGIN, "未登录，登录后重试").toString());
- }else {
+ } else {
response.finish(HttpScope.refer("/user/login.html"));
}
return;
@@ -116,55 +117,60 @@ public class BaseServlet extends HttpServlet {
response.nextEvent();
}
- public int getLimit(HttpRequest request){
+ public int getLimit(HttpRequest request) {
return request.getIntParameter("limit", 1);
}
- public int getOffset(HttpRequest request){
+
+ public int getOffset(HttpRequest request) {
return request.getIntParameter("offset", 10);
}
- public String getPara(HttpRequest request){
+ public String getPara(HttpRequest request) {
String requestURI = request.getRequestURI();
String subStr = requestURI.substring(requestURI.lastIndexOf("/") + 1);
return subStr.contains("-") ? subStr.substring(0, subStr.indexOf("-")) : subStr;
}
- public String getPara(HttpRequest request,int index){
+
+ public String getPara(HttpRequest request, int index) {
String requestURI = request.getRequestURI();
String subStr = requestURI.substring(requestURI.lastIndexOf("/") + 1);
String[] paraArr = subStr.split("-");
- if (index < 0){
- return paraArr.length < -index ? null : paraArr[paraArr.length+index];
- }else {
- return paraArr.length < index+1 ? null : paraArr[index];
+ if (index < 0) {
+ return paraArr.length < -index ? null : paraArr[paraArr.length + index];
+ } else {
+ return paraArr.length < index + 1 ? null : paraArr[index];
}
}
- public T getPara(HttpRequest request, int index, T defaultValue){
- T para = (T)getPara(request,index);
+
+ public T getPara(HttpRequest request, int index, T defaultValue) {
+ T para = (T) getPara(request, index);
return para == null || "".equals(para) ? defaultValue : para;
}
- public int getParaToInt(HttpRequest request,int index, int defaultValue){
- String para = getPara(request,index);
+
+ public int getParaToInt(HttpRequest request, int index, int defaultValue) {
+ String para = getPara(request, index);
return para == null || "".equals(para) ? defaultValue : Integer.parseInt(para);
}
- public int getParaToInt(HttpRequest request,int index){
+
+ public int getParaToInt(HttpRequest request, int index) {
int n = 0;
- String para = getPara(request,index);
+ String para = getPara(request, index);
if (para == null || "".equals(para)) n = 0;
try {
n = Integer.parseInt(para);
- }catch (Exception e){
+ } catch (Exception e) {
}
return n;
}
//设置私密帖子过滤
- protected FilterNode setPrivate(HttpRequest request,FilterNode node){
+ protected FilterNode setPrivate(HttpRequest request, FilterNode node) {
UserInfo userInfo = request.currentUser();
- if (userInfo == null){
+ if (userInfo == null) {
node.and("status", FilterExpress.NOTEQUAL, 30);
- }else if (!userService.isAdmin(userInfo.getUserid())){
+ } else if (!userService.isAdmin(userInfo.getUserid())) {
//select * from content c where c.status != -1 and (c.status!=30 or (c.status=30 and c.userid=100001))
node.and(FilterNode.create("status", FilterExpress.NOTEQUAL, 30).or(FilterNode.create("status", 30).and("userid", userInfo.getUserid())));
}
diff --git a/src/net/tccn/bbs/base/FileService.java b/src/net/tccn/bbs/base/FileService.java
index 400817e..604ab1c 100644
--- a/src/net/tccn/bbs/base/FileService.java
+++ b/src/net/tccn/bbs/base/FileService.java
@@ -27,15 +27,15 @@ public class FileService extends BaseService {
String path = String.format(format, System.currentTimeMillis()) + suffix;
File destFile = new File((winos ? "D:/wk/_own/redbbs/root/tem/" : dir) + path);
destFile.getParentFile().mkdir();
- if (!tmpFile.renameTo(destFile)){
- try{
+ if (!tmpFile.renameTo(destFile)) {
+ try {
Files.copy(tmpFile.toPath(), destFile.toPath(), StandardCopyOption.ATOMIC_MOVE);
- }finally {
+ } finally {
tmpFile.delete();//删除临时文件
}
}
RetResult result = RetResult.success();
- result.setRetinfo((winos ? "/tem/": view) + path);
+ result.setRetinfo((winos ? "/tem/" : view) + path);
return result;
}
}
diff --git a/src/net/tccn/bbs/base/JBean.java b/src/net/tccn/bbs/base/JBean.java
index 4f4b715..649fa35 100644
--- a/src/net/tccn/bbs/base/JBean.java
+++ b/src/net/tccn/bbs/base/JBean.java
@@ -21,12 +21,12 @@ public class JBean /*extends RetResult*/ {
this.retinfo = retinfo;
}
- public static JBean by(int retcode, String retinfo){
+ public static JBean by(int retcode, String retinfo) {
JBean jBean = new JBean(retcode, retinfo);
return jBean;
}
- public static JBean by(int retcode, String retinfo, Object t){
+ public static JBean by(int retcode, String retinfo, Object t) {
JBean jBean = new JBean(retcode, retinfo);
jBean.setResult(t);
return jBean;
@@ -68,7 +68,7 @@ public class JBean /*extends RetResult*/ {
this.attach = attach;
}
- public JBean attach(String key, Object object){
+ public JBean attach(String key, Object object) {
if (attach == null)
attach = new HashMap<>();
attach.put(key, object);
@@ -76,11 +76,12 @@ public class JBean /*extends RetResult*/ {
}
private static final JBean ok = new JBean(0);
- public static JBean ok(){
+
+ public static JBean ok() {
return ok;
}
- public static JBean faild(String retinfo){
+ public static JBean faild(String retinfo) {
return new JBean(-1, retinfo);
}
diff --git a/src/net/tccn/bbs/base/TaskQueue.java b/src/net/tccn/bbs/base/TaskQueue.java
index 45a2fdf..2526ebc 100644
--- a/src/net/tccn/bbs/base/TaskQueue.java
+++ b/src/net/tccn/bbs/base/TaskQueue.java
@@ -25,7 +25,7 @@ import java.util.function.Function;
/**
* Created by liangxianyou at 2018/6/20 22:54.
*/
-@RestService(name = "xxx",automapping = true, comment = "日志记录")
+@RestService(name = "xxx", automapping = true, comment = "日志记录")
public class TaskQueue extends BaseService implements Runnable {
@Resource
@@ -63,7 +63,7 @@ public class TaskQueue extends BaseService implements Runnable
VisLog visLog = (VisLog) _task;
//[访问量]
String uri = visLog.getUri();
- if (uri != null && uri.startsWith("/jie/detail/")){
+ if (uri != null && uri.startsWith("/jie/detail/")) {
updateViewNum(visLog);
}
});
@@ -93,11 +93,11 @@ public class TaskQueue extends BaseService implements Runnable
}
@RestMapping(ignore = true, comment = "访问热帖数据")
- public Sheet hotView(String sessionid){
+ public Sheet hotView(String sessionid) {
int limit = 8;
String cacheKey = "hotView";
Object ids = cacheSource.get(cacheKey);
- if (isEmpty.test(ids)){
+ if (isEmpty.test(ids)) {
Calendar cal = Calendar.getInstance();
cal.set(Calendar.DAY_OF_MONTH, -7);
@@ -136,9 +136,9 @@ public class TaskQueue extends BaseService implements Runnable
//权限过滤
UserInfo userInfo = userService.current(sessionid);
- if (userInfo == null){ //访客
+ if (userInfo == null) { //访客
node.and("status", FilterExpress.NOTEQUAL, 30);
- }else if (!userService.isAdmin(userInfo.getUserid())){ //非管理员
+ } else if (!userService.isAdmin(userInfo.getUserid())) { //非管理员
node.and(FilterNode.create("status", FilterExpress.NOTEQUAL, 30).or(FilterNode.create("status", 30).and("userid", userInfo.getUserid())));
}
return contentService.contentQuery(flipper, node);
@@ -148,7 +148,7 @@ public class TaskQueue extends BaseService implements Runnable
* TODO:帖子访客记录 --待完成
*/
@RestMapping(ignore = true, comment = "帖子访客记录")
- public Sheet