diff --git a/ebike-operations/src/main/java/com/cdzy/operations/config/MyBatisFlexConfiguration.java b/ebike-operations/src/main/java/com/cdzy/operations/config/MyBatisFlexConfiguration.java
index 114b192..81ebf60 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/config/MyBatisFlexConfiguration.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/config/MyBatisFlexConfiguration.java
@@ -1,9 +1,13 @@
package com.cdzy.operations.config;
+import com.cdzy.operations.component.EbikeTenantFactory;
import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.core.FlexGlobalConfig;
import com.mybatisflex.core.audit.AuditManager;
import com.mybatisflex.core.dialect.DbType;
+import com.mybatisflex.core.keygen.KeyGenerators;
+import com.mybatisflex.core.tenant.TenantFactory;
+import com.mybatisflex.core.tenant.TenantManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
@@ -29,27 +33,33 @@ public class MyBatisFlexConfiguration {
, auditMessage.getElapsedTime())
);
+ FlexGlobalConfig globalConfig = FlexGlobalConfig.getDefaultConfig();
//全局ID生成策略配置
FlexGlobalConfig.KeyConfig keyConfig = new FlexGlobalConfig.KeyConfig();
keyConfig.setKeyType(KeyType.Generator);
- keyConfig.setValue("snowFlakeId");
+ keyConfig.setValue(KeyGenerators.snowFlakeId);
keyConfig.setBefore(true);
-
- FlexGlobalConfig.getDefaultConfig().setKeyConfig(keyConfig);
- }
-
- @Bean
- public FlexGlobalConfig flexGlobalConfig() {
- FlexGlobalConfig globalConfig = FlexGlobalConfig.getDefaultConfig();
+ globalConfig.setTenantColumn("operator_id");
+ globalConfig.setKeyConfig(keyConfig);
//方言配置
globalConfig.setDbType(DbType.POSTGRE_SQL); // 关键配置
//设置数据库正常时的值
globalConfig.setNormalValueOfLogicDelete(Boolean.FALSE);
- //设置数据已被删除时的值
+ //设置数据已被删除时的值
globalConfig.setDeletedValueOfLogicDelete(Boolean.TRUE);
- globalConfig.setTenantColumn("operator_id");
- return globalConfig;
}
+
+ /**
+ * 详细的租户工厂配置
+ */
+ @Bean
+ public static TenantFactory tenantFactory() {
+ logger.info("开始初始化租户工厂...");
+ EbikeTenantFactory factory = new EbikeTenantFactory();
+ TenantManager.setTenantFactory(factory);
+ return new EbikeTenantFactory();
+ }
+
}
\ No newline at end of file
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/config/WebConfig.java b/ebike-operations/src/main/java/com/cdzy/operations/config/WebConfig.java
index a87e46b..afdaa5d 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/config/WebConfig.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/config/WebConfig.java
@@ -1,10 +1,7 @@
package com.cdzy.operations.config;
-import com.cdzy.operations.component.EbikeTenantFactory;
import com.cdzy.operations.component.TenantInterceptor;
-import com.mybatisflex.core.tenant.TenantFactory;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -12,11 +9,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class WebConfig implements WebMvcConfigurer {
- @Bean
- public TenantFactory tenantFactory(){
- return new EbikeTenantFactory();
- }
-
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(new TenantInterceptor());
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBatteryInfo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBatteryInfo.java
index b031f33..f6d453e 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBatteryInfo.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBatteryInfo.java
@@ -34,7 +34,6 @@ public class EbikeBatteryInfo implements Serializable {
@Id
private Long batteryId;
- @Column(tenantId = true)
private Long operatorId;
/**
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeEcuInfo.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeEcuInfo.java
index 91274d4..2b2ffa7 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeEcuInfo.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeEcuInfo.java
@@ -37,7 +37,6 @@ public class EbikeEcuInfo implements Serializable {
/**
* 运营商ID
*/
- @Column(tenantId = true)
private Long operatorId;
/**
diff --git a/ebike-staff/src/main/java/com/cdzy/staff/config/MyBatisFlexConfiguration.java b/ebike-staff/src/main/java/com/cdzy/staff/config/MyBatisFlexConfiguration.java
index fbb5141..54ef0b4 100644
--- a/ebike-staff/src/main/java/com/cdzy/staff/config/MyBatisFlexConfiguration.java
+++ b/ebike-staff/src/main/java/com/cdzy/staff/config/MyBatisFlexConfiguration.java
@@ -1,9 +1,13 @@
package com.cdzy.staff.config;
+import com.cdzy.staff.component.EbikeTenantFactory;
import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.core.FlexGlobalConfig;
import com.mybatisflex.core.audit.AuditManager;
import com.mybatisflex.core.dialect.DbType;
+import com.mybatisflex.core.keygen.KeyGenerators;
+import com.mybatisflex.core.tenant.TenantFactory;
+import com.mybatisflex.core.tenant.TenantManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
@@ -29,27 +33,33 @@ public class MyBatisFlexConfiguration {
, auditMessage.getElapsedTime())
);
+ FlexGlobalConfig globalConfig = FlexGlobalConfig.getDefaultConfig();
//全局ID生成策略配置
FlexGlobalConfig.KeyConfig keyConfig = new FlexGlobalConfig.KeyConfig();
keyConfig.setKeyType(KeyType.Generator);
- keyConfig.setValue("snowFlakeId");
+ keyConfig.setValue(KeyGenerators.snowFlakeId);
keyConfig.setBefore(true);
-
- FlexGlobalConfig.getDefaultConfig().setKeyConfig(keyConfig);
- }
-
- @Bean
- public FlexGlobalConfig flexGlobalConfig() {
- FlexGlobalConfig globalConfig = FlexGlobalConfig.getDefaultConfig();
+ globalConfig.setTenantColumn("operator_id");
+ globalConfig.setKeyConfig(keyConfig);
//方言配置
globalConfig.setDbType(DbType.POSTGRE_SQL); // 关键配置
//设置数据库正常时的值
globalConfig.setNormalValueOfLogicDelete(Boolean.FALSE);
- //设置数据已被删除时的值
+ //设置数据已被删除时的值
globalConfig.setDeletedValueOfLogicDelete(Boolean.TRUE);
- globalConfig.setTenantColumn("operator_id");
- return globalConfig;
}
+
+ /**
+ * 详细的租户工厂配置
+ */
+ @Bean
+ public static TenantFactory tenantFactory() {
+ logger.info("开始初始化租户工厂...");
+ EbikeTenantFactory factory = new EbikeTenantFactory();
+ TenantManager.setTenantFactory(factory);
+ return new EbikeTenantFactory();
+ }
+
}
\ No newline at end of file
diff --git a/ebike-staff/src/main/java/com/cdzy/staff/config/WebConfig.java b/ebike-staff/src/main/java/com/cdzy/staff/config/WebConfig.java
index d5a102a..48dc14d 100644
--- a/ebike-staff/src/main/java/com/cdzy/staff/config/WebConfig.java
+++ b/ebike-staff/src/main/java/com/cdzy/staff/config/WebConfig.java
@@ -1,9 +1,7 @@
package com.cdzy.staff.config;
-import com.cdzy.staff.component.EbikeTenantFactory;
+
import com.cdzy.staff.component.TenantInterceptor;
-import com.mybatisflex.core.tenant.TenantFactory;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -11,11 +9,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class WebConfig implements WebMvcConfigurer {
- @Bean
- public TenantFactory tenantFactory(){
- return new EbikeTenantFactory();
- }
-
@Override
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(new TenantInterceptor());
diff --git a/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeOperator.java b/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeOperator.java
index 7a8d917..7143a3e 100644
--- a/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeOperator.java
+++ b/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeOperator.java
@@ -29,7 +29,6 @@ public class EbikeOperator implements Serializable {
private static final long serialVersionUID = 1L;
@Id
- @Column(tenantId = true)
private Long operatorId;
private String operatorName;
diff --git a/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeOperatorStaff.java b/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeOperatorStaff.java
index b435472..f533dbd 100644
--- a/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeOperatorStaff.java
+++ b/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeOperatorStaff.java
@@ -37,7 +37,6 @@ public class EbikeOperatorStaff implements Serializable {
private String salt;
- @Column(tenantId = true)
private Long operatorId;
@Column(onInsertValue = "1")
diff --git a/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeRole.java b/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeRole.java
index fcaab66..c97678b 100644
--- a/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeRole.java
+++ b/ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeRole.java
@@ -44,7 +44,6 @@ public class EbikeRole implements Serializable {
/**
* 所属运营商
*/
- @Column(tenantId = true)
private Long operatorId;
/**
diff --git a/pom.xml b/pom.xml
index 444f56a..a62ab24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
2.18.0
5.8.26
1.18.30
- 1.11.0
+ 1.11.3
3.0.4
1.40.0
8.0.32