diff --git a/.gitignore b/.gitignore index bb1a777..d30043e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,9 @@ Thumbs.db .project .settings/ +/lib/ +/libs/ +apidoc.* #========================== *.class diff --git a/conf/application.xml b/conf/application.xml index 71d5d94..d5d1ebb 100644 --- a/conf/application.xml +++ b/conf/application.xml @@ -4,7 +4,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/pom.xml b/pom.xml index 7a80363..128d49e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ org.redkale redkale - 1.9.9 + 2.0.0.alpha1 org.redkalex redkale-plugins - 1.9.9 + 2.0.0.alpha1 @@ -46,17 +46,18 @@ 3.6 + com.arangodb - arangodb-java-driver + arangodb-java-driver-async 5.0.4 - + diff --git a/root/project/index.html b/root/project/index.html index ff23590..b4cc0be 100644 --- a/root/project/index.html +++ b/root/project/index.html @@ -4,7 +4,7 @@ #set(keywords=bean.title) #set(description=bean.title) #set( - project=["redbbs","redtimer", "ExcelUtil","jfly"] + project=["redbbs","redtimer", "JKit","jfly"] ) #@layout() diff --git a/src/net/tccn/bbs/base/ArangoKit.java b/src/net/tccn/bbs/base/ArangoKit.java index 835b82f..bc30d22 100644 --- a/src/net/tccn/bbs/base/ArangoKit.java +++ b/src/net/tccn/bbs/base/ArangoKit.java @@ -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; diff --git a/src/net/tccn/bbs/base/ArangoService.java b/src/net/tccn/bbs/base/ArangoService.java index 0cf4d48..86a797c 100644 --- a/src/net/tccn/bbs/base/ArangoService.java +++ b/src/net/tccn/bbs/base/ArangoService.java @@ -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; diff --git a/src/net/tccn/bbs/base/BaseService.java b/src/net/tccn/bbs/base/BaseService.java index d57a591..a3be2ea 100644 --- a/src/net/tccn/bbs/base/BaseService.java +++ b/src/net/tccn/bbs/base/BaseService.java @@ -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 代码中配置此处即可 diff --git a/src/net/tccn/bbs/base/BaseServlet.java b/src/net/tccn/bbs/base/BaseServlet.java index ae75a8f..477fb26 100644 --- a/src/net/tccn/bbs/base/BaseServlet.java +++ b/src/net/tccn/bbs/base/BaseServlet.java @@ -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. diff --git a/src/net/tccn/bbs/base/EnjoyRender.java b/src/net/tccn/bbs/base/EnjoyRender.java index bda0486..41a0a65 100644 --- a/src/net/tccn/bbs/base/EnjoyRender.java +++ b/src/net/tccn/bbs/base/EnjoyRender.java @@ -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; diff --git a/src/net/tccn/bbs/base/FileService.java b/src/net/tccn/bbs/base/FileService.java index cd90b38..400817e 100644 --- a/src/net/tccn/bbs/base/FileService.java +++ b/src/net/tccn/bbs/base/FileService.java @@ -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; diff --git a/src/net/tccn/bbs/base/JBean.java b/src/net/tccn/bbs/base/JBean.java index 60df5ae..4f4b715 100644 --- a/src/net/tccn/bbs/base/JBean.java +++ b/src/net/tccn/bbs/base/JBean.java @@ -1,4 +1,4 @@ -package net.tccn.base; +package net.tccn.bbs.base; import java.util.HashMap; import java.util.Map; diff --git a/src/net/tccn/bbs/base/TaskQueue.java b/src/net/tccn/bbs/base/TaskQueue.java index 410573d..45a2fdf 100644 --- a/src/net/tccn/bbs/base/TaskQueue.java +++ b/src/net/tccn/bbs/base/TaskQueue.java @@ -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; diff --git a/src/net/tccn/bbs/base/UF.java b/src/net/tccn/bbs/base/UF.java index d1aaa08..a24f329 100644 --- a/src/net/tccn/bbs/base/UF.java +++ b/src/net/tccn/bbs/base/UF.java @@ -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) diff --git a/src/net/tccn/bbs/base/bean/ActLogBean.java b/src/net/tccn/bbs/base/bean/ActLogBean.java index 81182a0..c56d5ec 100644 --- a/src/net/tccn/bbs/base/bean/ActLogBean.java +++ b/src/net/tccn/bbs/base/bean/ActLogBean.java @@ -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; diff --git a/src/net/tccn/bbs/base/entity/ActLog.java b/src/net/tccn/bbs/base/entity/ActLog.java index 1f1c3b5..4dd3e87 100644 --- a/src/net/tccn/bbs/base/entity/ActLog.java +++ b/src/net/tccn/bbs/base/entity/ActLog.java @@ -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 diff --git a/src/net/tccn/bbs/base/entity/Count.java b/src/net/tccn/bbs/base/entity/Count.java index d48da79..d2f0dab 100644 --- a/src/net/tccn/bbs/base/entity/Count.java +++ b/src/net/tccn/bbs/base/entity/Count.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.entity; +package net.tccn.bbs.base.entity; /** * 用来计数用 diff --git a/src/net/tccn/bbs/base/entity/DynAttr.java b/src/net/tccn/bbs/base/entity/DynAttr.java index 616145d..7d96605 100644 --- a/src/net/tccn/bbs/base/entity/DynAttr.java +++ b/src/net/tccn/bbs/base/entity/DynAttr.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.entity; +package net.tccn.bbs.base.entity; import org.redkale.convert.json.JsonConvert; diff --git a/src/net/tccn/bbs/base/entity/VisLog.java b/src/net/tccn/bbs/base/entity/VisLog.java index f35ebaf..7502d18 100644 --- a/src/net/tccn/bbs/base/entity/VisLog.java +++ b/src/net/tccn/bbs/base/entity/VisLog.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.entity; +package net.tccn.bbs.base.entity; import org.redkale.convert.json.JsonConvert; diff --git a/src/net/tccn/bbs/base/iface/C.java b/src/net/tccn/bbs/base/iface/C.java index cfca4f0..c70fcca 100644 --- a/src/net/tccn/bbs/base/iface/C.java +++ b/src/net/tccn/bbs/base/iface/C.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.iface; +package net.tccn.bbs.base.iface; /** * 创建信息 diff --git a/src/net/tccn/bbs/base/iface/CI.java b/src/net/tccn/bbs/base/iface/CI.java index 6f95339..a3acf03 100644 --- a/src/net/tccn/bbs/base/iface/CI.java +++ b/src/net/tccn/bbs/base/iface/CI.java @@ -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. diff --git a/src/net/tccn/bbs/base/iface/CService.java b/src/net/tccn/bbs/base/iface/CService.java index 6ad62ed..5c5b8d3 100644 --- a/src/net/tccn/bbs/base/iface/CService.java +++ b/src/net/tccn/bbs/base/iface/CService.java @@ -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; diff --git a/src/net/tccn/bbs/base/iface/UI.java b/src/net/tccn/bbs/base/iface/UI.java index a3a6d78..6aba1f3 100644 --- a/src/net/tccn/bbs/base/iface/UI.java +++ b/src/net/tccn/bbs/base/iface/UI.java @@ -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. diff --git a/src/net/tccn/bbs/base/iface/UIService.java b/src/net/tccn/bbs/base/iface/UIService.java index 74467c7..705010b 100644 --- a/src/net/tccn/bbs/base/iface/UIService.java +++ b/src/net/tccn/bbs/base/iface/UIService.java @@ -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; diff --git a/src/net/tccn/bbs/base/kit/EJ.java b/src/net/tccn/bbs/base/kit/EJ.java index 55884f7..7993e89 100644 --- a/src/net/tccn/bbs/base/kit/EJ.java +++ b/src/net/tccn/bbs/base/kit/EJ.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.kit; +package net.tccn.bbs.base.kit; import org.redkale.net.http.RestService; diff --git a/src/net/tccn/bbs/base/kit/LxyKit.java b/src/net/tccn/bbs/base/kit/LxyKit.java index a1d945f..31f9ee8 100644 --- a/src/net/tccn/bbs/base/kit/LxyKit.java +++ b/src/net/tccn/bbs/base/kit/LxyKit.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.kit; +package net.tccn.bbs.base.kit; import java.text.SimpleDateFormat; import java.util.List; diff --git a/src/net/tccn/bbs/base/kit/RetCodes.java b/src/net/tccn/bbs/base/kit/RetCodes.java index 8ba8ae6..ea4f12d 100644 --- a/src/net/tccn/bbs/base/kit/RetCodes.java +++ b/src/net/tccn/bbs/base/kit/RetCodes.java @@ -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; diff --git a/src/net/tccn/bbs/base/user/LoginBean.java b/src/net/tccn/bbs/base/user/LoginBean.java index bcbdecc..315a008 100644 --- a/src/net/tccn/bbs/base/user/LoginBean.java +++ b/src/net/tccn/bbs/base/user/LoginBean.java @@ -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; diff --git a/src/net/tccn/bbs/base/user/UserBean.java b/src/net/tccn/bbs/base/user/UserBean.java index 7f33a58..f99f64e 100644 --- a/src/net/tccn/bbs/base/user/UserBean.java +++ b/src/net/tccn/bbs/base/user/UserBean.java @@ -1,4 +1,4 @@ -package com.lxyer.bbs.base.user; +package net.tccn.bbs.base.user; import org.redkale.source.FilterBean; diff --git a/src/net/tccn/bbs/base/user/UserInfo.java b/src/net/tccn/bbs/base/user/UserInfo.java index 0781375..36121f7 100644 --- a/src/net/tccn/bbs/base/user/UserInfo.java +++ b/src/net/tccn/bbs/base/user/UserInfo.java @@ -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; diff --git a/src/net/tccn/bbs/base/user/UserRecord.java b/src/net/tccn/bbs/base/user/UserRecord.java index ae68bff..9f72559 100644 --- a/src/net/tccn/bbs/base/user/UserRecord.java +++ b/src/net/tccn/bbs/base/user/UserRecord.java @@ -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; diff --git a/src/net/tccn/bbs/base/user/UserService.java b/src/net/tccn/bbs/base/user/UserService.java index 7748892..55aa1d4 100644 --- a/src/net/tccn/bbs/base/user/UserService.java +++ b/src/net/tccn/bbs/base/user/UserService.java @@ -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. diff --git a/src/net/tccn/bbs/comment/Comment.java b/src/net/tccn/bbs/comment/Comment.java index 2c850ce..06a123c 100644 --- a/src/net/tccn/bbs/comment/Comment.java +++ b/src/net/tccn/bbs/comment/Comment.java @@ -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; diff --git a/src/net/tccn/bbs/comment/CommentInfo.java b/src/net/tccn/bbs/comment/CommentInfo.java index cee3313..2d0e6ac 100644 --- a/src/net/tccn/bbs/comment/CommentInfo.java +++ b/src/net/tccn/bbs/comment/CommentInfo.java @@ -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; diff --git a/src/net/tccn/bbs/comment/CommentService.java b/src/net/tccn/bbs/comment/CommentService.java index 34f06f6..89592a2 100644 --- a/src/net/tccn/bbs/comment/CommentService.java +++ b/src/net/tccn/bbs/comment/CommentService.java @@ -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. diff --git a/src/net/tccn/bbs/content/Content.java b/src/net/tccn/bbs/content/Content.java index 1fe52b1..8718380 100644 --- a/src/net/tccn/bbs/content/Content.java +++ b/src/net/tccn/bbs/content/Content.java @@ -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.*; diff --git a/src/net/tccn/bbs/content/ContentBean.java b/src/net/tccn/bbs/content/ContentBean.java index 1adbc76..71e67da 100644 --- a/src/net/tccn/bbs/content/ContentBean.java +++ b/src/net/tccn/bbs/content/ContentBean.java @@ -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; diff --git a/src/net/tccn/bbs/content/ContentInfo.java b/src/net/tccn/bbs/content/ContentInfo.java index 83e5987..34950e3 100644 --- a/src/net/tccn/bbs/content/ContentInfo.java +++ b/src/net/tccn/bbs/content/ContentInfo.java @@ -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; diff --git a/src/net/tccn/bbs/content/ContentService.java b/src/net/tccn/bbs/content/ContentService.java index 84bded1..3a8e099 100644 --- a/src/net/tccn/bbs/content/ContentService.java +++ b/src/net/tccn/bbs/content/ContentService.java @@ -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.*; diff --git a/src/net/tccn/bbs/servlet/ContentServlet.java b/src/net/tccn/bbs/servlet/ContentServlet.java index 5b0a50a..8a971a5 100644 --- a/src/net/tccn/bbs/servlet/ContentServlet.java +++ b/src/net/tccn/bbs/servlet/ContentServlet.java @@ -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; diff --git a/src/net/tccn/bbs/servlet/FileServlet.java b/src/net/tccn/bbs/servlet/FileServlet.java index 5def827..957c567 100644 --- a/src/net/tccn/bbs/servlet/FileServlet.java +++ b/src/net/tccn/bbs/servlet/FileServlet.java @@ -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; diff --git a/src/net/tccn/bbs/servlet/IndexServlet.java b/src/net/tccn/bbs/servlet/IndexServlet.java index a7d5a6f..8a7c9e2 100644 --- a/src/net/tccn/bbs/servlet/IndexServlet.java +++ b/src/net/tccn/bbs/servlet/IndexServlet.java @@ -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; diff --git a/src/net/tccn/bbs/servlet/UserServlet.java b/src/net/tccn/bbs/servlet/UserServlet.java index d64b493..ebdf595 100644 --- a/src/net/tccn/bbs/servlet/UserServlet.java +++ b/src/net/tccn/bbs/servlet/UserServlet.java @@ -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; diff --git a/src/net/tccn/redim/ChatWebSocket.java b/src/net/tccn/redim/ChatWebSocket.java index 48ab824..5a3e42a 100644 --- a/src/net/tccn/redim/ChatWebSocket.java +++ b/src/net/tccn/redim/ChatWebSocket.java @@ -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 = chatService.offlineMsg(finalUserid); - List recordList = list.getResult(); + List recordList = list.getResult(); if (recordList != null && recordList.size() > 0){ recordList.forEach(msgRecord->{ - JBean msgInfo = chatService.createMsgInfo(msgRecord); + JBean msgInfo = chatService.createMsgInfo(msgRecord); send(msgInfo.getResult()).thenAccept(x->{ if ((Integer)x == 0){//发送成功 msgRecord.setStatus((short) 20); diff --git a/src/net/tccn/redim/RedbbsListener.java b/src/net/tccn/redim/RedbbsListener.java index 9081d54..574ecb2 100644 --- a/src/net/tccn/redim/RedbbsListener.java +++ b/src/net/tccn/redim/RedbbsListener.java @@ -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; diff --git a/src/net/tccn/redim/entity/MsgRecord.java b/src/net/tccn/redim/entity/MsgRecord.java index 3b32bbe..ee5a8cd 100644 --- a/src/net/tccn/redim/entity/MsgRecord.java +++ b/src/net/tccn/redim/entity/MsgRecord.java @@ -1,4 +1,4 @@ -package com.lxyer.redim.entity; +package net.tccn.redim.entity; import org.redkale.convert.json.JsonConvert; diff --git a/src/net/tccn/redim/impl/ImFriendServiceImpl.java b/src/net/tccn/redim/impl/ImFriendServiceImpl.java index 50dca63..06d58fc 100644 --- a/src/net/tccn/redim/impl/ImFriendServiceImpl.java +++ b/src/net/tccn/redim/impl/ImFriendServiceImpl.java @@ -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 { diff --git a/src/net/tccn/redim/impl/ImMsgServiceImpl.java b/src/net/tccn/redim/impl/ImMsgServiceImpl.java index f9a17c1..7dd3f7d 100644 --- a/src/net/tccn/redim/impl/ImMsgServiceImpl.java +++ b/src/net/tccn/redim/impl/ImMsgServiceImpl.java @@ -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 { diff --git a/src/net/tccn/redim/info/MsgInfo.java b/src/net/tccn/redim/info/MsgInfo.java index 80c0c04..0a5e0ab 100644 --- a/src/net/tccn/redim/info/MsgInfo.java +++ b/src/net/tccn/redim/info/MsgInfo.java @@ -1,4 +1,4 @@ -package com.lxyer.redim.info; +package net.tccn.redim.info; /** * @author: liangxianyou at 2018/8/12 15:04. diff --git a/src/net/tccn/redim/service/ImFriendService.java b/src/net/tccn/redim/service/ImFriendService.java index facde36..ae0bdaa 100644 --- a/src/net/tccn/redim/service/ImFriendService.java +++ b/src/net/tccn/redim/service/ImFriendService.java @@ -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 { diff --git a/src/net/tccn/redim/service/ImMsgService.java b/src/net/tccn/redim/service/ImMsgService.java index 76deac7..25ece4e 100644 --- a/src/net/tccn/redim/service/ImMsgService.java +++ b/src/net/tccn/redim/service/ImMsgService.java @@ -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; diff --git a/src/net/tccn/redim/servlet/ImServlet.java b/src/net/tccn/redim/servlet/ImServlet.java index c574cbf..78c9c82 100644 --- a/src/net/tccn/redim/servlet/ImServlet.java +++ b/src/net/tccn/redim/servlet/ImServlet.java @@ -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;