From de6d66aaf982934e6bb78054eb669affb444b697 Mon Sep 17 00:00:00 2001
From: zhujj <Administrator@G6DKBNY0IH0AICJ>
Date: Thu, 29 Nov 2018 18:37:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/pom.xml                                  | 9 ++++++++-
 ruoyi-admin/src/main/resources/application-druid.yml | 2 +-
 ruoyi-admin/src/main/resources/application.yml       | 6 +++---
 ruoyi-framework/pom.xml                              | 7 -------
 ruoyi-generator/pom.xml                              | 5 +++++
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 2812cd584..72e54ec37 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -46,7 +46,14 @@
             <version>${ruoyi.version}</version>
 
         </dependency>
-        
+
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-generator</artifactId>
+            <version>${ruoyi.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index da7a23d52..62dc55b67 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true
                 username: root
-                password: password
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 4dd6f2044..233fbd363 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -125,10 +125,10 @@ xss:
 # 代码生成
 gen: 
   # 作者
-  author: ruoyi
+  author: zhujj
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.system
+  packageName: com.ruoyi.agile
   # 自动去除表前缀，默认是true
-  autoRemovePre: true
+  autoRemovePre: false
   # 表前缀(类名不会包含表前缀)
   tablePrefix: sys_
\ No newline at end of file
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index 06394c2b6..8815cc5f7 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -103,13 +103,6 @@
             <artifactId>ruoyi-quartz</artifactId>
             <version>${ruoyi.version}</version>
         </dependency>
-        
-        <!-- 代码生成-->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-generator</artifactId>
-            <version>${ruoyi.version}</version>
-        </dependency>
 
 
 		<!-- pagehelper 分页插件 -->
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index cdf7fd9ee..bdbe15e96 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -34,6 +34,11 @@
             <artifactId>ruoyi-common</artifactId>
             <version>${ruoyi.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-framework</artifactId>
+            <version>3.0</version>
+        </dependency>
     </dependencies>
 	
 </project>
\ No newline at end of file