github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor some entities

pull/137/head
johnniang 2019-04-03 09:41:46 +08:00
parent ed8d86f2bd
commit c45185dd6f
6 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pom.xml
View File

@ -235,17 +235,17 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin> <!--<plugin>-->
<groupId>org.apache.maven.plugins</groupId> <!--<groupId>org.apache.maven.plugins</groupId>-->
<artifactId>maven-jar-plugin</artifactId> <!--<artifactId>maven-jar-plugin</artifactId>-->
<version>3.0.2</version> <!--<version>3.0.2</version>-->
<configuration> <!--<configuration>-->
<excludes> <!--<excludes>-->
<exclude>/**/application-dev.yaml</exclude> <!--<exclude>/**/application-dev.yaml</exclude>-->
<exclude>/**/application-test.yaml</exclude> <!--<exclude>/**/application-test.yaml</exclude>-->
</excludes> <!--</excludes>-->
</configuration> <!--</configuration>-->
</plugin> <!--</plugin>-->
</plugins> </plugins>
</build> </build>
</project> </project>

6
src/main/java/cc/ryanc/halo/model/entity/BasePost.java
View File

@ -5,6 +5,8 @@ import cc.ryanc.halo.model.enums.PostStatus;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@ -15,7 +17,9 @@ import java.util.Date;
* @author johnniang * @author johnniang
*/ */
@Entity(name = "base_post") @Entity(name = "base_post")
@Table(name = "posts") @Table(name = "posts", indexes = @Index(columnList = "url"))
@SQLDelete(sql = "update posts set deleted = true where id = ?")
@Where(clause = "deleted = false")
@DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.INTEGER, columnDefinition = "int default 0") @DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.INTEGER, columnDefinition = "int default 0")
@Data @Data
@ToString @ToString

5
src/main/java/cc/ryanc/halo/model/entity/Journal.java
View File

@ -1,8 +1,5 @@
package cc.ryanc.halo.model.entity; package cc.ryanc.halo.model.entity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.DiscriminatorValue; import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity; import javax.persistence.Entity;
@ -13,8 +10,6 @@ import javax.persistence.Entity;
* @date 3/22/19 * @date 3/22/19
*/ */
@Entity(name = "Journal") @Entity(name = "Journal")
@Where(clause = "deleted = false")
@SQLDelete(sql = "update posts set deleted = true where id = ?")
@DiscriminatorValue("2") @DiscriminatorValue("2")
public class Journal extends BasePost { public class Journal extends BasePost {

5
src/main/java/cc/ryanc/halo/model/entity/Page.java
View File

@ -1,8 +1,5 @@
package cc.ryanc.halo.model.entity; package cc.ryanc.halo.model.entity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.DiscriminatorValue; import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity; import javax.persistence.Entity;
@ -13,8 +10,6 @@ import javax.persistence.Entity;
* @date 3/22/19 * @date 3/22/19
*/ */
@Entity(name = "Page") @Entity(name = "Page")
@Where(clause = "deleted = false")
@SQLDelete(sql = "update posts set deleted = true where id = ?")
@DiscriminatorValue("1") @DiscriminatorValue("1")
public class Page extends BasePost { public class Page extends BasePost {
} }

5
src/main/java/cc/ryanc/halo/model/entity/Post.java
View File

@ -1,8 +1,5 @@
package cc.ryanc.halo.model.entity; package cc.ryanc.halo.model.entity;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import javax.persistence.DiscriminatorValue; import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity; import javax.persistence.Entity;
@ -12,8 +9,6 @@ import javax.persistence.Entity;
* @author johnniang * @author johnniang
*/ */
@Entity(name = "Post") @Entity(name = "Post")
@SQLDelete(sql = "update posts set deleted = true where id = ?")
@Where(clause = "deleted = false")
@DiscriminatorValue(value = "0") @DiscriminatorValue(value = "0")
public class Post extends BasePost { public class Post extends BasePost {

2
src/main/java/cc/ryanc/halo/model/entity/Tag.java
View File

@ -16,7 +16,7 @@ import javax.persistence.*;
*/ */
@Data @Data
@Entity @Entity
@Table(name = "tags") @Table(name = "tags", indexes = @Index(columnList = "slug_name"))
@SQLDelete(sql = "update tags set deleted = true where id = ?") @SQLDelete(sql = "update tags set deleted = true where id = ?")
@Where(clause = "deleted = false") @Where(clause = "deleted = false")
@ToString @ToString