This commit is contained in:
lxyer 2019-07-08 20:59:54 +08:00
parent 1edf4abdf9
commit eb12c48a78
51 changed files with 152 additions and 153 deletions

3
.gitignore vendored
View File

@ -15,6 +15,9 @@ Thumbs.db
.project
.settings/
/lib/
/libs/
apidoc.*
#==========================
*.class

View File

@ -4,7 +4,7 @@
<resources>
<listener value="com.lxyer.redim.RedbbsListener"/>
<listener value="net.tccn.redim.RedbbsListener"/>
<source name="redis" value="org.redkalex.cache.RedisCacheSource" xxx="16">
@ -20,7 +20,7 @@
<services autoload="true"/>
<rest autoload="true" base="com.lxyer.bbs.base.BaseServlet" path="os"/>
<rest autoload="true" base="net.tccn.bbs.base.BaseServlet" path="os"/>
<request>
@ -37,7 +37,7 @@
<servlets autoload="true" path=""/>
<render value="com.lxyer.bbs.base.EnjoyRender"/>
<render value="net.tccn.bbs.base.EnjoyRender"/>
</server>

11
pom.xml
View File

@ -27,12 +27,12 @@
<dependency>
<groupId>org.redkale</groupId>
<artifactId>redkale</artifactId>
<version>1.9.9</version>
<version>2.0.0.alpha1</version>
</dependency>
<dependency>
<groupId>org.redkalex</groupId>
<artifactId>redkale-plugins</artifactId>
<version>1.9.9</version>
<version>2.0.0.alpha1</version>
</dependency>
<dependency>
@ -46,17 +46,18 @@
<version>3.6</version>
</dependency>
<!-- arangodb支持 -->
<!-- arangodb支持 -->
<dependency>
<groupId>com.arangodb</groupId>
<artifactId>arangodb-java-driver</artifactId>
<artifactId>arangodb-java-driver-async</artifactId>
<version>5.0.4</version>
</dependency>
<dependency>
<!--<dependency>
<groupId>com.lxyer</groupId>
<artifactId>redim</artifactId>
<version>1.0</version>
</dependency>
</dependency>-->
</dependencies>

View File

@ -4,7 +4,7 @@
#set(keywords=bean.title)
#set(description=bean.title)
#set(
project=["redbbs","redtimer", "ExcelUtil","jfly"]
project=["redbbs","redtimer", "JKit","jfly"]
)
#@layout()

View File

@ -1,9 +1,9 @@
package com.lxyer.bbs.base;
package net.tccn.bbs.base;
import com.arangodb.ArangoCollection;
import com.arangodb.ArangoDB;
import com.arangodb.ArangoDatabase;
import com.lxyer.bbs.base.entity.VisLog;
import net.tccn.bbs.base.entity.VisLog;
import java.util.List;
import java.util.Map;

View File

