浏览代码

代码生成配置存db;
代码生成策略修改增加字段映射信息;
移除gen.properties

Aron 7 年之前
父节点
当前提交
0eba592eec

+ 335 - 337
pom.xml

@@ -1,337 +1,335 @@
-<?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">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.aron</groupId>
-	<artifactId>ifast</artifactId>
-	<version>1.0.0</version>
-	<packaging>jar</packaging>
-
-	<name>ifast</name>
-	<description>Aron fast devolop framework, ifast.</description>
-
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.6.RELEASE</version>
-		<relativePath />
-	</parent>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
-		<mybatis.version>1.3.1</mybatis.version>
-		<mybatisplus.version>2.1.6</mybatisplus.version>
-		<mybatisplus-spring-boot-starter.version>1.0.5</mybatisplus-spring-boot-starter.version>
-		<velocity.version>1.7</velocity.version>
-		<activiti.version>5.22.0</activiti.version>
-		<weixin-java-mp.version>3.0.0</weixin-java-mp.version>
-		<poi.version>3.14</poi.version>
-		<qiniu.version>[7.0.0, 7.2.99]</qiniu.version>
-		<oltu.version>1.0.2</oltu.version>
-		<jwt.version>0.6.0</jwt.version>
-		<lomboc.version>1.16.14</lomboc.version>
-		<docker.registry>127.0.0.1:5000</docker.registry>
-        <spotify.version>0.4.10</spotify.version>
-
-	</properties>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<configuration>
-					<executable>true</executable>
-				</configuration>
-			</plugin>
-
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>${spotify.version}</version>
-                <configuration>
-                    <imageName>${docker.registry}/${project.groupId}/${project.artifactId}:${project.version}</imageName>
-                    <dockerDirectory>${project.build.outputDirectory}/docker/</dockerDirectory>
-                    <resources>
-                        <resource>
-                            <!--<targetPath>/</targetPath>-->
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-    <repositories>
-		<repository>
-			<id>public</id>
-			<name>aliyun nexus</name>
-			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</repository>
-	</repositories>
-    <pluginRepositories>
-		<pluginRepository>
-			<id>public</id>
-			<name>aliyun nexus</name>
-			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-    <dependencies>
-        <dependency>
-            <groupId>com.qiniu</groupId>
-            <artifactId>qiniu-java-sdk</artifactId>
-            <version>${qiniu.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lomboc.version}</version>
-        </dependency>
-
-        <!-- poi S -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>${poi.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>${poi.version}</version>
-        </dependency>
-        <!-- poi E -->
-
-        <!-- weixin SDK S -->
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-mp</artifactId>
-            <version>${weixin-java-mp.version}</version>
-        </dependency>
-        <!-- weixin SDK E -->
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-        <!--web -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-thymeleaf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.nekohtml</groupId>
-            <artifactId>nekohtml</artifactId>
-        </dependency>
-        <!-- mybatis-plus S -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus</artifactId>
-            <version>${mybatisplus.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatisplus-spring-boot-starter</artifactId>
-            <version>${mybatisplus-spring-boot-starter.version}</version>
-        </dependency>
-        <!-- mybatis-plus E -->
-
-        <!--druid -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>1.0.28</version>
-        </dependency>
-        <!--commons -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.6</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
-            <version>1.10</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.5</version>
-        </dependency>
-        <!--shiro -->
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-core</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-spring</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-
-        <!-- jwt -->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-            <version>${jwt.version}</version>
-        </dependency>
-        <!-- <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>3.2.0</version>
-        </dependency> -->
-
-        <!-- apache oauth2.0 -->
-        <dependency>
-            <groupId>org.apache.oltu.oauth2</groupId>
-            <artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
-            <version>${oltu.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.oltu.oauth2</groupId>
-            <artifactId>org.apache.oltu.oauth2.client</artifactId>
-            <version>${oltu.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.oltu.oauth2</groupId>
-            <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
-            <version>${oltu.version}</version>
-        </dependency>
-
-        <!-- shiro ehcache -->
-        <dependency>
-            <groupId>org.apache.shiro</groupId>
-            <artifactId>shiro-ehcache</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.theborakompanioni</groupId>
-            <artifactId>thymeleaf-extras-shiro</artifactId>
-            <version>1.2.1</version>
-        </dependency>
-        <!-- utils -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.31</version>
-        </dependency>
-        <!--velocity代码生成使用模板 -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.7</version>
-        </dependency>
-        <!-- ehchache -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-        </dependency>
-        <!-- quartz -->
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <version>2.2.1</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- SpringWebSocket依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!--swagger2 -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.6.1</version>
-        </dependency>
-
-        <!-- xss过滤组件 -->
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-            <version>1.9.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.session</groupId>
-            <artifactId>spring-session</artifactId>
-        </dependency>
-
-        <!-- data-redis S -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <!-- data-redis E -->
-
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-
-    </dependencies>
-</project>
+<?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">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.aron</groupId>
+	<artifactId>ifast</artifactId>
+	<version>1.0.0</version>
+	<packaging>jar</packaging>
+
+	<name>ifast</name>
+	<description>Aron fast devolop framework, ifast.</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>1.5.6.RELEASE</version>
+		<relativePath />
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<java.version>1.8</java.version>
+		<mybatis.version>1.3.1</mybatis.version>
+		<mybatisplus.version>2.1.6</mybatisplus.version>
+		<mybatisplus-spring-boot-starter.version>1.0.5</mybatisplus-spring-boot-starter.version>
+		<velocity.version>1.7</velocity.version>
+		<activiti.version>5.22.0</activiti.version>
+		<weixin-java-mp.version>3.0.0</weixin-java-mp.version>
+		<poi.version>3.14</poi.version>
+		<qiniu.version>[7.0.0, 7.2.99]</qiniu.version>
+		<oltu.version>1.0.2</oltu.version>
+		<jwt.version>0.6.0</jwt.version>
+		<lomboc.version>1.16.14</lomboc.version>
+		<docker.registry>127.0.0.1:5000</docker.registry>
+		<spotify.version>0.4.10</spotify.version>
+
+	</properties>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<executable>true</executable>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>${spotify.version}</version>
+				<configuration>
+					<imageName>${docker.registry}/${project.groupId}/${project.artifactId}:${project.version}</imageName>
+					<dockerDirectory>${project.build.outputDirectory}/docker/</dockerDirectory>
+					<resources>
+						<resource>
+							<!--<targetPath>/</targetPath> -->
+							<directory>${project.build.directory}</directory>
+							<include>${project.build.finalName}.jar</include>
+						</resource>
+					</resources>
+				</configuration>
+			</plugin>
+
+		</plugins>
+	</build>
+	<repositories>
+		<repository>
+			<id>public</id>
+			<name>aliyun nexus</name>
+			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>public</id>
+			<name>aliyun nexus</name>
+			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+	<dependencies>
+		<dependency>
+			<groupId>com.qiniu</groupId>
+			<artifactId>qiniu-java-sdk</artifactId>
+			<version>${qiniu.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>${lomboc.version}</version>
+		</dependency>
+
+		<!-- poi S -->
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>${poi.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>${poi.version}</version>
+		</dependency>
+		<!-- poi E -->
+
+		<!-- weixin SDK S -->
+		<dependency>
+			<groupId>com.github.binarywang</groupId>
+			<artifactId>weixin-java-mp</artifactId>
+			<version>${weixin-java-mp.version}</version>
+		</dependency>
+		<!-- weixin SDK E -->
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+		</dependency>
+		<!--web -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.nekohtml</groupId>
+			<artifactId>nekohtml</artifactId>
+		</dependency>
+		<!-- mybatis-plus S -->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.mybatis.spring.boot</groupId>
+			<artifactId>mybatis-spring-boot-starter</artifactId>
+			<version>${mybatis.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus</artifactId>
+			<version>${mybatisplus.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatisplus-spring-boot-starter</artifactId>
+			<version>${mybatisplus-spring-boot-starter.version}</version>
+		</dependency>
+		<!-- mybatis-plus E -->
+
+		<!--druid -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid</artifactId>
+			<version>1.1.4</version>
+		</dependency>
+		<!--commons -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.6</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-configuration</groupId>
+			<artifactId>commons-configuration</artifactId>
+			<version>1.10</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.5</version>
+		</dependency>
+		<!--shiro -->
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-core</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-spring</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+
+		<!-- jwt -->
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt</artifactId>
+			<version>${jwt.version}</version>
+		</dependency>
+		<!-- <dependency> <groupId>com.auth0</groupId> <artifactId>java-jwt</artifactId> 
+			<version>3.2.0</version> </dependency> -->
+
+		<!-- apache oauth2.0 -->
+		<dependency>
+			<groupId>org.apache.oltu.oauth2</groupId>
+			<artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
+			<version>${oltu.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.oltu.oauth2</groupId>
+			<artifactId>org.apache.oltu.oauth2.client</artifactId>
+			<version>${oltu.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.oltu.oauth2</groupId>
+			<artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
+			<version>${oltu.version}</version>
+		</dependency>
+
+		<!-- shiro ehcache -->
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-ehcache</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.theborakompanioni</groupId>
+			<artifactId>thymeleaf-extras-shiro</artifactId>
+			<version>1.2.1</version>
+		</dependency>
+		<!-- utils -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.31</version>
+		</dependency>
+		<!--velocity代码生成使用模板 -->
+		<dependency>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity</artifactId>
+			<version>1.7</version>
+		</dependency>
+		<!-- ehchache -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-cache</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.ehcache</groupId>
+			<artifactId>ehcache</artifactId>
+		</dependency>
+		<!-- quartz -->
+		<dependency>
+			<groupId>org.quartz-scheduler</groupId>
+			<artifactId>quartz</artifactId>
+			<version>2.2.1</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>slf4j-api</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- SpringWebSocket依赖 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-websocket</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<!--swagger2 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.6.1</version>
+		</dependency>
+
+		<!-- xss过滤组件 -->
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>1.9.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session</artifactId>
+		</dependency>
+
+		<!-- data-redis S -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+		<!-- data-redis E -->
+
+		<dependency>
+			<groupId>com.auth0</groupId>
+			<artifactId>java-jwt</artifactId>
+			<version>3.2.0</version>
+		</dependency>
+
+	</dependencies>
+</project>

+ 3 - 0
src/main/java/com/ifast/Application.java

@@ -5,6 +5,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -40,9 +41,11 @@ public class Application {
 	
 	private static void printProjectConfigs() {
 		ServerProperties serverProperties = SpringContextHolder.getApplicationContext().getBean(ServerProperties.class);
+		DataSourceProperties dataSourceProperties = SpringContextHolder.getApplicationContext().getBean(DataSourceProperties.class);
 		IFastConfig config = SpringContextHolder.getApplicationContext().getBean(IFastConfig.class);
 		log.info("开启演示模式:" + config.isDemoMode());
 		log.info("开启调试模式:" + config.isDevMode());
+		log.info("数据库:" + dataSourceProperties.getUrl());
 		log.info("==================> run at http://localhost:" + serverProperties.getPort() + serverProperties.getContextPath() + "  <==================");
 	}
 	

+ 36 - 7
src/main/java/com/ifast/common/domain/ConfigDO.java

@@ -1,23 +1,20 @@
 package com.ifast.common.domain;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 
+import java.io.Serializable;
+import java.util.Date;
 
 
 /**
- * 
- * 
  * @author Aron
  * @email izenglong@163.com
  * @date 2018-04-06 01:05:22
  */
- @TableName("sys_config")
+@TableName("sys_config")
 public class ConfigDO extends Model<ConfigDO> implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
@@ -33,67 +30,99 @@ public class ConfigDO extends Model<ConfigDO> implements Serializable {
     private String remark;
     /**  */
     private Date createTime;
-
+    private Integer kvType;
+    
+    
+    @Override
+    public String toString() {
+        return "ConfigDO{" +
+                "id=" + id +
+                ", k='" + k + '\'' +
+                ", v='" + v + '\'' +
+                ", remark='" + remark + '\'' +
+                ", createTime=" + createTime +
+                ", kvType=" + kvType +
+                '}';
+    }
+    
+    public Integer getKvType() {
+        return kvType;
+    }
+    
+    public void setKvType(Integer kvType) {
+        this.kvType = kvType;
+    }
+    
     /**
      * 设置:
      */
     public void setId(Long id) {
         this.id = id;
     }
+    
     /**
      * 获取:
      */
     public Long getId() {
         return id;
     }
+    
     /**
      * 设置:
      */
     public void setK(String k) {
         this.k = k;
     }
+    
     /**
      * 获取:
      */
     public String getK() {
         return k;
     }
+    
     /**
      * 设置:
      */
     public void setV(String v) {
         this.v = v;
     }
+    
     /**
      * 获取:
      */
     public String getV() {
         return v;
     }
+    
     /**
      * 设置:
      */
     public void setRemark(String remark) {
         this.remark = remark;
     }
+    
     /**
      * 获取:
      */
     public String getRemark() {
         return remark;
     }
+    
     /**
      * 设置:
      */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+    
     /**
      * 获取:
      */
     public Date getCreateTime() {
         return createTime;
     }
+    
     @Override
     protected Serializable pkVal() {
         // TODO Auto-generated method stub

+ 7 - 0
src/main/java/com/ifast/common/service/ConfigService.java

@@ -3,6 +3,9 @@ package com.ifast.common.service;
 import com.ifast.common.base.CoreService;
 import com.ifast.common.domain.ConfigDO;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <pre>
  * </pre>
@@ -13,4 +16,8 @@ public interface ConfigService extends CoreService<ConfigDO> {
     ConfigDO getByKey(String k);
 
     String getValuByKey(String k);
+    
+    void updateKV(Map<String, String> kv);
+    
+    List<ConfigDO> findListByKvType(int kvType);
 }

+ 27 - 5
src/main/java/com/ifast/common/service/impl/ConfigServiceImpl.java

@@ -1,11 +1,14 @@
 package com.ifast.common.service.impl;
 
-import org.springframework.stereotype.Service;
-
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.ifast.common.base.CoreServiceImpl;
 import com.ifast.common.dao.ConfigDao;
 import com.ifast.common.domain.ConfigDO;
 import com.ifast.common.service.ConfigService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <pre>
@@ -14,18 +17,37 @@ import com.ifast.common.service.ConfigService;
  */
 @Service
 public class ConfigServiceImpl extends CoreServiceImpl<ConfigDao, ConfigDO> implements ConfigService {
-
+    
     @Override
     public ConfigDO getByKey(String k) {
         ConfigDO entity = new ConfigDO();
         entity.setK(k);
         return baseMapper.selectOne(entity);
     }
-
+    
     @Override
     public String getValuByKey(String k) {
         ConfigDO bean = this.getByKey(k);
         return bean == null ? "" : bean.getV();
     }
-
+    
+    @Override
+    public void updateKV(Map<String, String> kv) {
+        for(Map.Entry<String, String> entry : kv.entrySet()){
+            ConfigDO config = this.getByKey(entry.getKey());
+            config.setV(entry.getValue());
+            super.updateById(config);
+        }
+    }
+    
+    @Override
+    public List<ConfigDO> findListByKvType(int kvType){
+        ConfigDO configDO = new ConfigDO();
+        configDO.setKvType(kvType);
+        EntityWrapper<ConfigDO> ew = new EntityWrapper<>(configDO);
+        List<ConfigDO> list = super.selectList(ew);
+        return list;
+    }
+    
+    
 }

+ 107 - 112
src/main/java/com/ifast/generator/controller/GeneratorController.java

@@ -1,112 +1,107 @@
-package com.ifast.generator.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.ifast.common.annotation.Log;
-import com.ifast.common.type.EnumErrorCode;
-import com.ifast.common.utils.GenUtils;
-import com.ifast.common.utils.Result;
-import com.ifast.generator.service.GeneratorService;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <pre>
- * 代码生成
- * </pre>
- * <small> 2018年3月23日 | Aron</small>
- */
-@RequestMapping("/common/generator")
-@Controller
-public class GeneratorController {
-    String prefix = "common/generator";
-    @Autowired
-    GeneratorService generatorService;
-    
-    @Log("进入代码生成页面")
-    @GetMapping()
-    String generator() {
-        return prefix + "/list";
-    }
-    
-    @Log("查询数据表列表")
-    @ResponseBody
-    @GetMapping("/list")
-    List<Map<String, Object>> list() {
-        List<Map<String, Object>> list = generatorService.list();
-        return list;
-    };
-    
-    @Log("根据数据表生成代码")
-    @RequestMapping("/code/{tableName}")
-    public void code(HttpServletRequest request, HttpServletResponse response,
-            @PathVariable("tableName") String tableName) throws IOException {
-        String[] tableNames = new String[] { tableName };
-        byte[] data = generatorService.generatorCode(tableNames);
-        response.reset();
-        response.setHeader("Content-Disposition", "attachment; filename=\"code.zip\"");
-        response.addHeader("Content-Length", "" + data.length);
-        response.setContentType("application/octet-stream; charset=UTF-8");
-
-        IOUtils.write(data, response.getOutputStream());
-    }
-    
-    @Log("根据数据表批量生成代码")
-    @RequestMapping("/batchCode")
-    public void batchCode(HttpServletRequest request, HttpServletResponse response, String tables) throws IOException {
-        String[] tableNames = new String[] {};
-        tableNames = JSON.parseArray(tables).toArray(tableNames);
-        byte[] data = generatorService.generatorCode(tableNames);
-        response.reset();
-        response.setHeader("Content-Disposition", "attachment; filename=\"code.zip\"");
-        response.addHeader("Content-Length", "" + data.length);
-        response.setContentType("application/octet-stream; charset=UTF-8");
-
-        IOUtils.write(data, response.getOutputStream());
-    }
-    
-    @Log("进入代码生成配置编辑页面")
-    @GetMapping("/edit")
-    public String edit(Model model) {
-        Configuration conf = GenUtils.getConfig();
-        Map<String, Object> property = new HashMap<>(16);
-        property.put("author", conf.getProperty("author"));
-        property.put("email", conf.getProperty("email"));
-        property.put("package", conf.getProperty("package"));
-        property.put("autoRemovePre", conf.getProperty("autoRemovePre"));
-        property.put("tablePrefix", conf.getProperty("tablePrefix"));
-        model.addAttribute("property", property);
-        return prefix + "/edit";
-    }
-    
-    @Log("更新代码生成配置")
-    @ResponseBody
-    @PostMapping("/update")
-    Result<String> update(@RequestParam Map<String, Object> map) {
-        try {
-            PropertiesConfiguration conf = new PropertiesConfiguration("generator.properties");
-            conf.setProperty("author", map.get("author"));
-            conf.setProperty("email", map.get("email"));
-            conf.setProperty("package", map.get("package"));
-            conf.setProperty("autoRemovePre", map.get("autoRemovePre"));
-            conf.setProperty("tablePrefix", map.get("tablePrefix"));
-            conf.save();
-        } catch (ConfigurationException e) {
-            return Result.build(EnumErrorCode.genWriteConfigError.getCode(), EnumErrorCode.genWriteConfigError.getMsg());
-        }
-        return Result.ok();
-    }
-}
+package com.ifast.generator.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.ifast.common.annotation.Log;
+import com.ifast.common.domain.ConfigDO;
+import com.ifast.common.service.ConfigService;
+import com.ifast.common.utils.Result;
+import com.ifast.generator.service.GeneratorService;
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <pre>
+ * 代码生成
+ * </pre>
+ * <small> 2018年3月23日 | Aron</small>
+ */
+@RequestMapping("/common/generator")
+@Controller
+public class GeneratorController {
+    String prefix = "common/generator";
+    @Autowired
+    GeneratorService generatorService;
+    @Autowired
+    ConfigService configService;
+    
+    
+    @Log("进入代码生成页面")
+    @GetMapping()
+    String generator() {
+        return prefix + "/list";
+    }
+    
+    @Log("查询数据表列表")
+    @ResponseBody
+    @GetMapping("/list")
+    List<Map<String, Object>> list() {
+        List<Map<String, Object>> list = generatorService.list();
+        return list;
+    };
+    
+    @Log("根据数据表生成代码")
+    @RequestMapping("/code/{tableName}")
+    public void code(HttpServletRequest request, HttpServletResponse response,
+            @PathVariable("tableName") String tableName) throws IOException {
+        String[] tableNames = new String[] { tableName };
+        byte[] data = generatorService.generatorCode(tableNames);
+        response.reset();
+        response.setHeader("Content-Disposition", "attachment; filename=\"code.zip\"");
+        response.addHeader("Content-Length", "" + data.length);
+        response.setContentType("application/octet-stream; charset=UTF-8");
+
+        IOUtils.write(data, response.getOutputStream());
+    }
+    
+    @Log("根据数据表批量生成代码")
+    @RequestMapping("/batchCode")
+    public void batchCode(HttpServletRequest request, HttpServletResponse response, String tables) throws IOException {
+        String[] tableNames = new String[] {};
+        tableNames = JSON.parseArray(tables).toArray(tableNames);
+        byte[] data = generatorService.generatorCode(tableNames);
+        response.reset();
+        response.setHeader("Content-Disposition", "attachment; filename=\"code.zip\"");
+        response.addHeader("Content-Length", "" + data.length);
+        response.setContentType("application/octet-stream; charset=UTF-8");
+
+        IOUtils.write(data, response.getOutputStream());
+    }
+    
+    @Log("进入代码生成配置编辑页面")
+    @GetMapping("/edit")
+    public String edit(Model model) {
+        List<ConfigDO> list = configService.findListByKvType(4400);
+        List<ConfigDO> list2 = configService.findListByKvType(4401);
+        HashMap<String, String> map = new HashMap<>();
+        for(ConfigDO config : list2) {
+            map.put(config.getK(), config.getV());
+        }
+        
+        model.addAttribute("list", list);
+        model.addAttribute("property", map);
+        return prefix + "/edit";
+    }
+    
+    @Log("更新代码生成配置")
+    @ResponseBody
+    @PostMapping("/update")
+    Result<String> update(@RequestParam Map<String, String> map) {
+        if(!map.containsKey("autoRemovePre")) {
+            map.put("autoRemovePre", "false");
+        }else {
+            map.put("autoRemovePre", "true");
+        }
+        configService.updateKV(map);
+        return Result.ok();
+    }
+}

+ 0 - 2
src/main/java/com/ifast/sys/shiro/SysUserAuthorizingRealm.java

@@ -32,7 +32,6 @@ public class SysUserAuthorizingRealm extends AuthorizingRealm {
 
     @Override
     protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
-        log.debug("==> userrealm doGetAuthorizationInfo");
         Object next = principals.getPrimaryPrincipal();
         log.debug("next class:" + next.getClass());
         SimpleAuthorizationInfo info = null;
@@ -48,7 +47,6 @@ public class SysUserAuthorizingRealm extends AuthorizingRealm {
 
     @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException {
-        log.info("==> userrealm doGetAuthenticationInfo");
         if(!supports(token)) {
             return null;
         }

+ 19 - 27
src/main/java/com/ifast/wxmp/controller/MpConfigController.java

@@ -1,33 +1,25 @@
 package com.ifast.wxmp.controller;
 
-import java.util.Arrays;
-import java.util.Date;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.ifast.wxmp.domain.MpConfigDO;
-import com.ifast.wxmp.service.MpConfigService;
 import com.ifast.common.base.AdminBaseController;
 import com.ifast.common.utils.Result;
+import com.ifast.wxmp.domain.MpConfigDO;
+import com.ifast.wxmp.service.MpConfigService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Date;
 
 /**
- * 
  * <pre>
  * 微信配置表
  * </pre>
- * 
  * <small> 2018-04-11 23:27:06 | Aron</small>
  */
 @Controller
@@ -35,13 +27,13 @@ import com.ifast.common.utils.Result;
 public class MpConfigController extends AdminBaseController {
     @Autowired
     private MpConfigService mpConfigService;
-
+    
     @GetMapping()
     @RequiresPermissions("wxmp:mpConfig:mpConfig")
     String MpConfig() {
         return "wxmp/mpConfig/mpConfig";
     }
-
+    
     @ResponseBody
     @GetMapping("/list")
     @RequiresPermissions("wxmp:mpConfig:mpConfig")
@@ -50,13 +42,13 @@ public class MpConfigController extends AdminBaseController {
         Page<MpConfigDO> page = mpConfigService.selectPage(getPage(MpConfigDO.class), wrapper);
         return Result.ok(page);
     }
-
+    
     @GetMapping("/add")
     @RequiresPermissions("wxmp:mpConfig:add")
     String add() {
         return "wxmp/mpConfig/add";
     }
-
+    
     @GetMapping("/edit/{id}")
     @RequiresPermissions("wxmp:mpConfig:edit")
     String edit(@PathVariable("id") Integer id, Model model) {
@@ -64,7 +56,7 @@ public class MpConfigController extends AdminBaseController {
         model.addAttribute("mpConfig", mpConfig);
         return "wxmp/mpConfig/edit";
     }
-
+    
     /**
      * 保存
      */
@@ -76,7 +68,7 @@ public class MpConfigController extends AdminBaseController {
         mpConfigService.insert(mpConfig);
         return Result.ok();
     }
-
+    
     /**
      * 修改
      */
@@ -87,7 +79,7 @@ public class MpConfigController extends AdminBaseController {
         mpConfigService.updateById(mpConfig);
         return Result.ok();
     }
-
+    
     /**
      * 删除
      */
@@ -98,7 +90,7 @@ public class MpConfigController extends AdminBaseController {
         mpConfigService.deleteById(id);
         return Result.ok();
     }
-
+    
     /**
      * 删除
      */
@@ -109,5 +101,5 @@ public class MpConfigController extends AdminBaseController {
         mpConfigService.deleteBatchIds(Arrays.asList(ids));
         return Result.ok();
     }
-
+    
 }

+ 18 - 26
src/main/java/com/ifast/wxmp/controller/MpFansController.java

@@ -1,32 +1,24 @@
 package com.ifast.wxmp.controller;
 
-import java.util.Arrays;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.ifast.wxmp.domain.MpFansDO;
-import com.ifast.wxmp.service.MpFansService;
 import com.ifast.common.base.AdminBaseController;
 import com.ifast.common.utils.Result;
+import com.ifast.wxmp.domain.MpFansDO;
+import com.ifast.wxmp.service.MpFansService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
 
 /**
- * 
  * <pre>
  * 微信粉丝表
  * </pre>
- * 
  * <small> 2018-04-11 23:27:06 | Aron</small>
  */
 @Controller
@@ -34,13 +26,13 @@ import com.ifast.common.utils.Result;
 public class MpFansController extends AdminBaseController {
     @Autowired
     private MpFansService mpFansService;
-
+    
     @GetMapping()
     @RequiresPermissions("wxmp:mpFans:mpFans")
     String MpFans() {
         return "wxmp/mpFans/mpFans";
     }
-
+    
     @ResponseBody
     @GetMapping("/list")
     @RequiresPermissions("wxmp:mpFans:mpFans")
@@ -49,13 +41,13 @@ public class MpFansController extends AdminBaseController {
         Page<MpFansDO> page = mpFansService.selectPage(getPage(MpFansDO.class), wrapper);
         return Result.ok(page);
     }
-
+    
     @GetMapping("/add")
     @RequiresPermissions("wxmp:mpFans:add")
     String add() {
         return "wxmp/mpFans/add";
     }
-
+    
     @GetMapping("/edit/{id}")
     @RequiresPermissions("wxmp:mpFans:edit")
     String edit(@PathVariable("id") Long id, Model model) {
@@ -63,7 +55,7 @@ public class MpFansController extends AdminBaseController {
         model.addAttribute("mpFans", mpFans);
         return "wxmp/mpFans/edit";
     }
-
+    
     /**
      * 保存
      */
@@ -74,7 +66,7 @@ public class MpFansController extends AdminBaseController {
         mpFansService.insert(mpFans);
         return Result.ok();
     }
-
+    
     /**
      * 修改
      */
@@ -85,7 +77,7 @@ public class MpFansController extends AdminBaseController {
         mpFansService.updateById(mpFans);
         return Result.ok();
     }
-
+    
     /**
      * 删除
      */
@@ -96,7 +88,7 @@ public class MpFansController extends AdminBaseController {
         mpFansService.deleteById(id);
         return Result.ok();
     }
-
+    
     /**
      * 删除
      */
@@ -107,5 +99,5 @@ public class MpFansController extends AdminBaseController {
         mpFansService.deleteBatchIds(Arrays.asList(ids));
         return Result.ok();
     }
-
+    
 }

+ 1 - 2
src/main/java/com/ifast/wxmp/dao/MpConfigDao.java

@@ -4,12 +4,11 @@ import com.ifast.wxmp.domain.MpConfigDO;
 import com.ifast.common.base.BaseDao;
 
 /**
- * 
  * <pre>
  * 微信配置表
  * </pre>
  * <small> 2018-04-11 23:27:06 | Aron</small>
  */
 public interface MpConfigDao extends BaseDao<MpConfigDO> {
-
+    
 }

+ 1 - 2
src/main/java/com/ifast/wxmp/dao/MpFansDao.java

@@ -4,12 +4,11 @@ import com.ifast.wxmp.domain.MpFansDO;
 import com.ifast.common.base.BaseDao;
 
 /**
- * 
  * <pre>
  * 微信粉丝表
  * </pre>
  * <small> 2018-04-11 23:27:06 | Aron</small>
  */
 public interface MpFansDao extends BaseDao<MpFansDO> {
-
+    
 }

+ 53 - 41
src/main/resources/application-dev.yml

@@ -1,41 +1,53 @@
-ifast:
-  projectName: ifast
-  projectRootURL: http://localhost:8088/
-  demoMode: false
-  jwt:
-    userPrimaryKey: userId
-    expireTime: 3000000
-logging:
-  level:
-    com.ifast: info
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/ifast?useUnicode=true&characterEncoding=utf8
-    username: root
-    password: aron
-    initialSize: 1
-    minIdle: 3
-    maxActive: 20
-    # 配置获取连接等待超时的时间
-    maxWait: 60000
-    # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-    timeBetweenEvictionRunsMillis: 60000
-    # 配置一个连接在池中最小生存的时间,单位是毫秒
-    minEvictableIdleTimeMillis: 30000
-    validationQuery: select 'x'
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    # 打开PSCache,并且指定每个连接上PSCache的大小
-    poolPreparedStatements: true
-    maxPoolPreparedStatementPerConnectionSize: 20
-    # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-    filters: stat,wall,slf4j
-    # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-    # 合并多个DruidDataSource的监控数据
-    #useGlobalDataSourceStat: true
-  session: 
-    store-type: HASH_MAP
+dream:
+  weixin:
+    dev-mode: true
+    wx-configs:
+      - appId: wx9803d1188fa5fbda
+        appSecret: db859c968763c582794e7c3d003c3d87
+      - appId: wxc03edcd008ad1e70
+        appSecret: 11ed9e2b8e3e3c131e7be320a42b2b5a
+        token: 123456
+    wxa-config:
+      appid: wx4f53594f9a6b3dcb
+      appSecret: eec6482ba3804df05bd10895bace0579
+ifast:
+  project-name: ifast
+  project-root-u-r-l: http://localhost:8088/
+  demoMode: false
+  jwt:
+    userPrimaryKey: userId
+    expireTime: 3000000
+logging:
+  level:
+    com.ifast: info
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/ifast?useUnicode=true&characterEncoding=utf8
+    username: root
+    password: aron
+    initialSize: 1
+    minIdle: 3
+    maxActive: 20
+    # 配置获取连接等待超时的时间
+    maxWait: 60000
+    # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+    timeBetweenEvictionRunsMillis: 60000
+    # 配置一个连接在池中最小生存的时间,单位是毫秒
+    minEvictableIdleTimeMillis: 30000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    # 打开PSCache,并且指定每个连接上PSCache的大小
+    poolPreparedStatements: true
+    maxPoolPreparedStatementPerConnectionSize: 20
+    # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+    filters: stat,wall,slf4j
+    # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+    # 合并多个DruidDataSource的监控数据
+    #useGlobalDataSourceStat: true
+  session: 
+    store-type: HASH_MAP

+ 0 - 35
src/main/resources/generator.properties

@@ -1,35 +0,0 @@
-#\u4ee3\u7801\u751f\u6210\u5668\uff0c\u914d\u7f6e\u4fe1\u606f
-
-#\u5305\u540d
-package=com.ifast
-#\u4f5c\u8005
-author=Aron
-#Email
-email=izenglong@163.com
-#\u81ea\u52a8\u53bb\u9664\u8868\u524d\u7f00\uff0c\u9ed8\u8ba4\u662f true 
-autoRemovePre=true
-#\u8868\u524d\u7f00(\u7c7b\u540d\u4e0d\u4f1a\u5305\u542b\u8868\u524d\u7f00)
-tablePrefix=app
-
-#\u7c7b\u578b\u8f6c\u6362\uff0c\u914d\u7f6e\u4fe1\u606f
-tinyint=Integer
-smallint=Integer
-mediumint=Integer
-int=Integer
-integer=Integer
-bigint=Long
-float=Float
-double=Double
-decimal=BigDecimal
-bit=Boolean
-
-char=String
-varchar=String
-tinytext=String
-text=String
-mediumtext=String
-longtext=String
-
-date=Date
-datetime=Date
-timestamp=Date

+ 61 - 62
src/main/resources/static/js/appjs/common/generator/edit.js

@@ -1,62 +1,61 @@
-// 以下为官方示例
-$().ready(function() {
-	validateRule();
-});
-
-$.validator.setDefaults({
-	submitHandler : function() {
-		console.log('提交修改');
-		update();
-	}
-});
-function update() {
-	$.ajax({
-		cache : true,
-		type : "POST",
-		url : "/common/generator/update",
-		data : $('#signupForm').serialize(),// 你的formid
-		async : false,
-		error : function(request) {
-			parent.layer.alert("网络连接超时");
-		},
-		success : function(data) {
-			if (data.code == 0) {
-				parent.layer.msg(data.msg);
-
-			} else {
-				parent.layer.msg(data.msg);
-			}
-
-		}
-	});
-
-}
-function validateRule() {
-	var icon = "<i class='fa fa-times-circle'></i> ";
-	$("#signupForm").validate({
-		rules : {
-			author : {
-				required : true
-			},
-			email : {
-				required : true,
-			},
-			package : {
-				required : true,
-			},
-			
-		},
-		messages : {
-
-			author : {
-				required : icon + "请输入作者"
-			},
-			email : {
-				required : icon + "请输入email",
-			},
-			package : {
-				required : icon + "请输入包名",
-			},
-		}
-	})
-}
+$().ready(function() {
+	validateRule();
+});
+
+$.validator.setDefaults({
+	submitHandler : function() {
+		console.log('提交修改');
+		update();
+	}
+});
+function update() {
+	$.ajax({
+		cache : true,
+		type : "POST",
+		url : "/common/generator/update",
+		data : $('#signupForm').serialize(),
+		async : false,
+		error : function(request) {
+			parent.layer.alert("网络连接超时");
+		},
+		success : function(data) {
+			if (data.code == 0) {
+				parent.layer.msg(data.msg);
+
+			} else {
+				parent.layer.msg(data.msg);
+			}
+
+		}
+	});
+
+}
+function validateRule() {
+	var icon = "<i class='fa fa-times-circle'></i> ";
+	$("#signupForm").validate({
+		rules : {
+			author : {
+				required : true
+			},
+			email : {
+				required : true,
+			},
+			package : {
+				required : true,
+			},
+			
+		},
+		messages : {
+
+			author : {
+				required : icon + "请输入作者"
+			},
+			email : {
+				required : icon + "请输入email",
+			},
+			package : {
+				required : icon + "请输入包名",
+			},
+		}
+	})
+}

+ 19 - 9
src/main/resources/templates/common/generator/edit.html

@@ -19,7 +19,7 @@
 							<label class="col-sm-3 control-label">邮箱:</label>
 							<div class="col-sm-8">
 								<input id="email" name="email" class="form-control" type="text"
-									th:value="${property.email}" readonly>
+									th:value="${property.email}">
 							</div>
 						</div>
 						<div class="form-group">
@@ -31,22 +31,32 @@
 						</div>
 						<div class="form-group">
 							<label class="col-sm-3 control-label">自动去掉表前缀:</label>
-							<div class="col-sm-2  i-checks icheckbox_square-green checked">
+							<div class="col-sm-2  i-checks icheckbox_square-green checked" style="margin:0 15px;">
 								<input id="autoRemovePre" name="autoRemovePre"
 									class="form-control" type="checkbox"
-									value="true"
 									th:checked="${property.autoRemovePre}">
 							</div>
 
 						</div>
 						
 						<div class="form-group">
-							<label class="col-sm-3 control-label">去掉指定表前缀:</label>
-							<div class="col-sm-8">
-								<input id="tablePrefix" name="tablePrefix" class="form-control"
-									type="text" th:value="${property.tablePrefix}">
-							</div>
-						</div>
+                            <label class="col-sm-3 control-label">去掉指定表前缀:</label>
+                            <div class="col-sm-8">
+                                <input id="tablePrefix" name="tablePrefix" class="form-control"
+                                    type="text" th:value="${property.tablePrefix}">
+                            </div>
+                        </div>
+                        <!--   ==================   -->
+                        <hr>
+						<div class="form-group" th:each="item : ${list}">
+                            <label class="col-sm-3 control-label" th:text="${item.k} + ' :'"></label>
+                            <div class="col-sm-8">
+                                <input id="tablePrefix" th:name="${item.k}" class="form-control"
+                                    type="text" th:value="${item.v}">
+                            </div>
+                        </div>
+                        
+                        
 						<div class="form-group">
 							<div class="col-sm-8 col-sm-offset-3">
 								<button type="submit" class="btn btn-primary">提交</button>