diff --git a/pear-entrance/pom.xml b/pear-entrance/pom.xml
index 53e06c6e7fff863adc5ef9982b916144ecdf77ef..54e55cc225d1fdf4d80689049baeca28b5255c6d 100644
--- a/pear-entrance/pom.xml
+++ b/pear-entrance/pom.xml
@@ -46,6 +46,11 @@
pear-schedule
0.0.1-SNAPSHOT
+
+ com.pearadmin
+ pear-generator
+ 0.0.1-SNAPSHOT
+
org.springframework.boot
spring-boot-starter-thymeleaf
diff --git a/pear-entrance/src/main/resources/application-druid.yml b/pear-entrance/src/main/resources/application-druid.yml
index 6feca8954dc1481b05b1135bc0e598f6157fbc9a..c64edc65acafa40271acffa7a6e5fa3d1f3214c2 100644
--- a/pear-entrance/src/main/resources/application-druid.yml
+++ b/pear-entrance/src/main/resources/application-druid.yml
@@ -7,9 +7,9 @@ spring:
username: root
password: root
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/pear-admin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://114.55.218.200:3307/pear-admin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
slave:
username: root
password: root
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/pear-admin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
\ No newline at end of file
+ url: jdbc:mysql://114.55.218.200:3307/pear-admin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
\ No newline at end of file
diff --git a/pear-modules/pear-generator/pom.xml b/pear-modules/pear-generator/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..876cf2e75db1a47fb91edbf9698480c8ca400aba
--- /dev/null
+++ b/pear-modules/pear-generator/pom.xml
@@ -0,0 +1,101 @@
+
+
+ 4.0.0
+
+ com.pearadmin
+ pear-modules
+ 0.0.1-SNAPSHOT
+
+ com.pearadmin
+ pear-generator
+ 0.0.1-SNAPSHOT
+ pear-generator
+ Demo project for Spring Boot
+
+
+ 1.8
+
+
+
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+ 1.1.1
+
+
+ com.github.pagehelper
+ pagehelper-spring-boot-starter
+ 1.2.10
+
+
+ com.pearadmin
+ pear-system
+ 0.0.1-SNAPSHOT
+
+
+
+ commons-io
+ commons-io
+ 2.5
+
+
+ commons-configuration
+ commons-configuration
+ 1.10
+
+
+ velocity
+ org.apache.velocity
+ 1.7
+
+
+ org.apache.velocity
+ velocity-tools
+ 2.0
+
+
+ dom4j
+ dom4j
+
+
+ oro
+ oro
+
+
+ sslext
+ sslext
+
+
+ struts-core
+ org.apache.struts
+
+
+ struts-taglib
+ org.apache.struts
+
+
+ struts-tiles
+ org.apache.struts
+
+
+ commons-validator
+ commons-validator
+
+
+ commons-beanutils
+ commons-beanutils
+
+
+ commons-chain
+ commons-chain
+
+
+ commons-collections
+ commons-collections
+
+
+
+
+
+
diff --git a/pear-modules/pear-generator/src/main/java/com/pearadmin/generator/controller/SysGeneratorController.java b/pear-modules/pear-generator/src/main/java/com/pearadmin/generator/controller/SysGeneratorController.java
new file mode 100644
index 0000000000000000000000000000000000000000..f787eb8862ccb53615e5fbfd69e3b543c916cfb7
--- /dev/null
+++ b/pear-modules/pear-generator/src/main/java/com/pearadmin/generator/controller/SysGeneratorController.java
@@ -0,0 +1,71 @@
+package com.pearadmin.generator.controller;
+
+import com.pearadmin.generator.service.SysGeneratorService;
+import com.pearadmin.generator.utils.PageUtils;
+import com.pearadmin.generator.utils.Query;
+import com.pearadmin.generator.utils.R;
+import com.pearadmin.generator.utils.XssHttpServletRequestWrapper;
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成器
+ *
+ * @author chenjunfei
+ * @email kkomge@qq.com
+ * @date 2016年12月19日 下午9:12:58
+ */
+@Controller
+@RequestMapping("sys/generator")
+public class SysGeneratorController {
+ @Autowired
+ private SysGeneratorService sysGeneratorService;
+
+ /**
+ * 列表
+ */
+ @ResponseBody
+ @RequestMapping("/list")
+ public R list(@RequestParam Map params){
+ //查询列表数据
+ Query query = new Query(params);
+ List