代码生成模块移入 tools模块中

README.md

@@ -58,7 +58,9 @@ eladmin基于 Spring Boot 2.1.0 、 Jpa、 Spring Security、redis、Vue的前
   - modules 系统相关模块(登录授权、系统监控、定时任务等)
 - eladmin-logging 系统日志模块
 - eladmin-tools 系统第三方工具模块
-- eladmin-generator 系统代码生成模块
+  - config 文件上传临时路径配置
+  - modules 工具相关模块(第三方工具、代码生成工具)
+    
 
 #### 系统预览
 <table>

eladmin-generator/pom.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>eladmin</artifactId>
-        <groupId>me.zhengjie</groupId>
-        <version>2.3</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>eladmin-generator</artifactId>
-    <name>代码生成模块</name>
-
-    <properties>
-        <configuration.version>1.9</configuration.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>me.zhengjie</groupId>
-            <artifactId>eladmin-common</artifactId>
-            <version>2.3</version>
-        </dependency>
-
-        <!--模板引擎-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
-        <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
-            <version>${configuration.version}</version>
-        </dependency>
-    </dependencies>
-</project>

eladmin-system/pom.xml

@@ -17,18 +17,8 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>me.zhengjie</groupId>
-            <artifactId>eladmin-generator</artifactId>
-            <version>2.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>me.zhengjie</groupId>
-                    <artifactId>eladmin-common</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
+        <!--    tools 模块包含了 common 和 logging 模块    -->
         <dependency>
             <groupId>me.zhengjie</groupId>
             <artifactId>eladmin-tools</artifactId>

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import me.zhengjie.aop.log.Log;
 import me.zhengjie.config.DataScope;
-import me.zhengjie.domain.VerificationCode;
+import me.zhengjie.modules.tools.domain.VerificationCode;
 import me.zhengjie.modules.system.domain.User;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.system.domain.vo.UserPassVo;
@@ -12,7 +12,7 @@ import me.zhengjie.modules.system.service.DeptService;
 import me.zhengjie.modules.system.service.RoleService;
 import me.zhengjie.modules.system.service.dto.RoleSmallDTO;
 import me.zhengjie.modules.system.service.dto.UserQueryCriteria;
-import me.zhengjie.service.VerificationCodeService;
+import me.zhengjie.modules.tools.service.VerificationCodeService;
 import me.zhengjie.utils.*;
 import me.zhengjie.modules.system.service.UserService;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/resources/logback.xml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
     <contextName>elAdmin</contextName>
+    <property name="log.charset" value="utf-8" />
+    <property name="log.pattern" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)" />
 
     <!--输出到控制台-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)</pattern>
+            <pattern>${log.pattern}</pattern>
-            <charset>utf-8</charset>
+            <charset>${log.charset}</charset>
         </encoder>
     </appender>
 

eladmin-tools/pom.xml

@@ -16,6 +16,7 @@
         <mail.version>1.4.7</mail.version>
         <qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
         <alipay.version>3.1.0</alipay.version>
+        <configuration.version>1.9</configuration.version>
     </properties>
 
     <dependencies>
@@ -33,6 +34,19 @@
             <version>${mail.version}</version>
         </dependency>
 
+        <!--模板引擎-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/commons-configuration/commons-configuration -->
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>${configuration.version}</version>
+        </dependency>
+
         <!--七牛云存储-->
         <dependency>
             <groupId>com.qiniu</groupId>

eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/GenConfig.java

