diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index a5cba7c1..18c0b11c 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 b10de7c9..7bd1dcef 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 ed74b335..7184ab5a 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;