@ -1,9 +1,9 @@
package com.lxyer.bbs.base;
package net.tccn.bbs.base;
import com.arangodb.ArangoCollection;
import com.arangodb.ArangoDB;
import com.arangodb.ArangoDatabase;
import com.lxyer.bbs.base.entity.VisLog;
import net.tccn.bbs.base.entity.VisLog;
import org.redkale.net.http.RestMapping;
import org.redkale.net.http.RestService;
import org.redkale.util.AnyValue;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base;
package net.tccn.bbs.base;
import com.arangodb.Predicate;
import org.redkale.net.http.RestMapping;
@ -25,7 +25,7 @@ public class BaseService implements Service {
@Resource(name = "SERVER_ROOT")
protected File webroot;
@Resource(name = "art123")
@Resource(name = "redbbs")
protected DataSource source;
/* 使用redis 代码中配置此处即可

View File

@ -1,12 +1,12 @@
package com.lxyer.bbs.base;
package net.tccn.bbs.base;
import com.jfinal.kit.Kv;
import com.lxyer.bbs.base.entity.VisLog;
import com.lxyer.bbs.base.kit.RetCodes;
import com.lxyer.bbs.base.user.UserInfo;
import com.lxyer.bbs.base.user.UserService;
import com.lxyer.bbs.comment.CommentService;
import com.lxyer.bbs.content.ContentService;
import net.tccn.bbs.base.entity.VisLog;
import net.tccn.bbs.base.kit.RetCodes;
import net.tccn.bbs.base.user.UserInfo;
import net.tccn.bbs.base.user.UserService;
import net.tccn.bbs.comment.CommentService;
import net.tccn.bbs.content.ContentService;
import org.redkale.net.http.*;
import org.redkale.source.FilterExpress;
import org.redkale.source.FilterNode;
@ -17,7 +17,7 @@ import java.io.File;
import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import static com.lxyer.bbs.base.kit.RetCodes.RET_USER_UNLOGIN;
import static net.tccn.bbs.base.kit.RetCodes.RET_USER_UNLOGIN;
/**
* Created by Lxy at 2017/10/3 13:39.

View File

@ -1,10 +1,10 @@
package com.lxyer.bbs.base;
package net.tccn.bbs.base;
import com.jfinal.kit.Kv;
import com.jfinal.template.Engine;
import com.jfinal.template.Template;
import com.lxyer.bbs.base.kit.EJ;
import com.lxyer.bbs.base.user.UserInfo;
import net.tccn.bbs.base.kit.EJ;
import net.tccn.bbs.base.user.UserInfo;
import org.redkale.convert.Convert;
import org.redkale.net.http.*;
import org.redkale.util.AnyValue;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base;
package net.tccn.bbs.base;
import org.redkale.net.http.RestMapping;
import org.redkale.net.http.RestService;

View File

@ -1,4 +1,4 @@
package net.tccn.base;
package net.tccn.bbs.base;
import java.util.HashMap;
import java.util.Map;

View File

@ -1,12 +1,12 @@
package com.lxyer.bbs.base;
package net.tccn.bbs.base;
import com.lxyer.bbs.base.entity.Count;
import com.lxyer.bbs.base.entity.VisLog;
import com.lxyer.bbs.base.user.UserInfo;
import com.lxyer.bbs.base.user.UserService;
import com.lxyer.bbs.content.Content;
import com.lxyer.bbs.content.ContentInfo;
import com.lxyer.bbs.content.ContentService;
import net.tccn.bbs.base.entity.Count;
import net.tccn.bbs.base.entity.VisLog;
import net.tccn.bbs.base.user.UserInfo;
import net.tccn.bbs.base.user.UserService;
import net.tccn.bbs.content.Content;
import net.tccn.bbs.content.ContentInfo;
import net.tccn.bbs.content.ContentService;
import org.redkale.net.http.RestMapping;
import org.redkale.net.http.RestService;
import org.redkale.source.ColumnValue;

View File

@ -1,6 +1,6 @@
package com.lxyer.bbs.base;
package net.tccn.bbs.base;
import com.lxyer.bbs.base.iface.UI;
import net.tccn.bbs.base.iface.UI;
/**
* user foreign key (userId)

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.bean;
package net.tccn.bbs.base.bean;
import org.redkale.convert.json.JsonConvert;
import org.redkale.source.FilterBean;

View File

@ -1,10 +1,8 @@
package com.lxyer.bbs.base.entity;
package net.tccn.bbs.base.entity;
import javax.persistence.*;
import org.redkale.convert.json.*;
import java.util.Date;
/**
*
* @author lxyer

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.entity;
package net.tccn.bbs.base.entity;
/**
* 用来计数用

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.entity;
package net.tccn.bbs.base.entity;
import org.redkale.convert.json.JsonConvert;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.entity;
package net.tccn.bbs.base.entity;
import org.redkale.convert.json.JsonConvert;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.iface;
package net.tccn.bbs.base.iface;
/**
* 创建信息

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.iface;
package net.tccn.bbs.base.iface;
/**
* Created by liangxianyou at 2018/6/16 18:39.

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.iface;
package net.tccn.bbs.base.iface;
import org.redkale.net.http.RestMapping;
import org.redkale.util.Sheet;

View File

@ -1,6 +1,6 @@
package com.lxyer.bbs.base.iface;
package net.tccn.bbs.base.iface;
import com.lxyer.bbs.base.user.UserRecord;
import net.tccn.bbs.base.user.UserRecord;
/**
* Created by liangxianyou at 2018/6/9 13:45.

View File

@ -1,6 +1,6 @@
package com.lxyer.bbs.base.iface;
package net.tccn.bbs.base.iface;
import com.lxyer.bbs.base.user.UserRecord;
import net.tccn.bbs.base.user.UserRecord;
import org.redkale.net.http.RestMapping;
import org.redkale.source.DataSource;
import org.redkale.source.FilterExpress;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.kit;
package net.tccn.bbs.base.kit;
import org.redkale.net.http.RestService;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.kit;
package net.tccn.bbs.base.kit;
import java.text.SimpleDateFormat;
import java.util.List;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.kit;
package net.tccn.bbs.base.kit;
import org.redkale.service.RetLabel;
import org.redkale.service.RetResult;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.user;
package net.tccn.bbs.base.user;
import org.redkale.net.http.RestSessionid;
import org.redkale.source.FilterBean;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.user;
package net.tccn.bbs.base.user;
import org.redkale.source.FilterBean;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.user;
package net.tccn.bbs.base.user;
import org.redkale.convert.ConvertColumn;
import org.redkale.convert.ConvertType;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.base.user;
package net.tccn.bbs.base.user;
import org.redkale.convert.json.JsonConvert;
import org.redkale.util.Utility;

View File

@ -1,9 +1,9 @@
package com.lxyer.bbs.base.user;
package net.tccn.bbs.base.user;
import com.jfinal.kit.Kv;
import com.lxyer.bbs.base.BaseService;
import com.lxyer.bbs.base.kit.LxyKit;
import com.lxyer.bbs.base.kit.RetCodes;
import net.tccn.bbs.base.BaseService;
import net.tccn.bbs.base.kit.LxyKit;
import net.tccn.bbs.base.kit.RetCodes;
import org.redkale.net.http.RestMapping;
import org.redkale.net.http.RestParam;
import org.redkale.net.http.RestService;
@ -21,7 +21,7 @@ import java.util.List;
import java.util.Objects;
import java.util.Random;
import static com.lxyer.bbs.base.kit.RetCodes.*;
import static net.tccn.bbs.base.kit.RetCodes.*;
/**
* Created by Lxy at 2017/10/3 14:02.

View File

@ -1,11 +1,9 @@
package com.lxyer.bbs.comment;
package net.tccn.bbs.comment;
import javax.persistence.*;
import com.lxyer.bbs.base.UF;
import com.lxyer.bbs.base.iface.C;
import com.lxyer.bbs.base.iface.UI;
import com.lxyer.bbs.base.kit.LxyKit;
import net.tccn.bbs.base.iface.C;
import net.tccn.bbs.base.kit.LxyKit;
import org.redkale.convert.json.*;
import java.io.Serializable;

View File

@ -1,8 +1,8 @@
package com.lxyer.bbs.comment;
package net.tccn.bbs.comment;
import com.lxyer.bbs.base.iface.CI;
import com.lxyer.bbs.base.iface.UI;
import com.lxyer.bbs.base.user.UserRecord;
import net.tccn.bbs.base.iface.CI;
import net.tccn.bbs.base.iface.UI;
import net.tccn.bbs.base.user.UserRecord;
import org.redkale.convert.json.JsonConvert;
import javax.persistence.Column;

View File

@ -1,11 +1,11 @@
package com.lxyer.bbs.comment;
package net.tccn.bbs.comment;
import com.lxyer.bbs.base.BaseService;
import com.lxyer.bbs.base.entity.ActLog;
import com.lxyer.bbs.base.iface.UIService;
import com.lxyer.bbs.base.kit.LxyKit;
import com.lxyer.bbs.base.kit.RetCodes;
import com.lxyer.bbs.content.Content;
import net.tccn.bbs.base.BaseService;
import net.tccn.bbs.base.entity.ActLog;
import net.tccn.bbs.base.iface.UIService;
import net.tccn.bbs.base.kit.LxyKit;
import net.tccn.bbs.base.kit.RetCodes;
import net.tccn.bbs.content.Content;
import org.redkale.net.http.RestMapping;
import org.redkale.net.http.RestParam;
import org.redkale.net.http.RestService;
@ -18,8 +18,8 @@ import org.redkale.util.Sheet;
import java.util.List;
import java.util.Map;
import static com.lxyer.bbs.base.kit.RetCodes.RET_COMMENT_CONTENT_ILLEGAL;
import static com.lxyer.bbs.base.kit.RetCodes.RET_COMMENT_PARA_ILLEGAL;
import static net.tccn.bbs.base.kit.RetCodes.RET_COMMENT_CONTENT_ILLEGAL;
import static net.tccn.bbs.base.kit.RetCodes.RET_COMMENT_PARA_ILLEGAL;
/**
* Created by Lxy at 2017/11/29 10:00.

View File

@ -1,8 +1,8 @@
package com.lxyer.bbs.content;
package net.tccn.bbs.content;
import com.jfinal.kit.Kv;
import com.lxyer.bbs.base.iface.C;
import com.lxyer.bbs.base.kit.LxyKit;
import net.tccn.bbs.base.iface.C;
import net.tccn.bbs.base.kit.LxyKit;
import org.redkale.convert.json.JsonConvert;
import javax.persistence.*;

View File

@ -1,4 +1,4 @@
package com.lxyer.bbs.content;
package net.tccn.bbs.content;
import org.redkale.convert.json.JsonConvert;
import org.redkale.source.FilterBean;

View File

@ -1,8 +1,8 @@
package com.lxyer.bbs.content;
package net.tccn.bbs.content;
import com.lxyer.bbs.base.iface.CI;
import com.lxyer.bbs.base.iface.UI;
import com.lxyer.bbs.base.user.UserRecord;
import net.tccn.bbs.base.iface.CI;
import net.tccn.bbs.base.iface.UI;
import net.tccn.bbs.base.user.UserRecord;
import org.redkale.convert.ConvertColumn;
import java.io.Serializable;

View File

@ -1,12 +1,12 @@
package com.lxyer.bbs.content;
package net.tccn.bbs.content;
import com.jfinal.kit.Kv;
import com.lxyer.bbs.base.BaseService;
import com.lxyer.bbs.base.entity.ActLog;
import com.lxyer.bbs.base.iface.UIService;
import com.lxyer.bbs.base.kit.RetCodes;
import com.lxyer.bbs.base.user.UserInfo;
import com.lxyer.bbs.base.user.UserService;
import net.tccn.bbs.base.BaseService;
import net.tccn.bbs.base.entity.ActLog;
import net.tccn.bbs.base.iface.UIService;
import net.tccn.bbs.base.kit.RetCodes;
import net.tccn.bbs.base.user.UserInfo;
import net.tccn.bbs.base.user.UserService;
import org.redkale.net.http.*;
import org.redkale.service.RetResult;
import org.redkale.source.*;

View File

@ -1,9 +1,9 @@
package com.lxyer.bbs.servlet;
package net.tccn.bbs.servlet;
import com.jfinal.kit.Kv;
import com.lxyer.bbs.base.BaseServlet;
import com.lxyer.bbs.comment.CommentInfo;
import com.lxyer.bbs.content.ContentInfo;
import net.tccn.bbs.base.BaseServlet;
import net.tccn.bbs.comment.CommentInfo;
import net.tccn.bbs.content.ContentInfo;
import org.redkale.net.http.*;
import org.redkale.source.FilterNode;
import org.redkale.source.Flipper;

View File

@ -1,6 +1,6 @@
package com.lxyer.bbs.servlet;
package net.tccn.bbs.servlet;
import com.lxyer.bbs.base.BaseServlet;
import net.tccn.bbs.base.BaseServlet;
import org.redkale.net.http.*;
import java.io.File;

View File

@ -1,10 +1,10 @@
package com.lxyer.bbs.servlet;
package net.tccn.bbs.servlet;
import com.jfinal.kit.Kv;
import com.lxyer.bbs.base.BaseServlet;
import com.lxyer.bbs.base.user.UserInfo;
import com.lxyer.bbs.comment.CommentInfo;
import com.lxyer.bbs.content.ContentInfo;
import net.tccn.bbs.base.BaseServlet;
import net.tccn.bbs.base.user.UserInfo;
import net.tccn.bbs.comment.CommentInfo;
import net.tccn.bbs.content.ContentInfo;
import org.redkale.net.http.*;
import org.redkale.source.FilterNode;
import org.redkale.source.Flipper;

View File

@ -1,12 +1,12 @@
package com.lxyer.bbs.servlet;
package net.tccn.bbs.servlet;
import com.jfinal.kit.Kv;
import com.lxyer.bbs.base.BaseServlet;
import com.lxyer.bbs.base.user.UserBean;
import com.lxyer.bbs.base.user.UserInfo;
import com.lxyer.bbs.base.user.UserRecord;
import com.lxyer.bbs.comment.CommentInfo;
import com.lxyer.bbs.content.ContentInfo;
import net.tccn.bbs.base.BaseServlet;
import net.tccn.bbs.base.user.UserBean;
import net.tccn.bbs.base.user.UserInfo;
import net.tccn.bbs.base.user.UserRecord;
import net.tccn.bbs.comment.CommentInfo;
import net.tccn.bbs.content.ContentInfo;
import org.redkale.net.http.*;
import org.redkale.source.FilterExpress;
import org.redkale.source.FilterNode;

View File

@ -1,10 +1,10 @@
package com.lxyer.redim;
package net.tccn.redim;
import com.lxyer.base.JBean;
import com.lxyer.redim.entity.MsgRecord;
import com.lxyer.redim.info.MsgInfo;
import com.lxyer.redim.service.ImFriendService;
import com.lxyer.redim.service.ImMsgService;
import net.tccn.bbs.base.JBean;
import net.tccn.redim.entity.MsgRecord;
import net.tccn.redim.info.MsgInfo;
import net.tccn.redim.service.ImFriendService;
import net.tccn.redim.service.ImMsgService;
import org.redkale.net.http.*;
import javax.annotation.Resource;
@ -17,7 +17,6 @@ import java.util.concurrent.CompletableFuture;
*
* Created by liangxianyou at 2018/7/8 22:51.
*/
@SuppressWarnings("Duplicates")
@RestWebSocket(name = "chat", catalog = "ws", comment = "文字聊天", anyuser = true)
public class ChatWebSocket extends WebSocket {
@ -61,11 +60,11 @@ public class ChatWebSocket extends WebSocket {
int finalUserid = userid;
CompletableFuture.runAsync(()->{
JBean<List<MsgRecord>> list = chatService.offlineMsg(finalUserid);
List<MsgRecord> recordList = list.getResult();
List<net.tccn.redim.entity.MsgRecord> recordList = list.getResult();
if (recordList != null && recordList.size() > 0){
recordList.forEach(msgRecord->{
JBean<MsgInfo> msgInfo = chatService.createMsgInfo(msgRecord);
JBean<net.tccn.redim.info.MsgInfo> msgInfo = chatService.createMsgInfo(msgRecord);
send(msgInfo.getResult()).thenAccept(x->{
if ((Integer)x == 0){//发送成功
msgRecord.setStatus((short) 20);

View File

@ -1,6 +1,6 @@
package com.lxyer.redim;
package net.tccn.redim;
import com.lxyer.redim.impl.ImFriendServiceImpl;
import net.tccn.redim.impl.ImFriendServiceImpl;
import org.redkale.boot.Application;
import org.redkale.boot.ApplicationListener;

View File

@ -1,4 +1,4 @@
package com.lxyer.redim.entity;
package net.tccn.redim.entity;
import org.redkale.convert.json.JsonConvert;

View File

@ -1,12 +1,12 @@
package com.lxyer.redim.impl;
package net.tccn.redim.impl;
import com.jfinal.kit.Kv;
import com.lxyer.base.JBean;
import com.lxyer.bbs.base.BaseService;
import com.lxyer.bbs.base.user.UserInfo;
import com.lxyer.bbs.base.user.UserRecord;
import com.lxyer.bbs.base.user.UserService;
import com.lxyer.redim.service.ImFriendService;
import net.tccn.bbs.base.BaseService;
import net.tccn.bbs.base.JBean;
import net.tccn.bbs.base.user.UserInfo;
import net.tccn.bbs.base.user.UserRecord;
import net.tccn.bbs.base.user.UserService;
import net.tccn.redim.service.ImFriendService;
import org.redkale.boot.Application;
import org.redkale.net.TransportFactory;
import org.redkale.net.TransportGroupInfo;
@ -22,7 +22,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@ResourceType(ImFriendService.class)
@ResourceType(net.tccn.redim.service.ImFriendService.class)
@RestService(name = "imfriend",automapping = true, comment = "好友管理")
public class ImFriendServiceImpl extends BaseService implements ImFriendService {

View File

@ -1,11 +1,11 @@
package com.lxyer.redim.impl;
package net.tccn.redim.impl;
import com.lxyer.base.JBean;
import com.lxyer.bbs.base.BaseService;
import com.lxyer.bbs.base.user.UserRecord;
import com.lxyer.redim.entity.MsgRecord;
import com.lxyer.redim.info.MsgInfo;
import com.lxyer.redim.service.ImMsgService;
import net.tccn.bbs.base.BaseService;
import net.tccn.bbs.base.JBean;
import net.tccn.bbs.base.user.UserRecord;
import net.tccn.redim.entity.MsgRecord;
import net.tccn.redim.info.MsgInfo;
import net.tccn.redim.service.ImMsgService;
import org.redkale.net.http.RestService;
import org.redkale.source.FilterNode;
import org.redkale.util.ResourceType;
@ -15,7 +15,7 @@ import java.util.List;
/**
* @author: liangxianyou at 2018/8/12 13:10.
*/
@ResourceType(ImMsgService.class)
@ResourceType(net.tccn.redim.service.ImMsgService.class)
@RestService(name = "immsg",automapping = true, comment = "聊天记录管理")
public class ImMsgServiceImpl extends BaseService implements ImMsgService {

View File

@ -1,4 +1,4 @@
package com.lxyer.redim.info;
package net.tccn.redim.info;
/**
* @author: liangxianyou at 2018/8/12 15:04.

View File

@ -1,6 +1,6 @@
package com.lxyer.redim.service;
package net.tccn.redim.service;
import com.lxyer.base.JBean;
import net.tccn.bbs.base.JBean;
import org.redkale.service.Service;
public interface ImFriendService extends Service {

View File

@ -1,8 +1,8 @@
package com.lxyer.redim.service;
package net.tccn.redim.service;
import com.lxyer.base.JBean;
import com.lxyer.redim.entity.MsgRecord;
import com.lxyer.redim.info.MsgInfo;
import net.tccn.bbs.base.JBean;
import net.tccn.redim.entity.MsgRecord;
import net.tccn.redim.info.MsgInfo;
import org.redkale.service.Service;
import java.util.List;

View File

@ -1,7 +1,7 @@
package com.lxyer.redim.servlet;
package net.tccn.redim.servlet;
import com.lxyer.base.JBean;
import com.lxyer.redim.service.ImFriendService;
import net.tccn.bbs.base.JBean;
import net.tccn.redim.service.ImFriendService;
import org.redkale.net.http.*;
import javax.annotation.Resource;