Skip to content

Commit c659c6a

Browse files
committed
v10.0.3
1 parent b6ff8da commit c659c6a

File tree

264 files changed

+2064
-840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+2064
-840
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
# UJCMS 发版说明
22

3+
## ujcms-10.0.3
4+
5+
* 修复:自动化置灰时,会清空站点自定义数据的问题
6+
* 修复:修正过时方法
7+
* 修复:代码生成器不会自动修改 BaseResultMap、Column_List、update 等问题
8+
* 修复:全文检索翻页超过最大页数报错问题
9+
* 改进:自动生成的 domain 的包名由 base 改为 generated,类名由 *Base 改为 Generated*
10+
311
## ujcms-10.0.2
412

5-
* 修复后台数据翻页 totalElements 数据不存在问题
13+
* 修复:后台数据翻页 totalElements 数据不存在问题
614

715
## ujcms-10.0.1
816

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.ujcms</groupId>
88
<artifactId>ujcms</artifactId>
9-
<version>10.0.2</version>
9+
<version>10.0.3</version>
1010
<packaging>${project.packaging}</packaging>
1111

1212
<name>UJCMS</name>

src/main/java/com/ujcms/cms/core/domain/Action.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@
22

33
import org.springframework.lang.Nullable;
44

5-
import com.ujcms.cms.core.domain.base.ActionBase;
5+
import com.ujcms.cms.core.domain.generated.GeneratedAction;
6+
7+
import java.io.Serial;
68

79
/**
810
* 动作 实体类
911
*
1012
* @author PONY
1113
*/
12-
public class Action extends ActionBase {
14+
public class Action extends GeneratedAction {
15+
@Serial
16+
private static final long serialVersionUID = 1;
1317

1418
public Action() {
1519
}

src/main/java/com/ujcms/cms/core/domain/Article.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static com.ujcms.cms.core.support.Constants.MAPPER;
44
import static com.ujcms.commons.web.Strings.formatDuration;
55

6+
import java.io.Serial;
67
import java.time.OffsetDateTime;
78
import java.util.ArrayList;
89
import java.util.Collections;
@@ -27,7 +28,7 @@
2728
import com.fasterxml.jackson.annotation.JsonView;
2829
import com.fasterxml.jackson.core.JsonProcessingException;
2930
import com.fasterxml.jackson.core.type.TypeReference;
30-
import com.ujcms.cms.core.domain.base.ArticleBase;
31+
import com.ujcms.cms.core.domain.generated.GeneratedArticle;
3132
import com.ujcms.cms.core.support.Anchor;
3233
import com.ujcms.cms.core.support.Contexts;
3334
import com.ujcms.cms.core.support.UrlConstants;
@@ -49,7 +50,8 @@
4950
*/
5051
@JsonInclude(JsonInclude.Include.NON_NULL)
5152
@JsonIgnoreProperties("handler")
52-
public class Article extends ArticleBase implements PageUrlResolver, Anchor, OrderEntity {
53+
public class Article extends GeneratedArticle implements PageUrlResolver, Anchor, OrderEntity {
54+
@Serial
5355
private static final long serialVersionUID = 1L;
5456

5557
// region Normal

src/main/java/com/ujcms/cms/core/domain/ArticleBuffer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io.swagger.v3.oas.annotations.media.Schema;
66

77
import jakarta.validation.constraints.NotNull;
8+
import java.io.Serial;
89
import java.io.Serializable;
910

1011
/**
@@ -16,6 +17,7 @@
1617
@JsonInclude(JsonInclude.Include.NON_NULL)
1718
@JsonIgnoreProperties("handler")
1819
public class ArticleBuffer implements Serializable {
20+
@Serial
1921
private static final long serialVersionUID = 1L;
2022

2123
public static ArticleBuffer of(Article article) {

src/main/java/com/ujcms/cms/core/domain/ArticleExt.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.annotation.JsonInclude;
5-
import com.ujcms.cms.core.domain.base.ArticleExtBase;
5+
import com.ujcms.cms.core.domain.generated.GeneratedArticleExt;
66

77
import io.swagger.v3.oas.annotations.media.Schema;
88

@@ -14,5 +14,5 @@
1414
@Schema(name = "Article.ArticleExt")
1515
@JsonInclude(JsonInclude.Include.NON_NULL)
1616
@JsonIgnoreProperties({"imageListJson", "fileListJson", "handler"})
17-
public class ArticleExt extends ArticleExtBase {
17+
public class ArticleExt extends GeneratedArticleExt {
1818
}

src/main/java/com/ujcms/cms/core/domain/ArticleTag.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.ujcms.cms.core.domain;
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
4-
import com.ujcms.cms.core.domain.base.ArticleTagBase;
4+
import com.ujcms.cms.core.domain.generated.GeneratedArticleTag;
55

66
/**
77
* 文章TAG关联实体类
88
*
99
* @author PONY
1010
*/
11-
public class ArticleTag extends ArticleTagBase {
11+
public class ArticleTag extends GeneratedArticleTag {
1212

1313
public ArticleTag() {
1414
}

src/main/java/com/ujcms/cms/core/domain/Attachment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
77
import com.fasterxml.jackson.annotation.JsonInclude;
88
import com.fasterxml.jackson.annotation.JsonIncludeProperties;
9-
import com.ujcms.cms.core.domain.base.AttachmentBase;
9+
import com.ujcms.cms.core.domain.generated.GeneratedAttachment;
1010
import com.ujcms.commons.file.FilesEx;
1111

1212
/**
@@ -16,7 +16,7 @@
1616
*/
1717
@JsonInclude(JsonInclude.Include.NON_NULL)
1818
@JsonIgnoreProperties("handler")
19-
public class Attachment extends AttachmentBase {
19+
public class Attachment extends GeneratedAttachment {
2020

2121
public Attachment() {
2222
}

src/main/java/com/ujcms/cms/core/domain/AttachmentRefer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.annotation.JsonInclude;
5-
import com.ujcms.cms.core.domain.base.AttachmentReferBase;
5+
import com.ujcms.cms.core.domain.generated.GeneratedAttachmentRefer;
66

77
/**
88
* 附件引用实体类
@@ -11,7 +11,7 @@
1111
*/
1212
@JsonInclude(JsonInclude.Include.NON_NULL)
1313
@JsonIgnoreProperties("handler")
14-
public class AttachmentRefer extends AttachmentReferBase {
14+
public class AttachmentRefer extends GeneratedAttachmentRefer {
1515

1616
public AttachmentRefer() {
1717
}

src/main/java/com/ujcms/cms/core/domain/Block.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.fasterxml.jackson.annotation.JsonIgnore;
44
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
55
import com.fasterxml.jackson.annotation.JsonInclude;
6-
import com.ujcms.cms.core.domain.base.BlockBase;
6+
import com.ujcms.cms.core.domain.generated.GeneratedBlock;
77
import org.hibernate.validator.constraints.Length;
88

99
import jakarta.validation.constraints.NotNull;
@@ -19,7 +19,7 @@
1919
*/
2020
@JsonInclude(JsonInclude.Include.NON_NULL)
2121
@JsonIgnoreProperties("handler")
22-
public class Block extends BlockBase {
22+
public class Block extends GeneratedBlock {
2323

2424
/**
2525
* 是否全局共享

0 commit comments

Comments
 (0)