Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
街头小贩
Jforum2
提交
0bb6b265
J
Jforum2
项目概览
街头小贩
/
Jforum2
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
1
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
Jforum2
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
0bb6b265
编写于
9月 26, 2020
作者:
街头小贩
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
删除注释掉的代码
上级
51319bca
变更
26
隐藏空白更改
内联
并排
Showing
26 changed file
with
24 addition
and
124 deletion
+24
-124
core/src/main/java/com/apobates/forum/core/entity/Album.java
core/src/main/java/com/apobates/forum/core/entity/Album.java
+1
-11
core/src/main/java/com/apobates/forum/core/entity/Board.java
core/src/main/java/com/apobates/forum/core/entity/Board.java
+1
-10
core/src/main/java/com/apobates/forum/core/entity/BoardCarouselIndex.java
...va/com/apobates/forum/core/entity/BoardCarouselIndex.java
+0
-4
core/src/main/java/com/apobates/forum/core/entity/BoardConfig.java
...main/java/com/apobates/forum/core/entity/BoardConfig.java
+0
-2
core/src/main/java/com/apobates/forum/core/entity/BoardGroup.java
.../main/java/com/apobates/forum/core/entity/BoardGroup.java
+0
-3
core/src/main/java/com/apobates/forum/core/entity/BoardModeratorRoleHistory.java
...apobates/forum/core/entity/BoardModeratorRoleHistory.java
+1
-0
core/src/main/java/com/apobates/forum/core/entity/BoardStats.java
.../main/java/com/apobates/forum/core/entity/BoardStats.java
+1
-0
core/src/main/java/com/apobates/forum/core/entity/Posts.java
core/src/main/java/com/apobates/forum/core/entity/Posts.java
+1
-22
core/src/main/java/com/apobates/forum/core/entity/Topic.java
core/src/main/java/com/apobates/forum/core/entity/Topic.java
+0
-15
core/src/main/java/com/apobates/forum/core/entity/TopicCarousel.java
...in/java/com/apobates/forum/core/entity/TopicCarousel.java
+0
-3
core/src/main/java/com/apobates/forum/core/entity/TopicConfig.java
...main/java/com/apobates/forum/core/entity/TopicConfig.java
+1
-0
core/src/main/java/com/apobates/forum/core/entity/TopicStats.java
.../main/java/com/apobates/forum/core/entity/TopicStats.java
+1
-0
core/src/main/java/com/apobates/forum/core/entity/TopicTag.java
...rc/main/java/com/apobates/forum/core/entity/TopicTag.java
+1
-1
core/src/main/java/com/apobates/forum/core/entity/proxy/BoardCarouselIndexReplica.java
...es/forum/core/entity/proxy/BoardCarouselIndexReplica.java
+0
-2
core/src/main/java/com/apobates/forum/core/entity/proxy/BoardReplica.java
...va/com/apobates/forum/core/entity/proxy/BoardReplica.java
+0
-12
core/src/main/java/com/apobates/forum/core/entity/proxy/TopicReplica.java
...va/com/apobates/forum/core/entity/proxy/TopicReplica.java
+4
-32
letterbox/src/main/java/com/apobates/forum/letterbox/entity/ForumLetter.java
...java/com/apobates/forum/letterbox/entity/ForumLetter.java
+0
-5
letterbox/src/main/java/com/apobates/forum/letterbox/entity/Inbox.java
.../main/java/com/apobates/forum/letterbox/entity/Inbox.java
+1
-0
letterbox/src/main/java/com/apobates/forum/letterbox/entity/Outbox.java
...main/java/com/apobates/forum/letterbox/entity/Outbox.java
+1
-0
letterbox/src/main/java/com/apobates/forum/letterbox/entity/proxy/ForumLetterReplica.java
...ates/forum/letterbox/entity/proxy/ForumLetterReplica.java
+4
-0
member/src/main/java/com/apobates/forum/member/entity/ForumScoreRole.java
...java/com/apobates/forum/member/entity/ForumScoreRole.java
+1
-0
member/src/main/java/com/apobates/forum/member/entity/Member.java
...rc/main/java/com/apobates/forum/member/entity/Member.java
+1
-2
member/src/main/java/com/apobates/forum/member/entity/MemberNamesProtect.java
.../com/apobates/forum/member/entity/MemberNamesProtect.java
+1
-0
member/src/main/java/com/apobates/forum/member/entity/MemberOnline.java
...n/java/com/apobates/forum/member/entity/MemberOnline.java
+1
-0
member/src/main/java/com/apobates/forum/member/entity/MemberPenalizeRecords.java
...m/apobates/forum/member/entity/MemberPenalizeRecords.java
+1
-0
member/src/main/java/com/apobates/forum/member/entity/MemberVipExchangeRecords.java
...pobates/forum/member/entity/MemberVipExchangeRecords.java
+1
-0
未找到文件。
core/src/main/java/com/apobates/forum/core/entity/Album.java
浏览文件 @
0bb6b265
...
...
@@ -48,9 +48,7 @@ public class Album implements Serializable {
private
boolean
status
;
@OneToMany
(
mappedBy
=
"album"
,
cascade
=
{
CascadeType
.
PERSIST
,
CascadeType
.
MERGE
,
CascadeType
.
REMOVE
})
private
List
<
AlbumPicture
>
pictures
=
new
ArrayList
<>();
//所属的版块
//@Transient
//private Board board;
//empty constructor for JPA instantiation
public
Album
()
{
super
();}
public
Album
(
String
title
,
int
volumesId
,
long
boardId
,
long
topicId
,
long
memberId
,
String
memberNickname
,
List
<
AlbumPicture
>
pictures
)
{
...
...
@@ -200,12 +198,4 @@ public class Album implements Serializable {
}
return
Optional
.
of
(
album
);
}
/*
@Transient
public Topic getTopic() {
Topic topic = Topic.empty(getVolumesId(), getBoardId());
topic.setTitle(getTitle());
topic.setId(getTopicId());
return topic;
}*/
}
\ No newline at end of file
core/src/main/java/com/apobates/forum/core/entity/Board.java
浏览文件 @
0bb6b265
...
...
@@ -50,16 +50,7 @@ public class Board implements Serializable, Comparable<Board> {
private
boolean
origin
;
// 配合原生一起使用的目录名
private
String
directoryNames
;
//版主容器
//@Transient
//private List<BoardModerator> moderatores;//策略模式需要
//@Transient
//private BoardConfig configure; //策略模式需要
//@Transient
//private BoardStats stats;
//@Transient
//private BoardGroup volumes;
//empty constructor for JPA instantiation
public
Board
()
{
super
();
...
...
core/src/main/java/com/apobates/forum/core/entity/BoardCarouselIndex.java
浏览文件 @
0bb6b265
...
...
@@ -29,10 +29,6 @@ public class BoardCarouselIndex implements Serializable {
private
LocalDateTime
entryDateTime
;
//到期的日期
private
LocalDateTime
expireDateTime
;
//@Transient
//private Board board;
//@Transient
//private BoardGroup volumes;
public
int
getCarouselId
()
{
return
carouselId
;
...
...
core/src/main/java/com/apobates/forum/core/entity/BoardConfig.java
浏览文件 @
0bb6b265
...
...
@@ -66,8 +66,6 @@ public class BoardConfig implements Serializable {
// ip地址过滤,true(1)过滤,false(0)不过滤
@Column
(
columnDefinition
=
"tinyint(1) default 0"
)
private
boolean
ipFilter
;
// 启用AdditionalStrategy扩展策略,false全部AdditionalStrategy扩展策略不可用
//private boolean supply;
// empty constructor for JPA instantiation
public
BoardConfig
()
{
...
...
core/src/main/java/com/apobates/forum/core/entity/BoardGroup.java
浏览文件 @
0bb6b265
...
...
@@ -44,9 +44,6 @@ public class BoardGroup implements Serializable, Comparable<BoardGroup> {
private
boolean
origin
;
// 配合原生一起使用的目录名
private
String
directoryNames
;
//组下的版块
//@Transient
//private TreeSet<Board> boardes = new TreeSet<>();
// empty constructor for JPA instantiation
public
BoardGroup
()
{
...
...
core/src/main/java/com/apobates/forum/core/entity/BoardModeratorRoleHistory.java
浏览文件 @
0bb6b265
...
...
@@ -47,6 +47,7 @@ public class BoardModeratorRoleHistory implements Serializable {
// 状态,false(0)禁用,true(1)可用
@Column
(
columnDefinition
=
"tinyint(1) default 0"
)
private
boolean
status
;
//empty constructor for JPA instantiation
public
BoardModeratorRoleHistory
()
{
}
...
...
core/src/main/java/com/apobates/forum/core/entity/BoardStats.java
浏览文件 @
0bb6b265
...
...
@@ -44,6 +44,7 @@ public class BoardStats implements Serializable {
//今天的话题数|数据库中不存在
@Transient
private
long
todayTopices
=
0L
;
//empty constructor for JPA instantiation
public
BoardStats
()
{
super
();
...
...
core/src/main/java/com/apobates/forum/core/entity/Posts.java
浏览文件 @
0bb6b265
...
...
@@ -53,16 +53,7 @@ public class Posts implements Serializable {
private
LocalDateTime
modifyDateTime
;
private
long
modifyMemberId
;
private
String
modifyMemberNickname
;
//@Transient
//private Topic topic;
//@Transient
//private Board board; //策略需要+版主+配置文件
//@Transient
//private BoardGroup volumes;
//@Transient
//private Member member;
//@Transient
//private PostsDescriptor descriptor;
//empty constructor for JPA instantiation
public
Posts
()
{
super
();}
//话题的第一条回复
...
...
@@ -260,16 +251,4 @@ public class Posts implements Serializable {
p
.
setContent
(
content
);
return
p
;
}
/*
@Transient
public Topic getLazyTopic() {
if (getTopic() != null) {
return getTopic();
}
Topic t = new Topic();
t.setId(getTopicId());
t.setBoardId(getBoardId());
t.setVolumesId(getVolumesId());
return t;
}*/
}
\ No newline at end of file
core/src/main/java/com/apobates/forum/core/entity/Topic.java
浏览文件 @
0bb6b265
...
...
@@ -77,21 +77,6 @@ public class Topic implements Serializable, Comparable<Topic> {
//是否匿名,true是,false不是
@Column
(
columnDefinition
=
"tinyint(1) default 0"
)
private
boolean
anony
;
//@Transient
//private Set<TopicTag> tages = new HashSet<>();
//@Transient
//private TopicConfig configure; //策略模式需要(board+版主+配置文件)
//@Transient
//private TopicStats stats;
//@Transient
//private Posts content;
//所属的版块
//@Transient
//private Board board;
//@Transient
//private BoardGroup volumes;
//@Transient
//private Album album;
//empty constructor for JPA instantiation
public
Topic
()
{
...
...
core/src/main/java/com/apobates/forum/core/entity/TopicCarousel.java
浏览文件 @
0bb6b265
...
...
@@ -29,9 +29,6 @@ public class TopicCarousel implements Serializable{
private
String
summary
;
//true可用,false禁用
private
boolean
status
;
//幻灯片集合
//@Transient
//private Set<TopicCarouselSlide> slides = new TreeSet<>();
//empty constructor for JPA instantiation
public
TopicCarousel
()
{
...
...
core/src/main/java/com/apobates/forum/core/entity/TopicConfig.java
浏览文件 @
0bb6b265
...
...
@@ -74,6 +74,7 @@ public class TopicConfig implements Serializable {
//b.3回复的时间上限|超过N天不允许再回复了[不是话题的作者能决定]
// 同一会员不间断的回贴的数量
private
int
writeMinInterrupt
=
3
;
// empty constructor for JPA instantiation
public
TopicConfig
()
{
super
();
...
...
core/src/main/java/com/apobates/forum/core/entity/TopicStats.java
浏览文件 @
0bb6b265
...
...
@@ -41,6 +41,7 @@ public class TopicStats implements Serializable {
private
LocalDateTime
updateDate
;
//最近回复的回复ID
private
long
recentPostsId
;
//empty constructor for JPA instantiation
public
TopicStats
()
{
super
();
...
...
core/src/main/java/com/apobates/forum/core/entity/TopicTag.java
浏览文件 @
0bb6b265
...
...
@@ -31,11 +31,11 @@ public class TopicTag implements Serializable {
//是否删除(1=true可用, 0=false删除)
@Column
(
columnDefinition
=
"tinyint(1) default 0"
)
private
boolean
status
;
//empty constructor for JPA instantiation
public
TopicTag
()
{
super
();
}
public
TopicTag
(
String
names
,
int
rates
,
long
topicId
)
{
super
();
this
.
names
=
names
;
...
...
core/src/main/java/com/apobates/forum/core/entity/proxy/BoardCarouselIndexReplica.java
浏览文件 @
0bb6b265
...
...
@@ -12,9 +12,7 @@ import java.util.function.Function;
* @since 20200614
*/
public
final
class
BoardCarouselIndexReplica
extends
BoardCarouselIndex
implements
ForumReplicable
<
BoardCarouselIndex
,
BoardCarouselIndexReplica
>{
//@Transient
private
Board
board
;
//@Transient
private
BoardGroup
volumes
;
public
static
Function
<
BoardCarouselIndex
,
BoardCarouselIndexReplica
>
copyCarouselIndex
=
(
BoardCarouselIndex
bci
)
->
{
return
ForumReplicable
.
replica
(
bci
,
BoardCarouselIndexReplica
.
class
).
orElseGet
(
BoardCarouselIndexReplica:
:
new
);
...
...
core/src/main/java/com/apobates/forum/core/entity/proxy/BoardReplica.java
浏览文件 @
0bb6b265
...
...
@@ -137,16 +137,4 @@ public final class BoardReplica extends Board implements ActiveDirectoryConnecto
return
br
.
getConnect
();
}
/*
public void setVolumes(Optional<BoardGroup> boardGroup){
this.volumes = boardGroup;
}*/
/*
public void setStats(Optional<BoardStats> stats){
this.stats = stats;
}*/
/*
public void setConfigure(Optional<BoardConfig> config){
this.configure = config;
}*/
}
\ No newline at end of file
core/src/main/java/com/apobates/forum/core/entity/proxy/TopicReplica.java
浏览文件 @
0bb6b265
...
...
@@ -229,7 +229,10 @@ public final class TopicReplica extends Topic implements ActiveDirectoryConnecto
private
String
getAnonyMemberName
(){
return
String
.
format
(
"Anony#%d"
,
Commons
.
ipHashcode
(
super
.
getIpAddr
()));
}
//输出事件需要的Topic实例
/**
* 输出事件需要的Topic实例
* @return
*/
public
Topic
toEventPayload
(){
Topic
et
=
new
Topic
();
et
.
setId
(
this
.
getId
());
...
...
@@ -241,35 +244,4 @@ public final class TopicReplica extends Topic implements ActiveDirectoryConnecto
et
.
setEntryDateTime
(
this
.
getEntryDateTime
());
return
et
;
}
/*
public static TopicReplica copy(Topic topic){
Objects.requireNonNull(topic);
try{
TopicReplica destIns = new TopicReplica();
Commons.copyProperties(destIns, topic);
return destIns;
}catch(IllegalAccessException | InvocationTargetException e){
if(logger.isDebugEnabled()){
logger.debug("实例副本构造过程出现异常", e);
}
}
return null;
//return new TopicReplica().replica(topic);
}*/
/*
public void setContent(Optional<Posts> posts){
this.content = posts;
}*/
/*
public void setAuthor(Optional<Member> author) {
this.author = author;
}*/
/*
public void setStats(Optional<TopicStats> stats){
this.stats = stats;
}*/
/*
public void setConfigure(Optional<TopicConfig> config){
this.configure = config;
}*/
}
\ No newline at end of file
letterbox/src/main/java/com/apobates/forum/letterbox/entity/ForumLetter.java
浏览文件 @
0bb6b265
...
...
@@ -46,11 +46,6 @@ public class ForumLetter implements Serializable {
//是否需要回应(只有私信需要其它类型都不需要)
@Column
(
columnDefinition
=
"tinyint(1) default 0"
)
private
boolean
responsive
;
//@Transient
//private Set<ForumLetterReceiver> receivers = new HashSet<>();
//Inbox的状态{readable|reply|usable}
//@Transient
//private ForumLetterStatus status;
//empty constructor for JPA instantiation
public
ForumLetter
()
{
...
...
letterbox/src/main/java/com/apobates/forum/letterbox/entity/Inbox.java
浏览文件 @
0bb6b265
...
...
@@ -37,6 +37,7 @@ public class Inbox implements Serializable {
private
boolean
usable
;
//信件ID
private
long
letter
;
//empty constructor for JPA instantiation
public
Inbox
()
{
}
...
...
letterbox/src/main/java/com/apobates/forum/letterbox/entity/Outbox.java
浏览文件 @
0bb6b265
...
...
@@ -32,6 +32,7 @@ public class Outbox implements Serializable {
private
boolean
status
;
//信件ID
private
long
letter
;
//empty constructor for JPA instantiation
public
Outbox
()
{
}
...
...
letterbox/src/main/java/com/apobates/forum/letterbox/entity/proxy/ForumLetterReplica.java
浏览文件 @
0bb6b265
...
...
@@ -51,6 +51,10 @@ public final class ForumLetterReplica extends ForumLetter implements ForumReplic
return
getReceivers
().
stream
().
map
(
ForumLetterReceiver:
:
getMemberNickname
).
collect
(
Collectors
.
joining
(
","
));
}
/**
* 输出事件需要的ForumLetter实例
* @return
*/
public
ForumLetter
toEventPayload
(){
ForumLetter
fl
=
new
ForumLetter
();
fl
.
setId
(
this
.
getId
());
...
...
member/src/main/java/com/apobates/forum/member/entity/ForumScoreRole.java
浏览文件 @
0bb6b265
...
...
@@ -40,6 +40,7 @@ public class ForumScoreRole implements Serializable {
//是否可用,false(0)禁用,true(1)可用
@Column
(
columnDefinition
=
"tinyint(1) default 0"
)
private
boolean
status
;
//empty constructor for JPA instantiation
public
ForumScoreRole
()
{
}
...
...
member/src/main/java/com/apobates/forum/member/entity/Member.java
浏览文件 @
0bb6b265
...
...
@@ -70,8 +70,7 @@ public class Member implements Serializable {
private
String
tdparty
;
public
final
static
String
GUEST_AVATAR
=
"avtar://local/empty.png"
;
public
final
static
String
GUEST_NAMES
=
"Guest"
;
//@Transient
//private MemberProfileBean profile; //策略需要的
//empty constructor for JPA instantiation
public
Member
()
{
}
...
...
member/src/main/java/com/apobates/forum/member/entity/MemberNamesProtect.java
浏览文件 @
0bb6b265
...
...
@@ -30,6 +30,7 @@ public class MemberNamesProtect implements Serializable {
//是否可用,false(0)禁用,true(1)可用
@Column
(
columnDefinition
=
"tinyint(1) default 0"
)
private
boolean
status
;
//empty constructor for JPA instantiation
public
MemberNamesProtect
()
{
}
...
...
member/src/main/java/com/apobates/forum/member/entity/MemberOnline.java
浏览文件 @
0bb6b265
...
...
@@ -46,6 +46,7 @@ public class MemberOnline implements Serializable {
* 最近活跃日期
*/
private
LocalDateTime
activeDateTime
;
//empty constructor for JPA instantiation
public
MemberOnline
()
{
}
...
...
member/src/main/java/com/apobates/forum/member/entity/MemberPenalizeRecords.java
浏览文件 @
0bb6b265
...
...
@@ -65,6 +65,7 @@ public class MemberPenalizeRecords implements Serializable{
// 是否有效,true(1)有效,false(0)无效
@Column
(
columnDefinition
=
"tinyint(1) default 0"
)
private
boolean
status
;
//empty constructor for JPA instantiation
public
MemberPenalizeRecords
()
{
}
...
...
member/src/main/java/com/apobates/forum/member/entity/MemberVipExchangeRecords.java
浏览文件 @
0bb6b265
...
...
@@ -46,6 +46,7 @@ public class MemberVipExchangeRecords implements Serializable{
private
boolean
status
;
// 交易流水号
private
String
serial
;
//empty constructor for JPA instantiation
public
MemberVipExchangeRecords
()
{
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录