Skip to content

Commit 968cc79

Browse files
committed
v10.1.2
1 parent 9d4054d commit 968cc79

File tree

88 files changed

+203
-5489
lines changed

Some content is hidden

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

88 files changed

+203
-5489
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# UJCMS 发版说明
22

3+
## ujcms-10.1.2
4+
5+
* fix: 修复默认 admin 密码错误问题
6+
* refactor: 增加 lombok 组件,domain 类使用 @Data 注解
7+
38
## ujcms-10.1.1
49

510
* fix: 补全访问统计代码

pom.xml

Lines changed: 12 additions & 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.1.1</version>
9+
<version>10.1.2</version>
1010
<packaging>${project.packaging}</packaging>
1111

1212
<name>UJCMS</name>
@@ -517,6 +517,12 @@
517517
<artifactId>spring-boot-devtools</artifactId>
518518
<optional>true</optional>
519519
</dependency>
520+
<!-- Lombok 代码生成工具 -->
521+
<dependency>
522+
<groupId>org.projectlombok</groupId>
523+
<artifactId>lombok</artifactId>
524+
<scope>provided</scope>
525+
</dependency>
520526
<dependency>
521527
<groupId>org.mybatis.generator</groupId>
522528
<artifactId>mybatis-generator-core</artifactId>
@@ -566,6 +572,11 @@
566572
<artifactId>maven-compiler-plugin</artifactId>
567573
<configuration>
568574
<annotationProcessorPaths>
575+
<path>
576+
<groupId>org.projectlombok</groupId>
577+
<artifactId>lombok</artifactId>
578+
<version>${lombok.version}</version>
579+
</path>
569580
<path>
570581
<groupId>com.github.therapi</groupId>
571582
<artifactId>therapi-runtime-javadoc-scribe</artifactId>

src/main/java/com/ujcms/cms/core/domain/generated/GeneratedAction.java

Lines changed: 2 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.io.Serial;
66
import java.io.Serializable;
77
import java.time.OffsetDateTime;
8+
import lombok.Data;
89
import org.hibernate.validator.constraints.Length;
910
import org.springframework.lang.Nullable;
1011

