bug

blade-service/blade-manager/src/main/java/org/springblade/manager/aop/AvoidRepeatableCommitAspect.java

@@ -6,12 +6,10 @@ import org.apache.commons.lang.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.manager.unit.RedisUtil;
+import org.springblade.manager.utils.RedisUtil;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -14,11 +14,7 @@ import com.itextpdf.io.font.FontProgram;
 import com.itextpdf.io.font.FontProgramFactory;
 import com.itextpdf.layout.font.FontProvider;
 import com.spire.xls.*;
-import com.spire.xls.core.IStyle;
 import com.spire.xls.core.spreadsheet.HTMLOptions;
-import com.spire.xls.core.spreadsheet.pivottables.PivotStyle;
-import com.spire.xls.core.spreadsheet.shapes.XlsTextBoxShape;
-import io.reactivex.Single;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
@@ -46,9 +42,9 @@ import org.springblade.manager.bean.TableInfo;
 import org.springblade.manager.entity.*;
 import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.service.*;
-import org.springblade.manager.unit.FileUtils;
-import org.springblade.manager.unit.RegularExpressionUtil;
-import org.springblade.manager.unit.WbsElementUtil;
+import org.springblade.manager.utils.FileUtils;
+import org.springblade.manager.utils.RegularExpressionUtil;
+import org.springblade.manager.utils.WbsElementUtil;
 import org.springblade.manager.vo.*;
 import org.springblade.manager.wrapper.ExcelTabWrapper;
 import org.springblade.resource.feign.CommonFileClient;

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExctabCellController.java

@@ -29,7 +29,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.entity.WbsFormElement;
-import org.springblade.manager.unit.CopyUtil;
+import org.springblade.manager.utils.CopyUtil;
 import org.springblade.manager.vo.ExctabCellVO2;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FirstController.java

@@ -22,7 +22,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
 import org.springblade.manager.entity.*;
 import org.springblade.manager.service.*;
-import org.springblade.manager.unit.FileUtils;
+import org.springblade.manager.utils.FileUtils;
 import org.springblade.resource.feign.CommonFileClient;
 import org.springblade.resource.feign.IOSSClient;
 import org.springblade.resource.feign.NewIOSSClient;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeServiceImpl.java

@@ -13,7 +13,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.dto.ArchiveTreeDTO;
 import org.springblade.manager.dto.ArchiveTreeSortDTO;
 import org.springblade.manager.entity.ArchiveTree;
-import org.springblade.manager.unit.DiffListUtil;
+import org.springblade.manager.utils.DiffListUtil;
 import org.springblade.manager.vo.ArchiveTreeVO;
 import org.springblade.manager.mapper.ArchiveTreeMapper;
 import org.springblade.manager.service.IArchiveTreeService;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsFormElementServiceImpl.java

@@ -25,7 +25,7 @@ import org.springblade.manager.mapper.WbsFormElementMapper;
 import org.springblade.manager.mapper.WbsTreeMapper;
 import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.service.IWbsFormElementService;
-import org.springblade.manager.unit.WbsElementUtil;
+import org.springblade.manager.utils.WbsElementUtil;
 import org.springblade.manager.vo.WbsFormElementVO;
 import org.springblade.manager.vo.WbsFormElementVO2;
 import org.springblade.manager.vo.WbsNodeTableVO;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -17,7 +17,7 @@ import org.springblade.manager.entity.*;
 import org.springblade.manager.mapper.WbsTreeContractMapper;
 import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.service.IWbsTreeContractService;
-import org.springblade.manager.unit.DiffListUtil;
+import org.springblade.manager.utils.DiffListUtil;
 import org.springblade.manager.vo.WbsTreeContractTreeVO;
 import org.springblade.manager.vo.WbsTreeContractTreeVO3;
 import org.springframework.stereotype.Service;

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -10,7 +10,6 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.*;
-import org.springblade.manager.aop.AvoidRepeatableCommit;
 import org.springblade.manager.dto.FormElementDTO;
 import org.springblade.manager.dto.WbsTreeBatchImportDTO;
 import org.springblade.manager.dto.WbsTreeContractDTO;
