From e91d35af2cf2fca14a061785843d8ebcef8e557d Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Thu, 15 Apr 2021 18:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=AF=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vip/xiaonuo/core/enums/CommonStatusEnum.java | 2 +- .../vip/xiaonuo/core/exception/AuthException.java | 2 +- .../core/exception/PermissionException.java | 2 +- .../xiaonuo/core/exception/ServiceException.java | 2 +- .../xiaonuo/core/factory/TreeBuildFactory.java | 2 +- .../file/modular/tencent/TenFileOperator.java | 8 ++++---- .../xiaonuo/core/pojo/druid/DruidProperties.java | 2 +- .../vip/xiaonuo/core/pojo/login/SysLoginUser.java | 4 ++-- .../xiaonuo/core/pojo/node/AntdBaseTreeNode.java | 2 +- .../core/pojo/node/CommonBaseTreeNode.java | 2 +- .../core/sms/modular/aliyun/AliyunSmsSender.java | 2 +- .../sms/modular/tencent/TencentSmsSender.java | 6 +++--- .../core/tenant/params/TenantInfoParam.java | 2 +- .../java/vip/xiaonuo/core/util/AopTargetUtil.java | 2 +- .../vip/xiaonuo/core/util/HttpServletUtil.java | 4 ++-- .../vip/xiaonuo/core/util/LibreOfficeUtil.java | 6 +++--- .../SnowyRequestResponseBodyMethodProcessor.java | 2 +- .../generate/core/context/XnVelocityContext.java | 4 +--- .../generate/core/param/XnCodeGenParam.java | 4 ++-- .../java/vip/xiaonuo/generate/core/util/Util.java | 4 ++-- .../controller/CodeGenerateController.java | 8 ++++++-- .../SysCodeGenerateConfigController.java | 11 ++++++----- .../generate/modular/entity/CodeGenerate.java | 2 +- .../modular/entity/SysCodeGenerateConfig.java | 2 +- .../modular/mapper/CodeGenerateMapper.java | 5 +++-- .../generate/modular/param/CodeGenerateParam.java | 5 +++-- .../modular/param/SysCodeGenerateConfigParam.java | 2 +- .../modular/service/CodeGenerateService.java | 1 + .../service/SysCodeGenerateConfigService.java | 1 - .../service/impl/CodeGenerateServiceImpl.java | 15 ++++++++------- .../impl/SysCodeGenerateConfigServiceImpl.java | 5 +++-- 31 files changed, 64 insertions(+), 57 deletions(-) diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/enums/CommonStatusEnum.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/enums/CommonStatusEnum.java index 35e52701..6140f1df 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/enums/CommonStatusEnum.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/enums/CommonStatusEnum.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.core.enums; +import lombok.Getter; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.exception.enums.StatusExceptionEnum; -import lombok.Getter; /** * 公共状态 diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/AuthException.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/AuthException.java index 36346e3e..0ecef27d 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/AuthException.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/AuthException.java @@ -24,8 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.core.exception; -import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; import lombok.Getter; +import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; /** * 认证相关的异常 diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/PermissionException.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/PermissionException.java index 40cda876..2d3932ce 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/PermissionException.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/PermissionException.java @@ -24,8 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.core.exception; -import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; import lombok.Getter; +import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; /** * 授权和鉴权异常 diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/ServiceException.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/ServiceException.java index 668795bb..5ecca852 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/ServiceException.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/ServiceException.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.core.exception; -import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; /** * 业务异常 diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/factory/TreeBuildFactory.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/factory/TreeBuildFactory.java index e4858d45..fa275349 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/factory/TreeBuildFactory.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/factory/TreeBuildFactory.java @@ -26,8 +26,8 @@ package vip.xiaonuo.core.factory; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import lombok.Data; +import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import java.util.ArrayList; import java.util.List; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/file/modular/tencent/TenFileOperator.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/file/modular/tencent/TenFileOperator.java index 5c31b7f4..74e36cdd 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/file/modular/tencent/TenFileOperator.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/file/modular/tencent/TenFileOperator.java @@ -25,10 +25,6 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.core.file.modular.tencent; import cn.hutool.core.io.IoUtil; -import vip.xiaonuo.core.file.FileOperator; -import vip.xiaonuo.core.file.common.enums.BucketAuthEnum; -import vip.xiaonuo.core.file.modular.tencent.exp.TencentFileServiceException; -import vip.xiaonuo.core.file.modular.tencent.prop.TenCosProperties; import com.qcloud.cos.COSClient; import com.qcloud.cos.ClientConfig; import com.qcloud.cos.auth.BasicCOSCredentials; @@ -40,6 +36,10 @@ import com.qcloud.cos.model.*; import com.qcloud.cos.region.Region; import com.qcloud.cos.transfer.TransferManager; import com.qcloud.cos.transfer.TransferManagerConfiguration; +import vip.xiaonuo.core.file.FileOperator; +import vip.xiaonuo.core.file.common.enums.BucketAuthEnum; +import vip.xiaonuo.core.file.modular.tencent.exp.TencentFileServiceException; +import vip.xiaonuo.core.file.modular.tencent.prop.TenCosProperties; import javax.activation.MimetypesFileTypeMap; import java.io.ByteArrayInputStream; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/druid/DruidProperties.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/druid/DruidProperties.java index 36a31ad3..f79f1c38 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/druid/DruidProperties.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/druid/DruidProperties.java @@ -26,8 +26,8 @@ package vip.xiaonuo.core.pojo.druid; import cn.hutool.log.Log; import com.alibaba.druid.pool.DruidDataSource; -import vip.xiaonuo.core.enums.DbIdEnum; import lombok.Data; +import vip.xiaonuo.core.enums.DbIdEnum; import java.sql.SQLException; import java.util.Properties; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/login/SysLoginUser.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/login/SysLoginUser.java index 3f61826c..7b3785cc 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/login/SysLoginUser.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/login/SysLoginUser.java @@ -27,11 +27,11 @@ package vip.xiaonuo.core.pojo.login; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; -import vip.xiaonuo.core.consts.CommonConstant; -import vip.xiaonuo.core.pojo.node.LoginMenuTreeNode; import lombok.Data; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; +import vip.xiaonuo.core.consts.CommonConstant; +import vip.xiaonuo.core.pojo.node.LoginMenuTreeNode; import java.io.Serializable; import java.util.ArrayList; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/node/AntdBaseTreeNode.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/node/AntdBaseTreeNode.java index deef0fd0..a5a18b75 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/node/AntdBaseTreeNode.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/node/AntdBaseTreeNode.java @@ -24,8 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.core.pojo.node; -import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import lombok.Data; +import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import java.util.List; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/node/CommonBaseTreeNode.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/node/CommonBaseTreeNode.java index c7e313a7..4c5ed2e4 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/node/CommonBaseTreeNode.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/pojo/node/CommonBaseTreeNode.java @@ -24,8 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.core.pojo.node; -import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import lombok.Data; +import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import java.util.List; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/sms/modular/aliyun/AliyunSmsSender.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/sms/modular/aliyun/AliyunSmsSender.java index 62ba153b..553aa9a5 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/sms/modular/aliyun/AliyunSmsSender.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/sms/modular/aliyun/AliyunSmsSender.java @@ -33,12 +33,12 @@ import com.aliyuncs.DefaultAcsClient; import com.aliyuncs.IAcsClient; import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.profile.DefaultProfile; +import lombok.extern.slf4j.Slf4j; import vip.xiaonuo.core.sms.SmsSender; import vip.xiaonuo.core.sms.modular.aliyun.enums.AliyunSmsResultEnum; import vip.xiaonuo.core.sms.modular.aliyun.exp.AliyunSmsException; import vip.xiaonuo.core.sms.modular.aliyun.msign.MultiSignManager; import vip.xiaonuo.core.sms.modular.aliyun.prop.AliyunSmsProperties; -import lombok.extern.slf4j.Slf4j; import java.util.Map; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/sms/modular/tencent/TencentSmsSender.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/sms/modular/tencent/TencentSmsSender.java index 7b125776..9f8d5f59 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/sms/modular/tencent/TencentSmsSender.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/sms/modular/tencent/TencentSmsSender.java @@ -25,9 +25,6 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.core.sms.modular.tencent; import cn.hutool.core.util.ArrayUtil; -import vip.xiaonuo.core.sms.SmsSender; -import vip.xiaonuo.core.sms.modular.tencent.exp.TencentSmsException; -import vip.xiaonuo.core.sms.modular.tencent.prop.TencentSmsProperties; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.exception.TencentCloudSDKException; import com.tencentcloudapi.common.profile.ClientProfile; @@ -36,6 +33,9 @@ import com.tencentcloudapi.sms.v20190711.SmsClient; import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest; import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse; import com.tencentcloudapi.sms.v20190711.models.SendStatus; +import vip.xiaonuo.core.sms.SmsSender; +import vip.xiaonuo.core.sms.modular.tencent.exp.TencentSmsException; +import vip.xiaonuo.core.sms.modular.tencent.prop.TencentSmsProperties; import java.util.Collection; import java.util.LinkedList; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/tenant/params/TenantInfoParam.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/tenant/params/TenantInfoParam.java index 8a7ddcd2..04131ae1 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/tenant/params/TenantInfoParam.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/tenant/params/TenantInfoParam.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.core.tenant.params; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/AopTargetUtil.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/AopTargetUtil.java index 6a7e4ee7..3b6eb532 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/AopTargetUtil.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/AopTargetUtil.java @@ -25,10 +25,10 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.core.util; import cn.hutool.log.Log; -import vip.xiaonuo.core.context.requestno.RequestNoContext; import org.springframework.aop.framework.AdvisedSupport; import org.springframework.aop.framework.AopProxy; import org.springframework.aop.support.AopUtils; +import vip.xiaonuo.core.context.requestno.RequestNoContext; import java.lang.reflect.Field; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/HttpServletUtil.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/HttpServletUtil.java index 1578f63b..09d465fe 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/HttpServletUtil.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/HttpServletUtil.java @@ -24,10 +24,10 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.core.util; -import vip.xiaonuo.core.exception.ServiceException; -import vip.xiaonuo.core.exception.enums.ServerExceptionEnum; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import vip.xiaonuo.core.exception.ServiceException; +import vip.xiaonuo.core.exception.enums.ServerExceptionEnum; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/LibreOfficeUtil.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/LibreOfficeUtil.java index 2f4d6451..8d4a1fb0 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/LibreOfficeUtil.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/LibreOfficeUtil.java @@ -26,13 +26,13 @@ package vip.xiaonuo.core.util; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.log.Log; -import vip.xiaonuo.core.consts.MediaTypeConstant; -import vip.xiaonuo.core.enums.DocumentFormatEnum; -import vip.xiaonuo.core.exception.LibreOfficeException; import org.jodconverter.DocumentConverter; import org.jodconverter.document.DocumentFormat; import org.jodconverter.office.OfficeException; import org.springframework.http.MediaType; +import vip.xiaonuo.core.consts.MediaTypeConstant; +import vip.xiaonuo.core.enums.DocumentFormatEnum; +import vip.xiaonuo.core.exception.LibreOfficeException; import java.io.IOException; import java.io.InputStream; diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/web/SnowyRequestResponseBodyMethodProcessor.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/web/SnowyRequestResponseBodyMethodProcessor.java index 86775c71..d3f3c41a 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/web/SnowyRequestResponseBodyMethodProcessor.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/web/SnowyRequestResponseBodyMethodProcessor.java @@ -24,7 +24,6 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.core.web; -import vip.xiaonuo.core.context.param.RequestParamContext; import org.springframework.core.Conventions; import org.springframework.core.MethodParameter; import org.springframework.http.converter.HttpMessageConverter; @@ -36,6 +35,7 @@ import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor; +import vip.xiaonuo.core.context.param.RequestParamContext; import java.util.List; diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/context/XnVelocityContext.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/context/XnVelocityContext.java index 2cf99ce3..eeecc99c 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/context/XnVelocityContext.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/context/XnVelocityContext.java @@ -24,12 +24,10 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.generate.core.context; -import com.baomidou.mybatisplus.annotation.IdType; +import org.apache.velocity.VelocityContext; import vip.xiaonuo.core.enums.YesOrNotEnum; import vip.xiaonuo.generate.core.param.XnCodeGenParam; import vip.xiaonuo.generate.modular.entity.SysCodeGenerateConfig; -import vip.xiaonuo.sys.config.MybatisConfig; -import org.apache.velocity.VelocityContext; import java.util.ArrayList; import java.util.List; diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java index 0bbb38f0..9a2fc1d9 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/param/XnCodeGenParam.java @@ -24,10 +24,10 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.generate.core.param; +import lombok.Data; import vip.xiaonuo.generate.core.config.Config; import vip.xiaonuo.generate.modular.entity.SysCodeGenerateConfig; -import vip.xiaonuo.generate.modular.param.SysCodeGenerateConfigParam; -import lombok.Data; + import java.util.List; @Data diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/util/Util.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/util/Util.java index c9f6cc01..0109f810 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/util/Util.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/core/util/Util.java @@ -24,11 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.generate.core.util; +import org.apache.commons.io.IOUtils; +import org.apache.velocity.app.Velocity; import vip.xiaonuo.core.consts.CommonConstant; import vip.xiaonuo.core.context.constant.ConstantContext; import vip.xiaonuo.core.enums.DbIdEnum; -import org.apache.commons.io.IOUtils; -import org.apache.velocity.app.Velocity; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/controller/CodeGenerateController.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/controller/CodeGenerateController.java index 8abec77c..b4b1c739 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/controller/CodeGenerateController.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/controller/CodeGenerateController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.generate.modular.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.context.constant.ConstantContextHolder; @@ -33,8 +38,7 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.generate.modular.param.CodeGenerateParam; import vip.xiaonuo.generate.modular.service.CodeGenerateService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; + import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/controller/SysCodeGenerateConfigController.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/controller/SysCodeGenerateConfigController.java index afa258f3..5d01b43e 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/controller/SysCodeGenerateConfigController.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/controller/SysCodeGenerateConfigController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.generate.modular.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; @@ -31,11 +36,7 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.generate.modular.param.SysCodeGenerateConfigParam; import vip.xiaonuo.generate.modular.service.SysCodeGenerateConfigService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; + import javax.annotation.Resource; /** diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/CodeGenerate.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/CodeGenerate.java index 42d8555d..8cf49084 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/CodeGenerate.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/CodeGenerate.java @@ -27,9 +27,9 @@ package vip.xiaonuo.generate.modular.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** * 代码生成基础配置 diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/SysCodeGenerateConfig.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/SysCodeGenerateConfig.java index d91c92ff..5667baab 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/SysCodeGenerateConfig.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/entity/SysCodeGenerateConfig.java @@ -27,9 +27,9 @@ package vip.xiaonuo.generate.modular.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** * 代码生成详细配置 diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/mapper/CodeGenerateMapper.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/mapper/CodeGenerateMapper.java index 07a50305..3f008e95 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/mapper/CodeGenerateMapper.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/mapper/CodeGenerateMapper.java @@ -24,11 +24,12 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.generate.modular.mapper; -import vip.xiaonuo.generate.modular.entity.CodeGenerate; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import vip.xiaonuo.generate.modular.entity.CodeGenerate; import vip.xiaonuo.generate.modular.result.InforMationColumnsResult; import vip.xiaonuo.generate.modular.result.InformationResult; -import org.apache.ibatis.annotations.Param; + import java.util.List; /** diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/CodeGenerateParam.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/CodeGenerateParam.java index fd41e059..c7538b26 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/CodeGenerateParam.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/CodeGenerateParam.java @@ -24,10 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.generate.modular.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; -import vip.xiaonuo.core.validation.flag.FlagValue; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; +import vip.xiaonuo.core.validation.flag.FlagValue; + import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/SysCodeGenerateConfigParam.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/SysCodeGenerateConfigParam.java index 00e95706..ee18e329 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/SysCodeGenerateConfigParam.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/param/SysCodeGenerateConfigParam.java @@ -24,8 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.generate.modular.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import javax.validation.constraints.NotEmpty; import java.util.List; diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/CodeGenerateService.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/CodeGenerateService.java index 21b1449e..aabd3f41 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/CodeGenerateService.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/CodeGenerateService.java @@ -29,6 +29,7 @@ import vip.xiaonuo.core.pojo.page.PageResult; import vip.xiaonuo.generate.modular.entity.CodeGenerate; import vip.xiaonuo.generate.modular.param.CodeGenerateParam; import vip.xiaonuo.generate.modular.result.InformationResult; + import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/SysCodeGenerateConfigService.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/SysCodeGenerateConfigService.java index 413d2d06..b99c4420 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/SysCodeGenerateConfigService.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/SysCodeGenerateConfigService.java @@ -25,7 +25,6 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.generate.modular.service; import com.baomidou.mybatisplus.extension.service.IService; -import vip.xiaonuo.core.pojo.page.PageResult; import vip.xiaonuo.generate.modular.entity.CodeGenerate; import vip.xiaonuo.generate.modular.entity.SysCodeGenerateConfig; import vip.xiaonuo.generate.modular.param.SysCodeGenerateConfigParam; diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java index cccff52a..59246cb2 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java @@ -28,13 +28,19 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.io.IOUtils; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.Velocity; +import org.apache.velocity.app.VelocityEngine; +import org.springframework.stereotype.Service; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.factory.PageFactory; import vip.xiaonuo.core.pojo.page.PageResult; +import vip.xiaonuo.generate.core.config.Config; import vip.xiaonuo.generate.core.context.XnVelocityContext; import vip.xiaonuo.generate.core.param.XnCodeGenParam; import vip.xiaonuo.generate.core.tool.StringDateTool; -import vip.xiaonuo.generate.core.config.Config; import vip.xiaonuo.generate.core.util.Util; import vip.xiaonuo.generate.modular.entity.CodeGenerate; import vip.xiaonuo.generate.modular.entity.SysCodeGenerateConfig; @@ -46,12 +52,7 @@ import vip.xiaonuo.generate.modular.result.InforMationColumnsResult; import vip.xiaonuo.generate.modular.result.InformationResult; import vip.xiaonuo.generate.modular.service.CodeGenerateService; import vip.xiaonuo.generate.modular.service.SysCodeGenerateConfigService; -import org.apache.commons.io.IOUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.app.VelocityEngine; -import org.springframework.stereotype.Service; + import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.*; diff --git a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/SysCodeGenerateConfigServiceImpl.java b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/SysCodeGenerateConfigServiceImpl.java index 8878cba6..db193ee0 100644 --- a/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/SysCodeGenerateConfigServiceImpl.java +++ b/snowy-base/snowy-gen/src/main/java/vip/xiaonuo/generate/modular/service/impl/SysCodeGenerateConfigServiceImpl.java @@ -28,6 +28,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.enums.YesOrNotEnum; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.generate.core.config.Config; @@ -43,8 +45,7 @@ import vip.xiaonuo.generate.modular.mapper.SysCodeGenerateConfigMapper; import vip.xiaonuo.generate.modular.param.SysCodeGenerateConfigParam; import vip.xiaonuo.generate.modular.result.InforMationColumnsResult; import vip.xiaonuo.generate.modular.service.SysCodeGenerateConfigService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; + import java.util.List; /**