diff --git a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java index 829a7ca8..6fbac14a 100644 --- a/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java +++ b/modules/core/src/main/java/com/jeesite/modules/config/ShiroConfig.java @@ -187,6 +187,7 @@ public class ShiroConfig { bean.setRealms(realms); bean.setSessionManager(sessionManager); bean.setCacheManager(shiroCacheManager); + //bean.setRememberMeManager(null); // 关闭 RememberMe // 设置支持CAS的subjectFactory bean.setSubjectFactory(new CasSubjectFactory()); return bean; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java index b8e2fc9a..f296225a 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/interceptor/LogInterceptor.java @@ -53,10 +53,19 @@ public class LogInterceptor extends BaseService implements HandlerInterceptor { @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { - Long beginTime = startTimeThreadLocal.get();// 得到线程绑定的局部变量(开始时间) long endTime = System.currentTimeMillis(); // 2、结束时间 - long executeTime = beginTime == null ? 0 : endTime - beginTime; // 3、获取执行时间 - startTimeThreadLocal.remove(); // 用完之后销毁线程变量数据 + long startTime = 0; // 得到线程绑定的局部变量(开始时间) + if (startTimeThreadLocal != null){ + Long time = startTimeThreadLocal.get(); + if (time != null){ + startTime = time; + } + startTimeThreadLocal.remove(); // 用完之后销毁线程变量数据 + } + if (startTime == 0){ + startTime = endTime + 1000; // 得到 -1000 方便统计 + } + long executeTime = endTime - startTime; // 3、获取执行时间 // 保存日志 LogUtils.saveLog(UserUtils.getUser(), request, handler, ex, null, null, executeTime); diff --git a/web/bin/package.bat b/web/bin/package.bat index a0c3ed03..18be4cf9 100644 --- a/web/bin/package.bat +++ b/web/bin/package.bat @@ -11,8 +11,8 @@ echo. %~d0 cd %~dp0 -rem cd .. -rem call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U +cd .. +call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U cmd /c msg %username% /time:0 /w "..." pause \ No newline at end of file