@@ -22,8 +21,8 @@ import org.springblade.manager.mapper.*;
 import org.springblade.manager.service.IWbsFormElementService;
 import org.springblade.manager.service.IWbsTreeService;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.manager.unit.DiffListUtil;
-import org.springblade.manager.unit.WbsElementUtil;
+import org.springblade.manager.utils.DiffListUtil;
+import org.springblade.manager.utils.WbsElementUtil;
 import org.springblade.manager.vo.*;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;

blade-service/blade-manager/src/main/java/org/springblade/manager/unit/CopyUtil.java → blade-service/blade-manager/src/main/java/org/springblade/manager/utils/CopyUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.manager.unit;
+package org.springblade.manager.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

blade-service/blade-manager/src/main/java/org/springblade/manager/unit/DiffListUtil.java → blade-service/blade-manager/src/main/java/org/springblade/manager/utils/DiffListUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.manager.unit;
+package org.springblade.manager.utils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

blade-service/blade-manager/src/main/java/org/springblade/manager/unit/FileUtils.java → blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FileUtils.java

@@ -1,4 +1,4 @@
-package org.springblade.manager.unit;
+package org.springblade.manager.utils;
 
 import com.itextpdf.text.Document;
 import com.itextpdf.text.pdf.PdfCopy;

blade-service/blade-manager/src/main/java/org/springblade/manager/unit/HtmlToPdf.java → blade-service/blade-manager/src/main/java/org/springblade/manager/utils/HtmlToPdf.java

@@ -1,23 +1,18 @@
-package org.springblade.manager.unit;
+package org.springblade.manager.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 
-import com.alibaba.fastjson.JSONObject;
 import com.itextpdf.html2pdf.ConverterProperties;
 import com.itextpdf.html2pdf.HtmlConverter;
 import com.itextpdf.html2pdf.resolver.font.DefaultFontProvider;
 import com.itextpdf.kernel.colors.Color;
 import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.pdf.PdfDocument;
-import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
 import com.itextpdf.kernel.pdf.canvas.draw.ILineDrawer;
-import com.itextpdf.layout.Document;
-import com.itextpdf.layout.element.LineSeparator;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;

blade-service/blade-manager/src/main/java/org/springblade/manager/unit/PdfConvertA4Utils.java → blade-service/blade-manager/src/main/java/org/springblade/manager/utils/PdfConvertA4Utils.java

@@ -1,4 +1,4 @@
-package org.springblade.manager.unit;
+package org.springblade.manager.utils;
 
 import com.itextpdf.text.Document;
 import com.itextpdf.text.PageSize;

blade-service/blade-manager/src/main/java/org/springblade/manager/unit/ProtoStuffSerializerUtil.java → blade-service/blade-manager/src/main/java/org/springblade/manager/utils/ProtoStuffSerializerUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.manager.unit;
+package org.springblade.manager.utils;
 
 import com.dyuproject.protostuff.LinkedBuffer;
 import com.dyuproject.protostuff.ProtostuffIOUtil;

blade-service/blade-manager/src/main/java/org/springblade/manager/unit/RedisUtil.java → blade-service/blade-manager/src/main/java/org/springblade/manager/utils/RedisUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.manager.unit;
+package org.springblade.manager.utils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;

blade-service/blade-manager/src/main/java/org/springblade/manager/unit/RegularExpressionUtil.java → blade-service/blade-manager/src/main/java/org/springblade/manager/utils/RegularExpressionUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.manager.unit;
+package org.springblade.manager.utils;
 
 /**
  * 正则表达式工具类

blade-service/blade-manager/src/main/java/org/springblade/manager/unit/WbsElementUtil.java → blade-service/blade-manager/src/main/java/org/springblade/manager/utils/WbsElementUtil.java

@@ -1,4 +1,4 @@
-package org.springblade.manager.unit;
+package org.springblade.manager.utils;
 
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;