From aa279a69a1311270b9bcba5b7fddb8ea71442604 Mon Sep 17 00:00:00 2001 From: bootdo <1992lcg@163.com> Date: Thu, 15 Mar 2018 10:24:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=88=A0=E9=99=A4=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=A0=E9=99=A4=E8=8F=9C=E5=8D=95=E5=92=8C?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=85=B3=E8=81=94=E8=A1=A8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/SpringBootSampleApplication.java | 22 +++ .../common/controller/FileController.java | 2 +- .../common/quartz/utils/QuartzManager.java | 2 +- .../com/bootdo/common/utils/GenUtils.java | 1 - .../common/utils/SpringContextHolder.java | 164 +++++++++--------- .../system/controller/UserController.java | 2 +- .../com/bootdo/system/dao/RoleMenuDao.java | 2 + 7 files changed, 109 insertions(+), 86 deletions(-) create mode 100644 bootdo/src/main/java/com/bootdo/common/config/SpringBootSampleApplication.java diff --git a/bootdo/src/main/java/com/bootdo/common/config/SpringBootSampleApplication.java b/bootdo/src/main/java/com/bootdo/common/config/SpringBootSampleApplication.java new file mode 100644 index 0000000..a6d45f1 --- /dev/null +++ b/bootdo/src/main/java/com/bootdo/common/config/SpringBootSampleApplication.java @@ -0,0 +1,22 @@ +//package com.bootdo.common.config; +// +//import com.bootdo.BootdoApplication; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.boot.builder.SpringApplicationBuilder; +//import org.springframework.boot.web.support.SpringBootServletInitializer; +// +///** +// * war包部署需要 +// * 修改启动类，继承 SpringBootServletInitializer 并重写 configure 方法 +// */ +//public class SpringBootSampleApplication extends SpringBootServletInitializer{ +// +// private static final Logger logger = LoggerFactory.getLogger(SpringBootSampleApplication.class); +// +// @Override +// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { +// return builder.sources(this.getClass()); +// } +// +//} \ No newline at end of file diff --git a/bootdo/src/main/java/com/bootdo/common/controller/FileController.java b/bootdo/src/main/java/com/bootdo/common/controller/FileController.java index d2fedc7..8f24936 100644 --- a/bootdo/src/main/java/com/bootdo/common/controller/FileController.java +++ b/bootdo/src/main/java/com/bootdo/common/controller/FileController.java @@ -4,7 +4,7 @@ import com.bootdo.common.config.BootdoConfig; import com.bootdo.common.domain.FileDO; import com.bootdo.common.service.FileService; import com.bootdo.common.utils.*; -import org.apache.catalina.servlet4preview.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/bootdo/src/main/java/com/bootdo/common/quartz/utils/QuartzManager.java b/bootdo/src/main/java/com/bootdo/common/quartz/utils/QuartzManager.java index 6b80121..b06f1f1 100644 --- a/bootdo/src/main/java/com/bootdo/common/quartz/utils/QuartzManager.java +++ b/bootdo/src/main/java/com/bootdo/common/quartz/utils/QuartzManager.java @@ -27,7 +27,7 @@ import org.springframework.web.context.support.SpringBeanAutowiringSupport; import com.bootdo.common.domain.ScheduleJob; import com.bootdo.common.quartz.factory.*; -import com.bootdo.common.utils.SpringContextHolder;; +//import com.bootdo.common.utils.SpringContextHolder; /** * diff --git a/bootdo/src/main/java/com/bootdo/common/utils/GenUtils.java b/bootdo/src/main/java/com/bootdo/common/utils/GenUtils.java index 7e95ce8..4948afb 100644 --- a/bootdo/src/main/java/com/bootdo/common/utils/GenUtils.java +++ b/bootdo/src/main/java/com/bootdo/common/utils/GenUtils.java @@ -24,7 +24,6 @@ import java.util.zip.ZipOutputStream; /** * 代码生成器 工具类 */ -@SuppressWarnings("AlibabaRemoveCommentedCode") public class GenUtils { diff --git a/bootdo/src/main/java/com/bootdo/common/utils/SpringContextHolder.java b/bootdo/src/main/java/com/bootdo/common/utils/SpringContextHolder.java index a756fb9..b739105 100644 --- a/bootdo/src/main/java/com/bootdo/common/utils/SpringContextHolder.java +++ b/bootdo/src/main/java/com/bootdo/common/utils/SpringContextHolder.java @@ -1,82 +1,82 @@ -package com.bootdo.common.utils; - -import org.apache.commons.lang3.Validate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; - -/** - * 以静态变量保存Spring ApplicationContext, 可在任何代码任何地方任何时候取出ApplicaitonContext. - * - */ -@Service -@Lazy(false) -public class SpringContextHolder implements ApplicationContextAware, DisposableBean { - - private static ApplicationContext applicationContext = null; - - private static Logger logger = LoggerFactory.getLogger(SpringContextHolder.class); - - /** - * 取得存储在静态变量中的ApplicationContext. - */ - public static ApplicationContext getApplicationContext() { - assertContextInjected(); - return applicationContext; - } - - /** - * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型. - */ - @SuppressWarnings("unchecked") - public static T getBean(String name) { - assertContextInjected(); - return (T) applicationContext.getBean(name); - } - - /** - * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型. - */ - public static T getBean(Class requiredType) { - assertContextInjected(); - return applicationContext.getBean(requiredType); - } - - /** - * 清除SpringContextHolder中的ApplicationContext为Null. - */ - public static void clearHolder() { - if (logger.isDebugEnabled()) { - logger.debug("清除SpringContextHolder中的ApplicationContext:" + applicationContext); - } - applicationContext = null; - } - - /** - * 实现ApplicationContextAware接口, 注入Context到静态变量中. - */ - @Override - public void setApplicationContext(ApplicationContext applicationContext) { - SpringContextHolder.applicationContext = applicationContext; - } - - /** - * 实现DisposableBean接口, 在Context关闭时清理静态变量. - */ - @Override - public void destroy() throws Exception { - SpringContextHolder.clearHolder(); - } - - /** - * 检查ApplicationContext不为空. - */ - private static void assertContextInjected() { - Validate.validState(applicationContext != null, - "applicaitonContext属性未注入, 请在applicationContext.xml中定义SpringContextHolder."); - } -} \ No newline at end of file +//package com.bootdo.common.utils; +// +//import org.apache.commons.lang3.Validate; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.beans.factory.DisposableBean; +//import org.springframework.context.ApplicationContext; +//import org.springframework.context.ApplicationContextAware; +//import org.springframework.context.annotation.Lazy; +//import org.springframework.stereotype.Service; +// +///** +// * 以静态变量保存Spring ApplicationContext, 可在任何代码任何地方任何时候取出ApplicaitonContext. +// * +// */ +//@Service +//@Lazy(false) +//public class SpringContextHolder implements ApplicationContextAware, DisposableBean { +// +// private static ApplicationContext applicationContext = null; +// +// private static Logger logger = LoggerFactory.getLogger(SpringContextHolder.class); +// +// /** +// * 取得存储在静态变量中的ApplicationContext. +// */ +// public static ApplicationContext getApplicationContext() { +// assertContextInjected(); +// return applicationContext; +// } +// +// /** +// * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型. +// */ +// @SuppressWarnings("unchecked") +// public static T getBean(String name) { +// assertContextInjected(); +// return (T) applicationContext.getBean(name); +// } +// +// /** +// * 从静态变量applicationContext中取得Bean, 自动转型为所赋值对象的类型. +// */ +// public static T getBean(Class requiredType) { +// assertContextInjected(); +// return applicationContext.getBean(requiredType); +// } +// +// /** +// * 清除SpringContextHolder中的ApplicationContext为Null. +// */ +// public static void clearHolder() { +// if (logger.isDebugEnabled()) { +// logger.debug("清除SpringContextHolder中的ApplicationContext:" + applicationContext); +// } +// applicationContext = null; +// } +// +// /** +// * 实现ApplicationContextAware接口, 注入Context到静态变量中. +// */ +// @Override +// public void setApplicationContext(ApplicationContext applicationContext) { +// SpringContextHolder.applicationContext = applicationContext; +// } +// +// /** +// * 实现DisposableBean接口, 在Context关闭时清理静态变量. +// */ +// @Override +// public void destroy() throws Exception { +// SpringContextHolder.clearHolder(); +// } +// +// /** +// * 检查ApplicationContext不为空. +// */ +// private static void assertContextInjected() { +// Validate.validState(applicationContext != null, +// "applicaitonContext属性未注入, 请在applicationContext.xml中定义SpringContextHolder."); +// } +//} \ No newline at end of file diff --git a/bootdo/src/main/java/com/bootdo/system/controller/UserController.java b/bootdo/src/main/java/com/bootdo/system/controller/UserController.java index 0496048..da692cd 100644 --- a/bootdo/src/main/java/com/bootdo/system/controller/UserController.java +++ b/bootdo/src/main/java/com/bootdo/system/controller/UserController.java @@ -13,7 +13,7 @@ import com.bootdo.system.domain.UserDO; import com.bootdo.system.service.RoleService; import com.bootdo.system.service.UserService; import com.bootdo.system.vo.UserVO; -import org.apache.catalina.servlet4preview.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequest; import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bootdo/src/main/java/com/bootdo/system/dao/RoleMenuDao.java b/bootdo/src/main/java/com/bootdo/system/dao/RoleMenuDao.java index 5c7e978..aa81430 100644 --- a/bootdo/src/main/java/com/bootdo/system/dao/RoleMenuDao.java +++ b/bootdo/src/main/java/com/bootdo/system/dao/RoleMenuDao.java @@ -33,6 +33,8 @@ public interface RoleMenuDao { List listMenuIdByRoleId(Long roleId); int removeByRoleId(Long roleId); + + int removeByMenuId(Long menuId); int batchSave(List list); } -- Gitee