@@ -1,7 +1,10 @@
-package me.zhengjie.domain;
+package me.zhengjie.modules.generator.domain;
 
 import lombok.Data;
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 
 /**
  * 代码生成配置

eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/ColumnInfo.java

@@ -1,4 +1,4 @@
-package me.zhengjie.domain.vo;
+package me.zhengjie.modules.generator.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/TableInfo.java

@@ -1,4 +1,4 @@
-package me.zhengjie.domain.vo;
+package me.zhengjie.modules.generator.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

eladmin-tools/src/main/java/me/zhengjie/modules/generator/repository/GenConfigRepository.java

@@ -1,6 +1,6 @@
-package me.zhengjie.repository;
+package me.zhengjie.modules.generator.repository;
 
-import me.zhengjie.domain.GenConfig;
+import me.zhengjie.modules.generator.domain.GenConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GenConfigController.java

@@ -1,9 +1,9 @@
-package me.zhengjie.rest;
+package me.zhengjie.modules.generator.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import me.zhengjie.domain.GenConfig;
+import me.zhengjie.modules.generator.domain.GenConfig;
-import me.zhengjie.service.GenConfigService;
+import me.zhengjie.modules.generator.service.GenConfigService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;

eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GeneratorController.java

@@ -1,16 +1,17 @@
-package me.zhengjie.rest;
+package me.zhengjie.modules.generator.rest;
 
 import cn.hutool.core.util.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import me.zhengjie.domain.vo.ColumnInfo;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.service.GenConfigService;
+import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
-import me.zhengjie.service.GeneratorService;
+import me.zhengjie.modules.generator.service.GenConfigService;
+import me.zhengjie.modules.generator.service.GeneratorService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 /**

eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GenConfigService.java

@@ -1,6 +1,6 @@
-package me.zhengjie.service;
+package me.zhengjie.modules.generator.service;
 
-import me.zhengjie.domain.GenConfig;
+import me.zhengjie.modules.generator.domain.GenConfig;
 
 /**
  * @author Zheng Jie

eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GeneratorService.java

@@ -1,7 +1,7 @@
-package me.zhengjie.service;
+package me.zhengjie.modules.generator.service;
 
-import me.zhengjie.domain.GenConfig;
+import me.zhengjie.modules.generator.domain.GenConfig;
-import me.zhengjie.domain.vo.ColumnInfo;
+import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
 import java.util.List;
 
 /**

eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GenConfigServiceImpl.java

@@ -1,8 +1,8 @@
-package me.zhengjie.service.impl;
+package me.zhengjie.modules.generator.service.impl;
 
-import me.zhengjie.domain.GenConfig;
+import me.zhengjie.modules.generator.domain.GenConfig;
-import me.zhengjie.repository.GenConfigRepository;
+import me.zhengjie.modules.generator.repository.GenConfigRepository;
-import me.zhengjie.service.GenConfigService;
+import me.zhengjie.modules.generator.service.GenConfigService;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;

eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GeneratorServiceImpl.java

@@ -1,12 +1,12 @@
-package me.zhengjie.service.impl;
+package me.zhengjie.modules.generator.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import me.zhengjie.domain.GenConfig;
-import me.zhengjie.domain.vo.ColumnInfo;
-import me.zhengjie.domain.vo.TableInfo;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.service.GeneratorService;
+import me.zhengjie.modules.generator.domain.GenConfig;
-import me.zhengjie.utils.GenUtil;
+import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
+import me.zhengjie.modules.generator.domain.vo.TableInfo;
+import me.zhengjie.modules.generator.service.GeneratorService;
+import me.zhengjie.modules.generator.utils.GenUtil;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.StringUtils;
 import org.springframework.stereotype.Service;

eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/ColUtil.java

@@ -1,6 +1,8 @@
-package me.zhengjie.utils;
+package me.zhengjie.modules.generator.utils;
 
-import org.apache.commons.configuration.*;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
 
 /**
  * sql字段转java

eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/GenUtil.java

@@ -1,10 +1,12 @@
-package me.zhengjie.utils;
+package me.zhengjie.modules.generator.utils;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.template.*;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.domain.GenConfig;
+import me.zhengjie.modules.generator.domain.GenConfig;
-import me.zhengjie.domain.vo.ColumnInfo;
+import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
+import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.StringUtils;
 import org.springframework.util.ObjectUtils;
 import java.io.File;
 import java.io.FileWriter;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/AlipayConfig.java

@@ -1,4 +1,4 @@
-package me.zhengjie.domain;
+package me.zhengjie.modules.tools.domain;
 
 import lombok.Data;
 import javax.persistence.*;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/EmailConfig.java

@@ -1,4 +1,4 @@
-package me.zhengjie.domain;
+package me.zhengjie.modules.tools.domain;
 
 import lombok.Data;
 

eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/LocalStorage.java

@@ -1,9 +1,8 @@
-package me.zhengjie.domain;
+package me.zhengjie.modules.tools.domain;
 
 import lombok.*;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
-import me.zhengjie.base.BaseEntity;
 import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/Picture.java

@@ -1,4 +1,4 @@
-package me.zhengjie.domain;
+package me.zhengjie.modules.tools.domain;
 
 import lombok.Data;
 import org.hibernate.annotations.CreationTimestamp;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuConfig.java

@@ -1,4 +1,4 @@
-package me.zhengjie.domain;
+package me.zhengjie.modules.tools.domain;
 
 import lombok.Data;
 import javax.persistence.*;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/QiniuContent.java

@@ -1,4 +1,4 @@
-package me.zhengjie.domain;
+package me.zhengjie.modules.tools.domain;
 
 import lombok.Data;
 import org.hibernate.annotations.UpdateTimestamp;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/VerificationCode.java

@@ -1,4 +1,4 @@
-package me.zhengjie.domain;
+package me.zhengjie.modules.tools.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/EmailVo.java

@@ -1,4 +1,4 @@
-package me.zhengjie.domain.vo;
+package me.zhengjie.modules.tools.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/vo/TradeVo.java

@@ -1,4 +1,4 @@
-package me.zhengjie.domain.vo;
+package me.zhengjie.modules.tools.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/AlipayRepository.java

@@ -1,6 +1,6 @@
-package me.zhengjie.repository;
+package me.zhengjie.modules.tools.repository;
 
-import me.zhengjie.domain.AlipayConfig;
+import me.zhengjie.modules.tools.domain.AlipayConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/EmailRepository.java

@@ -1,6 +1,6 @@
-package me.zhengjie.repository;
+package me.zhengjie.modules.tools.repository;
 
-import me.zhengjie.domain.EmailConfig;
+import me.zhengjie.modules.tools.domain.EmailConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/LocalStorageRepository.java

@@ -1,6 +1,6 @@
-package me.zhengjie.repository;
+package me.zhengjie.modules.tools.repository;
 
-import me.zhengjie.domain.LocalStorage;
+import me.zhengjie.modules.tools.domain.LocalStorage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/PictureRepository.java

@@ -1,6 +1,6 @@
-package me.zhengjie.repository;
+package me.zhengjie.modules.tools.repository;
 
-import me.zhengjie.domain.Picture;
+import me.zhengjie.modules.tools.domain.Picture;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiNiuConfigRepository.java

@@ -1,6 +1,6 @@
-package me.zhengjie.repository;
+package me.zhengjie.modules.tools.repository;
 
-import me.zhengjie.domain.QiniuConfig;
+import me.zhengjie.modules.tools.domain.QiniuConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/QiniuContentRepository.java

@@ -1,6 +1,6 @@
-package me.zhengjie.repository;
+package me.zhengjie.modules.tools.repository;
 
-import me.zhengjie.domain.QiniuContent;
+import me.zhengjie.modules.tools.domain.QiniuContent;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-tools/src/main/java/me/zhengjie/modules/tools/repository/VerificationCodeRepository.java

@@ -1,6 +1,6 @@
-package me.zhengjie.repository;
+package me.zhengjie.modules.tools.repository;
 
-import me.zhengjie.domain.VerificationCode;
+import me.zhengjie.modules.tools.domain.VerificationCode;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/AliPayController.java

@@ -1,15 +1,15 @@
-package me.zhengjie.rest;
+package me.zhengjie.modules.tools.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.AnonymousAccess;
 import me.zhengjie.aop.log.Log;
-import me.zhengjie.domain.AlipayConfig;
+import me.zhengjie.modules.tools.domain.AlipayConfig;
-import me.zhengjie.domain.vo.TradeVo;
+import me.zhengjie.modules.tools.domain.vo.TradeVo;
-import me.zhengjie.service.AlipayService;
+import me.zhengjie.modules.tools.utils.AliPayStatusEnum;
-import me.zhengjie.utils.AliPayStatusEnum;
+import me.zhengjie.modules.tools.utils.AlipayUtils;
-import me.zhengjie.utils.AlipayUtils;
+import me.zhengjie.modules.tools.service.AlipayService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/EmailController.java

@@ -1,11 +1,11 @@
-package me.zhengjie.rest;
+package me.zhengjie.modules.tools.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import me.zhengjie.aop.log.Log;
-import me.zhengjie.domain.EmailConfig;
+import me.zhengjie.modules.tools.domain.EmailConfig;
-import me.zhengjie.domain.vo.EmailVo;
+import me.zhengjie.modules.tools.domain.vo.EmailVo;
-import me.zhengjie.service.EmailService;
+import me.zhengjie.modules.tools.service.EmailService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/LocalStorageController.java

@@ -1,9 +1,9 @@
-package me.zhengjie.rest;
+package me.zhengjie.modules.tools.rest;
 
 import me.zhengjie.aop.log.Log;
-import me.zhengjie.domain.LocalStorage;
+import me.zhengjie.modules.tools.domain.LocalStorage;
-import me.zhengjie.service.LocalStorageService;
+import me.zhengjie.modules.tools.service.LocalStorageService;
-import me.zhengjie.service.dto.LocalStorageQueryCriteria;
+import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/PictureController.java

@@ -1,11 +1,11 @@
-package me.zhengjie.rest;
+package me.zhengjie.modules.tools.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import me.zhengjie.aop.log.Log;
-import me.zhengjie.domain.Picture;
+import me.zhengjie.modules.tools.domain.Picture;
-import me.zhengjie.service.PictureService;
+import me.zhengjie.modules.tools.service.PictureService;
-import me.zhengjie.service.dto.PictureQueryCriteria;
+import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria;
 import me.zhengjie.utils.SecurityUtils;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/QiniuController.java

@@ -1,13 +1,13 @@
-package me.zhengjie.rest;
+package me.zhengjie.modules.tools.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.aop.log.Log;
-import me.zhengjie.domain.QiniuConfig;
+import me.zhengjie.modules.tools.domain.QiniuConfig;
-import me.zhengjie.domain.QiniuContent;
+import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria;
-import me.zhengjie.service.QiNiuService;
+import me.zhengjie.modules.tools.domain.QiniuContent;
-import me.zhengjie.service.dto.QiniuQueryCriteria;
+import me.zhengjie.modules.tools.service.QiNiuService;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/rest/VerificationCodeController.java

@@ -1,11 +1,11 @@
-package me.zhengjie.rest;
+package me.zhengjie.modules.tools.rest;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import me.zhengjie.domain.VerificationCode;
+import me.zhengjie.modules.tools.domain.VerificationCode;
-import me.zhengjie.domain.vo.EmailVo;
+import me.zhengjie.modules.tools.domain.vo.EmailVo;
-import me.zhengjie.service.EmailService;
+import me.zhengjie.modules.tools.service.EmailService;
-import me.zhengjie.service.VerificationCodeService;
+import me.zhengjie.modules.tools.service.VerificationCodeService;
 import me.zhengjie.utils.ElAdminConstant;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/AlipayService.java

@@ -1,7 +1,7 @@
-package me.zhengjie.service;
+package me.zhengjie.modules.tools.service;
 
-import me.zhengjie.domain.AlipayConfig;
+import me.zhengjie.modules.tools.domain.AlipayConfig;
-import me.zhengjie.domain.vo.TradeVo;
+import me.zhengjie.modules.tools.domain.vo.TradeVo;
 
 /**
  * @author Zheng Jie

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/EmailService.java

@@ -1,7 +1,7 @@
-package me.zhengjie.service;
+package me.zhengjie.modules.tools.service;
 
-import me.zhengjie.domain.EmailConfig;
+import me.zhengjie.modules.tools.domain.EmailConfig;
-import me.zhengjie.domain.vo.EmailVo;
+import me.zhengjie.modules.tools.domain.vo.EmailVo;
 import org.springframework.scheduling.annotation.Async;
 
 /**

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/LocalStorageService.java

@@ -1,8 +1,8 @@
-package me.zhengjie.service;
+package me.zhengjie.modules.tools.service;
 
-import me.zhengjie.domain.LocalStorage;
+import me.zhengjie.modules.tools.domain.LocalStorage;
-import me.zhengjie.service.dto.LocalStorageDTO;
+import me.zhengjie.modules.tools.service.dto.LocalStorageDTO;
-import me.zhengjie.service.dto.LocalStorageQueryCriteria;
+import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/PictureService.java

@@ -1,7 +1,7 @@
-package me.zhengjie.service;
+package me.zhengjie.modules.tools.service;
 
-import me.zhengjie.domain.Picture;
+import me.zhengjie.modules.tools.domain.Picture;
-import me.zhengjie.service.dto.PictureQueryCriteria;
+import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/QiNiuService.java

@@ -1,8 +1,8 @@
-package me.zhengjie.service;
+package me.zhengjie.modules.tools.service;
 
-import me.zhengjie.domain.QiniuConfig;
+import me.zhengjie.modules.tools.domain.QiniuConfig;
-import me.zhengjie.domain.QiniuContent;
+import me.zhengjie.modules.tools.domain.QiniuContent;
-import me.zhengjie.service.dto.QiniuQueryCriteria;
+import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/VerificationCodeService.java

@@ -1,7 +1,7 @@
-package me.zhengjie.service;
+package me.zhengjie.modules.tools.service;
 
-import me.zhengjie.domain.VerificationCode;
+import me.zhengjie.modules.tools.domain.VerificationCode;
-import me.zhengjie.domain.vo.EmailVo;
+import me.zhengjie.modules.tools.domain.vo.EmailVo;
 
 /**
  * @author Zheng Jie

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageDTO.java

@@ -1,4 +1,4 @@
-package me.zhengjie.service.dto;
+package me.zhengjie.modules.tools.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/LocalStorageQueryCriteria.java

@@ -1,4 +1,4 @@
-package me.zhengjie.service.dto;
+package me.zhengjie.modules.tools.service.dto;
 
 import lombok.Data;
 import java.sql.Timestamp;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/PictureQueryCriteria.java

@@ -1,4 +1,4 @@
-package me.zhengjie.service.dto;
+package me.zhengjie.modules.tools.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/dto/QiniuQueryCriteria.java

@@ -1,4 +1,4 @@
-package me.zhengjie.service.dto;
+package me.zhengjie.modules.tools.service.dto;
 
 import lombok.Data;
 import me.zhengjie.annotation.Query;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/AlipayServiceImpl.java

@@ -1,14 +1,14 @@
-package me.zhengjie.service.impl;
+package me.zhengjie.modules.tools.service.impl;
 
 import com.alipay.api.AlipayClient;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.request.AlipayTradePagePayRequest;
 import com.alipay.api.request.AlipayTradeWapPayRequest;
-import me.zhengjie.domain.AlipayConfig;
+import me.zhengjie.modules.tools.domain.AlipayConfig;
-import me.zhengjie.domain.vo.TradeVo;
+import me.zhengjie.modules.tools.domain.vo.TradeVo;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.repository.AlipayRepository;
+import me.zhengjie.modules.tools.repository.AlipayRepository;
-import me.zhengjie.service.AlipayService;
+import me.zhengjie.modules.tools.service.AlipayService;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/EmailServiceImpl.java

@@ -1,12 +1,12 @@
-package me.zhengjie.service.impl;
+package me.zhengjie.modules.tools.service.impl;
 
 import cn.hutool.extra.mail.Mail;
 import cn.hutool.extra.mail.MailAccount;
-import me.zhengjie.domain.EmailConfig;
+import me.zhengjie.modules.tools.domain.EmailConfig;
-import me.zhengjie.domain.vo.EmailVo;
+import me.zhengjie.modules.tools.domain.vo.EmailVo;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.repository.EmailRepository;
+import me.zhengjie.modules.tools.repository.EmailRepository;
-import me.zhengjie.service.EmailService;
+import me.zhengjie.modules.tools.service.EmailService;
 import me.zhengjie.utils.EncryptUtils;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CachePut;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/LocalStorageServiceImpl.java

@@ -1,14 +1,14 @@
-package me.zhengjie.service.impl;
+package me.zhengjie.modules.tools.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import me.zhengjie.domain.LocalStorage;
+import me.zhengjie.modules.tools.domain.LocalStorage;
+import me.zhengjie.modules.tools.service.dto.LocalStorageDTO;
+import me.zhengjie.modules.tools.service.dto.LocalStorageQueryCriteria;
+import me.zhengjie.modules.tools.service.mapper.LocalStorageMapper;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.utils.*;
-import me.zhengjie.repository.LocalStorageRepository;
+import me.zhengjie.modules.tools.repository.LocalStorageRepository;
-import me.zhengjie.service.LocalStorageService;
+import me.zhengjie.modules.tools.service.LocalStorageService;
-import me.zhengjie.service.dto.LocalStorageDTO;
-import me.zhengjie.service.dto.LocalStorageQueryCriteria;
-import me.zhengjie.service.mapper.LocalStorageMapper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/PictureServiceImpl.java

@@ -1,15 +1,15 @@
-package me.zhengjie.service.impl;
+package me.zhengjie.modules.tools.service.impl;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.domain.Picture;
+import me.zhengjie.modules.tools.domain.Picture;
+import me.zhengjie.modules.tools.repository.PictureRepository;
+import me.zhengjie.modules.tools.service.PictureService;
+import me.zhengjie.modules.tools.service.dto.PictureQueryCriteria;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.repository.PictureRepository;
-import me.zhengjie.service.PictureService;
-import me.zhengjie.service.dto.PictureQueryCriteria;
 import me.zhengjie.utils.*;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/QiNiuServiceImpl.java

@@ -1,4 +1,4 @@
-package me.zhengjie.service.impl;
+package me.zhengjie.modules.tools.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.qiniu.common.QiniuException;
@@ -9,16 +9,16 @@ import com.qiniu.storage.UploadManager;
 import com.qiniu.storage.model.DefaultPutRet;
 import com.qiniu.storage.model.FileInfo;
 import com.qiniu.util.Auth;
-import me.zhengjie.domain.QiniuConfig;
+import me.zhengjie.modules.tools.domain.QiniuConfig;
-import me.zhengjie.domain.QiniuContent;
+import me.zhengjie.modules.tools.domain.QiniuContent;
+import me.zhengjie.modules.tools.repository.QiniuContentRepository;
+import me.zhengjie.modules.tools.service.dto.QiniuQueryCriteria;
+import me.zhengjie.modules.tools.utils.QiNiuUtil;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.repository.QiNiuConfigRepository;
+import me.zhengjie.modules.tools.repository.QiNiuConfigRepository;
-import me.zhengjie.repository.QiniuContentRepository;
+import me.zhengjie.modules.tools.service.QiNiuService;
-import me.zhengjie.service.QiNiuService;
-import me.zhengjie.service.dto.QiniuQueryCriteria;
 import me.zhengjie.utils.FileUtil;
 import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QiNiuUtil;
 import me.zhengjie.utils.QueryHelp;
 import me.zhengjie.utils.ValidationUtil;
 import org.springframework.beans.factory.annotation.Value;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/impl/VerificationCodeServiceImpl.java

@@ -1,4 +1,4 @@
-package me.zhengjie.service.impl;
+package me.zhengjie.modules.tools.service.impl;
 
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.RandomUtil;
@@ -6,11 +6,11 @@ import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
-import me.zhengjie.domain.VerificationCode;
+import me.zhengjie.modules.tools.domain.VerificationCode;
-import me.zhengjie.domain.vo.EmailVo;
+import me.zhengjie.modules.tools.domain.vo.EmailVo;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.repository.VerificationCodeRepository;
+import me.zhengjie.modules.tools.repository.VerificationCodeRepository;
-import me.zhengjie.service.VerificationCodeService;
+import me.zhengjie.modules.tools.service.VerificationCodeService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/service/mapper/LocalStorageMapper.java

@@ -1,8 +1,8 @@
-package me.zhengjie.service.mapper;
+package me.zhengjie.modules.tools.service.mapper;
 
 import me.zhengjie.base.BaseMapper;
-import me.zhengjie.domain.LocalStorage;
+import me.zhengjie.modules.tools.service.dto.LocalStorageDTO;
-import me.zhengjie.service.dto.LocalStorageDTO;
+import me.zhengjie.modules.tools.domain.LocalStorage;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AliPayStatusEnum.java

@@ -1,4 +1,4 @@
-package me.zhengjie.utils;
+package me.zhengjie.modules.tools.utils;
 
 /**
  * 支付状态

eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/AlipayUtils.java

@@ -1,8 +1,8 @@
-package me.zhengjie.utils;
+package me.zhengjie.modules.tools.utils;
 
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.internal.util.AlipaySignature;
-import me.zhengjie.domain.AlipayConfig;
+import me.zhengjie.modules.tools.domain.AlipayConfig;
 import org.springframework.stereotype.Component;
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;

eladmin-tools/src/main/java/me/zhengjie/modules/tools/utils/QiNiuUtil.java

@@ -1,6 +1,8 @@
-package me.zhengjie.utils;
+package me.zhengjie.modules.tools.utils;
 
 import com.qiniu.storage.Region;
+import me.zhengjie.utils.FileUtil;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 

pom.xml

@@ -14,7 +14,6 @@
         <module>eladmin-logging</module>
         <module>eladmin-system</module>
         <module>eladmin-tools</module>
-        <module>eladmin-generator</module>
     </modules>
 
     <name>EL-ADMIN后台管理系统</name>
@@ -24,7 +23,6 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.1.0.RELEASE</version>
-        <relativePath/>
     </parent>
 
     <properties>
@@ -42,7 +40,6 @@
     </properties>
 
     <dependencies>
-
         <!--Spring boot start-->
         <dependency>
             <groupId>org.springframework.boot</groupId>