github/cool-admin-java
1
0
Fork 2
mirror of https://github.com/cool-team-official/cool-admin-java.git synced 2026-10-07 14:48:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

upgrade：升级autotable和mybatis-flex到最新版本

Browse Source
This commit is contained in:
ruying408
2025-03-09 09:27:20 +08:00
parent f9131ab633
commit 143e729590
26 changed files with 204 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/cool/modules/base/entity/sys/BaseSysConfEntity.java
+3 -4
View File
@@ -1,13 +1,12 @@
package com.cool.modules.base.entity.sys;
import com.cool.core.base.BaseEntity;
import com.tangzc.autotable.annotation.enums.IndexTypeEnum;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import com.mybatisflex.annotation.Table;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Index;
import org.dromara.autotable.annotation.enums.IndexTypeEnum;
/**
* 系统配置
src/main/java/com/cool/modules/base/entity/sys/BaseSysLogEntity.java
+3 -3
View File
@@ -2,12 +2,12 @@ package com.cool.modules.base.entity.sys;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.core.handler.Fastjson2TypeHandler;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import com.mybatisflex.annotation.Table;
import com.mybatisflex.core.handler.Fastjson2TypeHandler;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Index;
@Getter
@Setter
src/main/java/com/cool/modules/base/entity/sys/BaseSysMenuEntity.java
+1 -1
View File
@@ -3,11 +3,11 @@ package com.cool.modules.base.entity.sys;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Table;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import java.util.List;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Index;
@Getter
@Setter
src/main/java/com/cool/modules/base/entity/sys/BaseSysParamEntity.java
+1 -1
View File
@@ -2,10 +2,10 @@ package com.cool.modules.base.entity.sys;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Table;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Index;
@Getter
@Setter
src/main/java/com/cool/modules/base/entity/sys/BaseSysRoleEntity.java
+2 -2
View File
@@ -4,12 +4,12 @@ import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Table;
import com.mybatisflex.core.handler.Fastjson2TypeHandler;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.autotable.annotation.enums.IndexTypeEnum;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import java.util.List;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Index;
import org.dromara.autotable.annotation.enums.IndexTypeEnum;
@Getter
@Setter
src/main/java/com/cool/modules/base/entity/sys/BaseSysUserEntity.java
+2 -2
View File
@@ -3,11 +3,11 @@ package com.cool.modules.base.entity.sys;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Table;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.autotable.annotation.enums.IndexTypeEnum;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Index;
import org.dromara.autotable.annotation.enums.IndexTypeEnum;
@Getter
@Setter
src/main/java/com/cool/modules/base/entity/sys/BaseSysUserRoleEntity.java
+1 -1
View File
@@ -2,10 +2,10 @@ package com.cool.modules.base.entity.sys;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Table;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Index;
@Getter
@Setter
src/main/java/com/cool/modules/base/service/sys/impl/BaseCodingServiceImpl.java
+3 -5
View File
@@ -4,10 +4,6 @@ import com.cool.core.exception.CoolPreconditions;
import com.cool.modules.base.dto.sys.CodeContentDto;
import com.cool.modules.base.service.sys.BaseCodingService;
import com.google.googlejavaformat.java.Formatter;
import com.google.googlejavaformat.java.FormatterException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -16,6 +12,8 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@Service
public class BaseCodingServiceImpl implements BaseCodingService {
@@ -81,7 +79,7 @@ public class BaseCodingServiceImpl implements BaseCodingService {
public String formatContent(String content) {
Formatter formatter = new Formatter();
try {
// return formatter.formatSource(content);
return formatter.formatSource(content);
} catch (Exception ignored) {
}
return content;
src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
+1 -1
View File
@@ -26,8 +26,8 @@ import com.cool.modules.base.service.sys.BaseSysUserService;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.update.UpdateChain;
import com.tangzc.autotable.core.constants.DatabaseDialect;
import lombok.RequiredArgsConstructor;
import org.dromara.autotable.core.constants.DatabaseDialect;
import org.springframework.stereotype.Service;
/**
src/main/java/com/cool/modules/plugin/entity/PluginInfoEntity.java
+2 -2
View File
@@ -6,13 +6,13 @@ import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Table;
import com.mybatisflex.core.handler.Fastjson2TypeHandler;
import com.mybatisflex.core.handler.JacksonTypeHandler;
import com.tangzc.autotable.annotation.Ignore;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import com.tangzc.mybatisflex.autotable.annotation.UniIndex;
import java.util.Map;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Ignore;
import org.dromara.autotable.annotation.Index;
@Getter
@Setter
src/main/java/com/cool/modules/recycle/entity/RecycleDataEntity.java
+2 -2
View File
@@ -4,13 +4,13 @@ import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Table;
import com.mybatisflex.core.handler.Fastjson2TypeHandler;
import com.tangzc.autotable.annotation.Ignore;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import java.util.List;
import java.util.Map;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Ignore;
import org.dromara.autotable.annotation.Index;
/**
* 数据回收站 软删除的时候数据会回收到该表
src/main/java/com/cool/modules/space/entity/SpaceInfoEntity.java
+2 -2
View File
@@ -3,11 +3,11 @@ package com.cool.modules.space.entity;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Table;
import com.tangzc.autotable.annotation.Ignore;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Ignore;
import org.dromara.autotable.annotation.Index;
/**
* 文件空间信息
src/main/java/com/cool/modules/task/entity/TaskLogEntity.java
+2 -3
View File
@@ -2,12 +2,11 @@ package com.cool.modules.task.entity;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Column;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import com.mybatisflex.annotation.Table;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Index;
@Getter
@Setter
src/main/java/com/cool/modules/task/event/TaskEvent.java
+5 -5
View File
@@ -3,8 +3,8 @@ package com.cool.modules.task.event;
import com.cool.modules.task.service.TaskInfoService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
/**
@@ -13,12 +13,12 @@ import org.springframework.stereotype.Component;
@Slf4j
@Component
@RequiredArgsConstructor
public class TaskEvent implements ApplicationRunner {
public class TaskEvent {
final private TaskInfoService taskInfoService;
@Override
public void run(ApplicationArguments args) throws Exception {
@EventListener(ApplicationReadyEvent.class)
public void run() throws Exception {
taskInfoService.init();
log.info("初始化任务");
}
src/main/java/com/cool/modules/user/entity/UserAddressEntity.java
+1 -1
View File
@@ -2,10 +2,10 @@ package com.cool.modules.user.entity;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Table;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Index;
/**
* 用户模块-收货地址
src/main/java/com/cool/modules/user/entity/UserWxEntity.java
+1 -1
View File
@@ -2,11 +2,11 @@ package com.cool.modules.user.entity;
import com.cool.core.base.BaseEntity;
import com.mybatisflex.annotation.Table;
import com.tangzc.autotable.annotation.Index;
import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
import com.tangzc.mybatisflex.autotable.annotation.UniIndex;
import lombok.Getter;
import lombok.Setter;
import org.dromara.autotable.annotation.Index;
@Getter
@Setter