@@ -13,6 +14,7 @@
1314
*
1415
* @author MyBatis Generator
1516
*/
17+
@Data
1618
public class GeneratedAction implements Serializable {
1719
@Serial
1820
private static final long serialVersionUID = 1L;
@@ -87,79 +89,4 @@ public class GeneratedAction implements Serializable {
8789
@NotNull
8890
@Schema(description="创建日期")
8991
private OffsetDateTime created = OffsetDateTime.now();
90-
91-
public Long getId() {
92-
return id;
93-
}
94-
95-
public void setId(Long id) {
96-
this.id = id;
97-
}
98-
99-
public Long getSiteId() {
100-
return siteId;
101-
}
102-
103-
public void setSiteId(Long siteId) {
104-
this.siteId = siteId;
105-
}
106-
107-
@Nullable
108-
public Long getUserId() {
109-
return userId;
110-
}
111-
112-
public void setUserId(@Nullable Long userId) {
113-
this.userId = userId;
114-
}
115-
116-
@Nullable
117-
public String getIp() {
118-
return ip;
119-
}
120-
121-
public void setIp(@Nullable String ip) {
122-
this.ip = ip;
123-
}
124-
125-
@Nullable
126-
public Long getCookie() {
127-
return cookie;
128-
}
129-
130-
public void setCookie(@Nullable Long cookie) {
131-
this.cookie = cookie;
132-
}
133-
134-
public String getRefType() {
135-
return refType;
136-
}
137-
138-
public void setRefType(String refType) {
139-
this.refType = refType;
140-
}
141-
142-
public Long getRefId() {
143-
return refId;
144-
}
145-
146-
public void setRefId(Long refId) {
147-
this.refId = refId;
148-
}
149-
150-
public String getRefOption() {
151-
return refOption;
152-
}
153-
154-
public void setRefOption(String refOption) {
155-
this.refOption = refOption;
156-
}
157-
158-
public OffsetDateTime getCreated() {
159-
return created;
160-
}
161-
162-
public void setCreated(OffsetDateTime created) {
163-
this.created = created;
164-
}
16592
}

src/main/java/com/ujcms/cms/core/domain/generated/GeneratedArticle.java

Lines changed: 2 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
import java.io.Serial;
66
import java.io.Serializable;
77
import java.time.OffsetDateTime;
8+
import lombok.Data;
89
import org.springframework.lang.Nullable;
910

1011
/**
1112
* This class was generated by MyBatis Generator.
1213
*
1314
* @author MyBatis Generator
1415
*/
16+
@Data
1517
public class GeneratedArticle implements Serializable {
1618
@Serial
1719
private static final long serialVersionUID = 1L;
@@ -153,160 +155,4 @@ public class GeneratedArticle implements Serializable {
153155
@NotNull
154156
@Schema(description="排列顺序")
155157
private Long order = 0L;
156-
157-
public Long getId() {
158-
return id;
159-
}
160-
161-
public void setId(Long id) {
162-
this.id = id;
163-
}
164-
165-
@Nullable
166-
public Long getSrcId() {
167-
return srcId;
168-
}
169-
170-
public void setSrcId(@Nullable Long srcId) {
171-
this.srcId = srcId;
172-
}
173-
174-
public Long getSiteId() {
175-
return siteId;
176-
}
177-
178-
public void setSiteId(Long siteId) {
179-
this.siteId = siteId;
180-
}
181-
182-
public Long getOrgId() {
183-
return orgId;
184-
}
185-
186-
public void setOrgId(Long orgId) {
187-
this.orgId = orgId;
188-
}
189-
190-
public Long getChannelId() {
191-
return channelId;
192-
}
193-
194-
public void setChannelId(Long channelId) {
195-
this.channelId = channelId;
196-
}
197-
198-
public Long getUserId() {
199-
return userId;
200-
}
201-
202-
public void setUserId(Long userId) {
203-
this.userId = userId;
204-
}
205-
206-
public Long getModifiedUserId() {
207-
return modifiedUserId;
208-
}
209-
210-
public void setModifiedUserId(Long modifiedUserId) {
211-
this.modifiedUserId = modifiedUserId;
212-
}
213-
214-
public OffsetDateTime getCreated() {
215-
return created;
216-
}
217-
218-
public void setCreated(OffsetDateTime created) {
219-
this.created = created;
220-
}
221-
222-
public OffsetDateTime getModified() {
223-
return modified;
224-
}
225-
226-
public void setModified(OffsetDateTime modified) {
227-
this.modified = modified;
228-
}
229-
230-
public OffsetDateTime getPublishDate() {
231-
return publishDate;
232-
}
233-
234-
public void setPublishDate(OffsetDateTime publishDate) {
235-
this.publishDate = publishDate;
236-
}
237-
238-
@Nullable
239-
public OffsetDateTime getOnlineDate() {
240-
return onlineDate;
241-
}
242-
243-
public void setOnlineDate(@Nullable OffsetDateTime onlineDate) {
244-
this.onlineDate = onlineDate;
245-
}
246-
247-
@Nullable
248-
public OffsetDateTime getOfflineDate() {
249-
return offlineDate;
250-
}
251-
252-
public void setOfflineDate(@Nullable OffsetDateTime offlineDate) {
253-
this.offlineDate = offlineDate;
254-
}
255-
256-
public Short getSticky() {
257-
return sticky;
258-
}
259-
260-
public void setSticky(Short sticky) {
261-
this.sticky = sticky;
262-
}
263-
264-
@Nullable
265-
public OffsetDateTime getStickyDate() {
266-
return stickyDate;
267-
}
268-
269-
public void setStickyDate(@Nullable OffsetDateTime stickyDate) {
270-
this.stickyDate = stickyDate;
271-
}
272-
273-
public Boolean getWithImage() {
274-
return withImage;
275-
}
276-
277-
public void setWithImage(Boolean withImage) {
278-
this.withImage = withImage;
279-
}
280-
281-
public Short getInputType() {
282-
return inputType;
283-
}
284-
285-
public void setInputType(Short inputType) {
286-
this.inputType = inputType;
287-
}
288-
289-
public Short getType() {
290-
return type;
291-
}
292-
293-
public void setType(Short type) {
294-
this.type = type;
295-
}
296-
297-
public Short getStatus() {
298-
return status;
299-
}
300-
301-
public void setStatus(Short status) {
302-
this.status = status;
303-
}
304-
305-
public Long getOrder() {
306-
return order;
307-
}
308-
309-
public void setOrder(Long order) {
310-
this.order = order;
311-
}
312158
}

0 commit comments

Comments
 (0)