代码生成模块移入 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

-<?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>
\ No newline at end of file

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

 <?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>
-            <charset>utf-8</charset>
+            <pattern>${log.pattern}</pattern>
+            <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-generator/src/main/java/me/zhengjie/domain/GenConfig.java → eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/GenConfig.java

-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-generator/src/main/java/me/zhengjie/domain/vo/ColumnInfo.java → eladmin-tools/src/main/java/me/zhengjie/modules/generator/domain/vo/ColumnInfo.java

-package me.zhengjie.domain.vo;
+package me.zhengjie.modules.generator.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

-package me.zhengjie.domain.vo;
+package me.zhengjie.modules.generator.domain.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

-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-generator/src/main/java/me/zhengjie/rest/GenConfigController.java → eladmin-tools/src/main/java/me/zhengjie/modules/generator/rest/GenConfigController.java

-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.service.GenConfigService;
+import me.zhengjie.modules.generator.domain.GenConfig;
+import me.zhengjie.modules.generator.service.GenConfigService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;

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

-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.service.GeneratorService;
+import me.zhengjie.modules.generator.domain.vo.ColumnInfo;
+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-generator/src/main/java/me/zhengjie/service/GenConfigService.java → eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GenConfigService.java

-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-generator/src/main/java/me/zhengjie/service/GeneratorService.java → eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/GeneratorService.java

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

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

-package me.zhengjie.service.impl;
+package me.zhengjie.modules.generator.service.impl;
 
-import me.zhengjie.domain.GenConfig;
-import me.zhengjie.repository.GenConfigRepository;
-import me.zhengjie.service.GenConfigService;
+import me.zhengjie.modules.generator.domain.GenConfig;
+import me.zhengjie.modules.generator.repository.GenConfigRepository;
+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-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java → eladmin-tools/src/main/java/me/zhengjie/modules/generator/service/impl/GeneratorServiceImpl.java

-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.utils.GenUtil;
+import me.zhengjie.modules.generator.domain.GenConfig;
+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-generator/src/main/java/me/zhengjie/utils/ColUtil.java → eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/ColUtil.java

-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-generator/src/main/java/me/zhengjie/utils/GenUtil.java → eladmin-tools/src/main/java/me/zhengjie/modules/generator/utils/GenUtil.java

-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.domain.vo.ColumnInfo;
+import me.zhengjie.modules.generator.domain.GenConfig;
+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/domain/AlipayConfig.java → eladmin-tools/src/main/java/me/zhengjie/modules/tools/domain/AlipayConfig.java

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

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

-package me.zhengjie.domain;
+package me.zhengjie.modules.tools.domain;
 
 import lombok.Data;