From a9f378218bcb006266fc932e14d4f5c21cd2c0b1 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 8 Mar 2019 15:25:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BASql?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application-druid.yml         | 5 ++++-
 .../src/main/resources/vm/java/Controller.java.vm            | 4 ++--
 ruoyi-generator/src/main/resources/vm/java/domain.java.vm    | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index a5cba7c14..18c0b11cc 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -34,7 +34,9 @@ spring:
             validationQuery: SELECT 1 FROM DUAL
             testWhileIdle: true
             testOnBorrow: false
-            testOnReturn: false      
+            testOnReturn: false
+            webStatFilter: 
+                enabled: true
             statViewServlet:
                 enabled: true
                 # 设置白名单，不填则允许所有访问
@@ -42,6 +44,7 @@ spring:
                 url-pattern: /monitor/druid/*
             filter:
                 stat:
+                    enabled: true
                     # 慢SQL记录
                     log-slow-sql: true
                     slow-sql-millis: 1000
diff --git a/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm
index b10de7c9c..7bd1dcef5 100644
--- a/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm
@@ -14,9 +14,9 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
 import ${package}.domain.${className};
 import ${package}.service.I${className}Service;
-import com.ruoyi.framework.web.base.BaseController;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.page.TableDataInfo;
-import com.ruoyi.common.base.AjaxResult;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 
 /**
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index ed74b335c..7184ab5a2 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -2,7 +2,7 @@ package ${package}.domain;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.base.BaseEntity;
+import com.ruoyi.common.core.domain.BaseEntity;
 #foreach ($column in $columns)
 #if($column.attrType == 'Date')
 import java.util.Date;