!22 优化几个小问题

1、批量生成代码遍历表名的问题 2、增加对代码生成的数据库表按照创建时间倒序排列，便于使用 3、更改代码生成器中domain代码模板，更改BaseDO的位置 4、GenUtils优化，增加另外两种时间类型的识别，date及timestamp

.gitignore

@@ -4,3 +4,9 @@
 .factorypath
 /.DS_Store
 /ifast.iml
+
+.yml
+
+.idea
+
+*.iml

pom.xml

@@ -92,48 +92,6 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 		</profile>
-		<profile>
-			<id>prod</id>
-			<properties>
-				<activatedProperties>prod</activatedProperties>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>net.alchim31.maven</groupId>
-						<artifactId>yuicompressor-maven-plugin</artifactId>
-						<version>1.3.0</version>
-						<executions>
-							<execution>
-								<id>cpjscs</id>
-								<phase>prepare-package</phase>
-								<goals>
-									<goal>compress</goal>
-								</goals>
-							</execution>
-						</executions>
-						<configuration>
-							<includes>
-								<include>js/appjs/**/*.js</include>
-								<include>css/*.css</include>
-								<include>css/blog/*.css</include>
-							</includes>
-							<excludes>
-								<exclude>js/appjs/common/generator/edit.js</exclude>
-							</excludes>
-							<encoding>utf8</encoding>
-							<failOnWarning>false</failOnWarning>
-							<force>false</force>
-							<nosuffix>true</nosuffix>
-							<linebreakpos>-1</linebreakpos>
-							<sourceDirectory>src/main/resources/static</sourceDirectory>
-							<outputDirectory>target/classes/static</outputDirectory>
-							<jswarn>false</jswarn>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 
 	<repositories>

src/main/java/com/ifast/Application.java

@@ -1,5 +1,7 @@
 package com.ifast;
 
+import com.ifast.common.config.IFastProperties;
+import com.ifast.common.utils.SpringContextHolder;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,9 +12,6 @@ import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import com.ifast.common.config.IFastProperties;
-import com.ifast.common.utils.SpringContextHolder;
-
 /**
  * <pre>
  * ifast 入口

src/main/java/com/ifast/common/utils/GenUtils.java

@@ -1,20 +1,13 @@
 package com.ifast.common.utils;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
+import com.ifast.common.config.Constant;
+import com.ifast.common.domain.ConfigDO;
+import com.ifast.common.exception.IFastException;
+import com.ifast.common.service.ConfigService;
+import com.ifast.common.type.EnumErrorCode;
+import com.ifast.generator.domain.ColumnDO;
+import com.ifast.generator.domain.TableDO;
+import com.ifast.generator.type.EnumGen;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.WordUtils;
@@ -24,14 +17,12 @@ import org.apache.velocity.app.Velocity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.ifast.common.config.Constant;
-import com.ifast.common.domain.ConfigDO;
-import com.ifast.common.exception.IFastException;
-import com.ifast.common.service.ConfigService;
-import com.ifast.common.type.EnumErrorCode;
-import com.ifast.generator.domain.ColumnDO;
-import com.ifast.generator.domain.TableDO;
-import com.ifast.generator.type.EnumGen;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 /**
  * 代码生成器 工具类
@@ -134,7 +125,10 @@ public class GenUtils {
         map.put("datetime", DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN_19));
         // 字段特性
         map.put("hasBigDecimal", dataTypes.contains("decimal"));
-        map.put("hasDatetime", dataTypes.contains("datetime"));
+        //时间类型的包含3种，date、datetime、timestamp
+        if (dataTypes.contains("date") || dataTypes.contains("datetime") || dataTypes.contains("timestamp")) {
+            map.put("hasDatetime", 1);
+        }
         map.put("hasDeleted", columnNames.contains("deleted"));
         map.put("hasVersion", columnNames.contains("version"));
         map.put("hasCreateAt", columnNames.contains("createAt"));

src/main/java/com/ifast/generator/dao/GeneratorMapper.java

@@ -6,7 +6,7 @@ import java.util.Map;
 import org.apache.ibatis.annotations.Select;
 
 public interface GeneratorMapper {
-    @Select("select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables where table_schema = (select database())")
+    @Select("select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables where table_schema = (select database()) order by createTime desc")
     List<Map<String, Object>> list();
 
     @Select("select count(*) from information_schema.tables where table_schema = (select database())")

src/main/resources/mapper/sys/MenuMapper.xml

@@ -12,7 +12,7 @@
 		where 
 		  ur.userId = #{id} 
 		  and m.type in(0,1)
-		order by m.orderNum
+		order by m.orderNum asc
 	</select>
 
 	<select id="listUserPerms" resultType="string">
@@ -20,6 +20,6 @@
 		left join sys_role_menu rm on m.id = rm.menuId
 		left join sys_user_role ur on rm.roleId = ur.roleId 
 		where 
-		  ur.userId = #{id}
+		  ur.userId = #{id} order by m.orderNum asc
 	</select>
 </mapper>

src/main/resources/templates/common/generator/domain.java.vm

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.ifast.common.domain.BaseDO;
+import com.ifast.common.base.BaseDO;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;