diff --git a/src/main/java/com/fc/v2/common/druid/RemoveDruidAdConfig.java b/src/main/java/com/fc/v2/common/druid/RemoveDruidAdConfig.java index 06ed422cf34fdff80bf01a117c9b7b8158ea6cb7..17f3bfffb3188351023e05f6dd42324c41477d02 100644 --- a/src/main/java/com/fc/v2/common/druid/RemoveDruidAdConfig.java +++ b/src/main/java/com/fc/v2/common/druid/RemoveDruidAdConfig.java @@ -2,16 +2,25 @@ package com.fc.v2.common.druid; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; +import com.alibaba.druid.support.http.WebStatFilter; +import com.alibaba.druid.support.spring.stat.DruidStatInterceptor; import com.alibaba.druid.util.Utils; + +import org.springframework.aop.support.DefaultPointcutAdvisor; +import org.springframework.aop.support.JdkRegexpMethodPointcut; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import javax.servlet.*; import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; /** @@ -76,5 +85,43 @@ public class RemoveDruidAdConfig { registrationBean.addUrlPatterns(commonJsPattern); return registrationBean; } + /*********Spring Boot 配置Druid关联URI监控******/ + @Bean + public FilterRegistrationBean webStatFilter(){ + FilterRegistrationBean bean = new FilterRegistrationBean(); + bean.setFilter(new WebStatFilter()); + + //exclusions:设置哪些请求进行过滤排除掉,从而不进行统计 + Map initParams = new HashMap<>(16); + initParams.put("exclusions", "*.js,*.css,/druid/*,bc/*"); + bean.setInitParameters(initParams); + + //"/*" 表示过滤所有请求 + bean.setUrlPatterns(Collections.singletonList("/*")); + return bean; + + } + + /*********Spring Boot 配置Druid关联spring监控******/ + @Bean + public JdkRegexpMethodPointcut druidStatPointcut() { + JdkRegexpMethodPointcut pointcut = new JdkRegexpMethodPointcut(); + pointcut.setPattern("com.fc.v2.mapper.*"); + return pointcut; + } + + @Bean + public DruidStatInterceptor druidStatInterceptor() { + DruidStatInterceptor dsInterceptor = new DruidStatInterceptor(); + return dsInterceptor; + } + + @Bean + public DefaultPointcutAdvisor druidStatAdvisor(DruidStatInterceptor druidStatInterceptor, JdkRegexpMethodPointcut druidStatPointcut) { + DefaultPointcutAdvisor defaultPointAdvisor = new DefaultPointcutAdvisor(); + defaultPointAdvisor.setPointcut(druidStatPointcut); + defaultPointAdvisor.setAdvice(druidStatInterceptor); + return defaultPointAdvisor; + } } diff --git a/src/main/java/com/fc/v2/controller/admin/PermissionController.java b/src/main/java/com/fc/v2/controller/admin/PermissionController.java index 993325064db5463907bede693b7a49612bebd6cf..475f45cb2007805a3a0797ffb8264afdbf300e3a 100644 --- a/src/main/java/com/fc/v2/controller/admin/PermissionController.java +++ b/src/main/java/com/fc/v2/controller/admin/PermissionController.java @@ -57,7 +57,7 @@ public class PermissionController extends BaseController { * @return */ @ApiOperation(value = "分页查询", notes = "分页查询") - @GetMapping("/list") + @PostMapping("/list") @RequiresPermissions("system:permission:list") @ResponseBody public ResultTable list(Tablepar tablepar, String searchText) { diff --git a/src/main/java/com/fc/v2/shiro/service/ShiroSession.java b/src/main/java/com/fc/v2/shiro/service/ShiroSession.java index 59788bccda6c94e54ee719661d43f2dc19163f74..80e2c41a1ad8f4c0d485dfcce27073ec9c5d5c92 100644 --- a/src/main/java/com/fc/v2/shiro/service/ShiroSession.java +++ b/src/main/java/com/fc/v2/shiro/service/ShiroSession.java @@ -33,7 +33,7 @@ public class ShiroSession extends DefaultWebSessionManager { public ShiroSession() { super(); // 设置 shiro session 失效时间,默认为30分钟,这里现在设置为15分钟 - setGlobalSessionTimeout(MILLIS_PER_MINUTE * 15); + setGlobalSessionTimeout(MILLIS_PER_MINUTE * 30); } /** diff --git a/src/main/resources/static/admin/css/other/console1.css b/src/main/resources/static/admin/css/other/console1.css index 059b720a1d86fae31302ffadb0a609273ba6566e..79042f4a44b318330fcde9ccd312791f322afeec 100644 --- a/src/main/resources/static/admin/css/other/console1.css +++ b/src/main/resources/static/admin/css/other/console1.css @@ -11,6 +11,9 @@ line-height: 60px; font-size: 30px; border-right: 1px solid #eceff9; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; } .top-panel-tips {