diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecord.java b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecord.java
index 0e671db..77133e2 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecord.java
+++ b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecord.java
@@ -5,7 +5,6 @@ import com.flyfish.framework.domain.base.AuditDomain;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.Field;
import org.springframework.data.relational.core.mapping.Column;
import org.springframework.data.relational.core.mapping.Table;
@@ -21,13 +20,13 @@ import org.springframework.data.relational.core.mapping.Table;
public class ApproveRecord extends AuditDomain {
// 是否已审批
- @Column
private Boolean approved;
// 模块
private String module;
// 模块名称
+ @Column("module_name")
private String moduleName;
// 数据id
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Backup.java b/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Backup.java
index 1d3aea7..e550901 100644
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Backup.java
+++ b/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Backup.java
@@ -16,7 +16,7 @@ import org.springframework.data.relational.core.mapping.Table;
@Getter
@Setter
@Document(collection = "backups")
-@Table("backups")
+@Table("backup")
public class Backup extends AuditDomain {
// 文件路径
diff --git a/flyfish-data/flyfish-data-domain/pom.xml b/flyfish-data/flyfish-data-domain/pom.xml
index 1f71e46..54ff803 100644
--- a/flyfish-data/flyfish-data-domain/pom.xml
+++ b/flyfish-data/flyfish-data-domain/pom.xml
@@ -25,7 +25,6 @@
com.flyfish.framework
flyfish-data-relational
- ${revision}
true
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Department.java b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Department.java
index 24562a5..cbf94e8 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Department.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Department.java
@@ -11,8 +11,8 @@ import org.springframework.data.relational.core.mapping.Table;
*
* @author wangyu
*/
-@Document
-@Table
+@Document("departments")
+@Table("department")
@Getter
@Setter
@NoArgsConstructor
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Permission.java b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Permission.java
index 3a6de98..f2566de 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Permission.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Permission.java
@@ -4,7 +4,6 @@ import com.flyfish.framework.domain.tree.TreeDomain;
import com.flyfish.framework.enums.NamedEnum;
import lombok.AllArgsConstructor;
import lombok.Data;
-import lombok.EqualsAndHashCode;
import lombok.Getter;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.relational.core.mapping.Table;
@@ -14,10 +13,9 @@ import org.springframework.data.relational.core.mapping.Table;
*
* @author wangyu
*/
-@Document
-@Table
+@Document("permissions")
+@Table("permission")
@Data
-@EqualsAndHashCode(callSuper = true)
public class Permission extends TreeDomain {
public static final Permission ROOT;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Role.java b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Role.java
index f1bedd7..9e00f87 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Role.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Role.java
@@ -16,13 +16,12 @@ import java.util.List;
*
* @author wangyu
*/
-@Document
-@Table
+@Document("roles")
+@Table("role")
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
public class Role extends AuditDomain {
/**
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/User.java b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/User.java
index ac444da..d3ccd6e 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/User.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/User.java
@@ -8,7 +8,10 @@ import com.flyfish.framework.enums.UserStatus;
import com.flyfish.framework.enums.UserType;
import com.flyfish.framework.relational.mapping.Association;
import com.flyfish.framework.validation.spi.ConditionalGroup;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
import org.springframework.data.annotation.Transient;
import org.springframework.data.mongodb.core.index.Indexed;
import org.springframework.data.mongodb.core.mapping.DBRef;
@@ -19,13 +22,12 @@ import org.springframework.data.relational.core.mapping.Table;
import java.time.LocalDateTime;
import java.util.List;
-@Document
-@Table
+@Document("users")
+@Table("user")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
@ConditionalGroup(codeless = true)
public class User extends AuditDomain implements IUser {
@@ -86,7 +88,7 @@ public class User extends AuditDomain implements IUser {
* 所属角色
*/
@DBRef
- @Association(relationTable = "rel_user_depart", field = "user_id", foreignField = "depart_id")
+ @Association(relationTable = "rel_user_role", field = "user_id", foreignField = "role_id")
private List roles;
/**
diff --git a/flyfish-data/flyfish-data-r2dbc/pom.xml b/flyfish-data/flyfish-data-r2dbc/pom.xml
index b78bdeb..15e2c4d 100644
--- a/flyfish-data/flyfish-data-r2dbc/pom.xml
+++ b/flyfish-data/flyfish-data-r2dbc/pom.xml
@@ -24,7 +24,6 @@
com.flyfish.framework
flyfish-data-relational
- ${revision}
io.asyncer
diff --git a/flyfish-dict/pom.xml b/flyfish-dict/pom.xml
index 09fbacb..0af4a80 100644
--- a/flyfish-dict/pom.xml
+++ b/flyfish-dict/pom.xml
@@ -19,8 +19,8 @@
- org.springframework.data
- spring-data-relational
+ com.flyfish.framework
+ flyfish-data-relational
true
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/AutoComplete.java b/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/AutoComplete.java
index 2f87476..df2095e 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/AutoComplete.java
+++ b/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/AutoComplete.java
@@ -3,7 +3,6 @@ package com.flyfish.framework.dict.domain;
import com.flyfish.framework.domain.base.AuditDomain;
import lombok.Getter;
import lombok.Setter;
-import org.springframework.data.annotation.Reference;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.relational.core.mapping.Table;
@@ -17,11 +16,10 @@ import java.util.List;
@Getter
@Setter
@Document(collection = "auto-completes")
-@Table("auto_completes")
+@Table("auto_complete")
public class AutoComplete extends AuditDomain {
// 候选值列表
- @Reference
private List values;
// 是否多级联动
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/Dictionary.java b/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/Dictionary.java
index b2719ed..7eab62b 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/Dictionary.java
+++ b/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/Dictionary.java
@@ -27,7 +27,6 @@ public class Dictionary extends AuditDomain {
// 字典描述
private String description;
-
@Override
public boolean equals(Object o) {
if (this == o) return true;
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/DictionaryValue.java b/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/DictionaryValue.java
index cedc489..966fcc0 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/DictionaryValue.java
+++ b/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/DictionaryValue.java
@@ -1,7 +1,6 @@
package com.flyfish.framework.dict.domain;
import lombok.Data;
-import org.springframework.data.relational.core.mapping.Table;
/**
* 字典表的值
@@ -9,7 +8,6 @@ import org.springframework.data.relational.core.mapping.Table;
* @author wangyu
*/
@Data
-@Table("dictionary_value")
public class DictionaryValue {
// 显示文字
diff --git a/flyfish-form/src/main/java/com/flyfish/framework/form/domain/OnlineForm.java b/flyfish-form/src/main/java/com/flyfish/framework/form/domain/OnlineForm.java
index 79ada3f..f6645bf 100644
--- a/flyfish-form/src/main/java/com/flyfish/framework/form/domain/OnlineForm.java
+++ b/flyfish-form/src/main/java/com/flyfish/framework/form/domain/OnlineForm.java
@@ -3,7 +3,6 @@ package com.flyfish.framework.form.domain;
import com.alibaba.fastjson.JSONObject;
import com.flyfish.framework.domain.base.Domain;
import lombok.Data;
-import lombok.EqualsAndHashCode;
import org.springframework.data.mongodb.core.index.CompoundIndex;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.relational.core.mapping.Table;
@@ -18,7 +17,6 @@ import java.util.List;
@CompoundIndex(name = "uniq_code", def = "{code: 1}", unique = true)
@Table("online_form")
@Data
-@EqualsAndHashCode(callSuper = true)
public class OnlineForm extends Domain {
// 表单描述
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/Log.java b/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/Log.java
index bb12741..1ddb464 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/Log.java
+++ b/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/Log.java
@@ -2,7 +2,6 @@ package com.flyfish.framework.logging.domain;
import com.flyfish.framework.domain.base.Domain;
import lombok.Data;
-import lombok.EqualsAndHashCode;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.relational.core.mapping.Table;
@@ -11,10 +10,9 @@ import java.time.LocalDateTime;
/**
* 日志集合
*/
-@Document
-@Table
+@Document("logs")
+@Table("log")
@Data
-@EqualsAndHashCode(callSuper = true)
public class Log extends Domain {
// 日志类型
diff --git a/pom.xml b/pom.xml
index 61a269d..10d3511 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,12 @@
compile
+
+ com.flyfish.framework
+ flyfish-data-relational
+ ${revision}
+
+
org.apache.commons
commons-collections4