From 8b89da9c1ff19f9bf5b3bdd96fab32fe7c49cd97 Mon Sep 17 00:00:00 2001 From: felixu Date: Mon, 25 Mar 2019 16:32:04 +0800 Subject: [PATCH] review --- .../slife/base/controller/BaseController.java | 2 +- .../com/slife/base/entity/DataEntity.java | 5 ++-- .../slife/base/service/impl/BaseService.java | 2 +- .../slife/{constant => constants}/Global.java | 10 +------ .../{constant => constants}/SearchParam.java | 2 +- .../{constant => constants}/Setting.java | 2 +- .../slife/constants/SettingsConstants.java | 26 +++++++++++++++++++ .../com/slife/entity/CompanyLinkEntity.java | 5 ++-- .../main/java/com/slife/entity/SysRole.java | 2 +- .../main/java/com/slife/entity/SysUser.java | 2 +- .../com/slife/config/shiro/AuthRealm.java | 4 +-- .../com/slife/controller/FileController.java | 2 +- .../slife/service/impl/SysDictService.java | 3 +-- .../slife/service/impl/SysMenuService.java | 3 +-- .../slife/service/impl/SysOfficeService.java | 3 +-- .../slife/service/impl/SysRoleService.java | 11 ++++---- .../main/java/com/slife/WebApplication.java | 1 - .../java/com/slife/config/DruidConfig.java | 21 +++++---------- 18 files changed, 56 insertions(+), 50 deletions(-) rename slife-common/src/main/java/com/slife/{constant => constants}/Global.java (60%) rename slife-common/src/main/java/com/slife/{constant => constants}/SearchParam.java (94%) rename slife-common/src/main/java/com/slife/{constant => constants}/Setting.java (94%) create mode 100644 slife-common/src/main/java/com/slife/constants/SettingsConstants.java diff --git a/slife-common/src/main/java/com/slife/base/controller/BaseController.java b/slife-common/src/main/java/com/slife/base/controller/BaseController.java index 615a39d..bd94b4d 100644 --- a/slife-common/src/main/java/com/slife/base/controller/BaseController.java +++ b/slife-common/src/main/java/com/slife/base/controller/BaseController.java @@ -1,6 +1,6 @@ package com.slife.base.controller; -import com.slife.constant.Setting; +import com.slife.constants.Setting; import com.slife.utils.DateUtils; import com.slife.utils.ExcelUtils; import com.slife.utils.FileUtils; diff --git a/slife-common/src/main/java/com/slife/base/entity/DataEntity.java b/slife-common/src/main/java/com/slife/base/entity/DataEntity.java index d92cdf0..757445a 100644 --- a/slife-common/src/main/java/com/slife/base/entity/DataEntity.java +++ b/slife-common/src/main/java/com/slife/base/entity/DataEntity.java @@ -9,7 +9,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.slife.constant.Global; +import com.slife.constants.Global; +import com.slife.constants.SettingsConstants; import org.hibernate.validator.constraints.Length; import java.util.Date; @@ -87,7 +88,7 @@ public abstract class DataEntity extends BaseEntity { public DataEntity() { super(); - this.delFlag = Global.DEL_FLAG_NORMAL; + this.delFlag = SettingsConstants.DelFlag.NORMAL; } diff --git a/slife-common/src/main/java/com/slife/base/service/impl/BaseService.java b/slife-common/src/main/java/com/slife/base/service/impl/BaseService.java index 3085739..728819b 100644 --- a/slife-common/src/main/java/com/slife/base/service/impl/BaseService.java +++ b/slife-common/src/main/java/com/slife/base/service/impl/BaseService.java @@ -9,7 +9,7 @@ import com.slife.base.entity.TreeEntity; import com.slife.base.service.IBaseService; import com.slife.base.vo.DataTable; import com.slife.base.vo.JsTree; -import com.slife.constant.SearchParam; +import com.slife.constants.SearchParam; import com.slife.utils.StringUtils; import org.springframework.util.CollectionUtils; import java.util.Collections; diff --git a/slife-common/src/main/java/com/slife/constant/Global.java b/slife-common/src/main/java/com/slife/constants/Global.java similarity index 60% rename from slife-common/src/main/java/com/slife/constant/Global.java rename to slife-common/src/main/java/com/slife/constants/Global.java index 6c53fb9..4bf65ea 100644 --- a/slife-common/src/main/java/com/slife/constant/Global.java +++ b/slife-common/src/main/java/com/slife/constants/Global.java @@ -1,4 +1,4 @@ -package com.slife.constant; +package com.slife.constants; /** * Created by chen on 2017/7/14. @@ -15,14 +15,6 @@ public class Global { public static final String YES = "Y"; public static final String NO = "N"; - - /** - * 删除标记（Y：正常；N：删除；A：审核；） - */ - public static final String DEL_FLAG_NORMAL = "Y"; - public static final String DEL_FLAG_DELETE = "N"; - public static final String DEL_FLAG_AUDIT = "A"; - /** * 树的顶级 节点id */ diff --git a/slife-common/src/main/java/com/slife/constant/SearchParam.java b/slife-common/src/main/java/com/slife/constants/SearchParam.java similarity index 94% rename from slife-common/src/main/java/com/slife/constant/SearchParam.java rename to slife-common/src/main/java/com/slife/constants/SearchParam.java index 8970946..ed5060e 100644 --- a/slife-common/src/main/java/com/slife/constant/SearchParam.java +++ b/slife-common/src/main/java/com/slife/constants/SearchParam.java @@ -1,4 +1,4 @@ -package com.slife.constant; +package com.slife.constants; /** * Created by chen on 2017/9/21. diff --git a/slife-common/src/main/java/com/slife/constant/Setting.java b/slife-common/src/main/java/com/slife/constants/Setting.java similarity index 94% rename from slife-common/src/main/java/com/slife/constant/Setting.java rename to slife-common/src/main/java/com/slife/constants/Setting.java index b786688..6f276c7 100644 --- a/slife-common/src/main/java/com/slife/constant/Setting.java +++ b/slife-common/src/main/java/com/slife/constants/Setting.java @@ -1,4 +1,4 @@ -package com.slife.constant; +package com.slife.constants; /** * Created by chen on 2017/9/4. diff --git a/slife-common/src/main/java/com/slife/constants/SettingsConstants.java b/slife-common/src/main/java/com/slife/constants/SettingsConstants.java new file mode 100644 index 0000000..48b7d33 --- /dev/null +++ b/slife-common/src/main/java/com/slife/constants/SettingsConstants.java @@ -0,0 +1,26 @@ +package com.slife.constants; + +/** + * @author felixu + * @date 2019.03.20 + */ +public interface SettingsConstants { + + /** + * 应用相关 + */ + interface AppInfo { + String NAME = "slife"; + String VERSION =""; + String AUTHOR = ""; + } + + /** + * 删除标记(Y：正常；N：删除；A：审核） + */ + interface DelFlag { + String NORMAL = "Y"; + String DELETE = "N"; + String AUDIT = "A"; + } +} diff --git a/slife-sys-api/src/main/java/com/slife/entity/CompanyLinkEntity.java b/slife-sys-api/src/main/java/com/slife/entity/CompanyLinkEntity.java index 0e56e94..ef54216 100644 --- a/slife-sys-api/src/main/java/com/slife/entity/CompanyLinkEntity.java +++ b/slife-sys-api/src/main/java/com/slife/entity/CompanyLinkEntity.java @@ -3,7 +3,8 @@ package com.slife.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.slife.base.entity.DataEntity; -import com.slife.constant.Global; +import com.slife.constants.Global; +import com.slife.constants.SettingsConstants; /** * Created by chen on 2017/7/31. @@ -17,7 +18,7 @@ public abstract class CompanyLinkEntity extends DataEntity { public CompanyLinkEntity() { super(); - this.delFlag = Global.DEL_FLAG_NORMAL; + this.delFlag = SettingsConstants.DelFlag.NORMAL; } diff --git a/slife-sys-api/src/main/java/com/slife/entity/SysRole.java b/slife-sys-api/src/main/java/com/slife/entity/SysRole.java index f9a15ad..ba29719 100644 --- a/slife-sys-api/src/main/java/com/slife/entity/SysRole.java +++ b/slife-sys-api/src/main/java/com/slife/entity/SysRole.java @@ -3,7 +3,7 @@ package com.slife.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.slife.constant.Global; +import com.slife.constants.Global; import com.slife.enums.DataScopeEnum; import org.hibernate.validator.constraints.Length; diff --git a/slife-sys-api/src/main/java/com/slife/entity/SysUser.java b/slife-sys-api/src/main/java/com/slife/entity/SysUser.java index c67bbd1..a0debb5 100644 --- a/slife-sys-api/src/main/java/com/slife/entity/SysUser.java +++ b/slife-sys-api/src/main/java/com/slife/entity/SysUser.java @@ -4,7 +4,7 @@ package com.slife.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.slife.constant.Global; +import com.slife.constants.Global; import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.Length; diff --git a/slife-sys/src/main/java/com/slife/config/shiro/AuthRealm.java b/slife-sys/src/main/java/com/slife/config/shiro/AuthRealm.java index 8299749..26253f7 100644 --- a/slife-sys/src/main/java/com/slife/config/shiro/AuthRealm.java +++ b/slife-sys/src/main/java/com/slife/config/shiro/AuthRealm.java @@ -1,7 +1,7 @@ package com.slife.config.shiro; -import com.slife.constant.Global; -import com.slife.constant.Setting; +import com.slife.constants.Global; +import com.slife.constants.Setting; import com.slife.entity.SysRole; import com.slife.entity.SysUser; import com.slife.service.ISysRoleService; diff --git a/slife-sys/src/main/java/com/slife/controller/FileController.java b/slife-sys/src/main/java/com/slife/controller/FileController.java index a7c60bd..0241675 100644 --- a/slife-sys/src/main/java/com/slife/controller/FileController.java +++ b/slife-sys/src/main/java/com/slife/controller/FileController.java @@ -1,7 +1,7 @@ package com.slife.controller; import com.slife.base.entity.ReturnDTO; -import com.slife.constant.Setting; +import com.slife.constants.Setting; import com.slife.utils.FileUtils; import com.slife.utils.ReturnDTOUtil; import io.swagger.annotations.ApiOperation; diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java b/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java index 9e53768..710ff78 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java @@ -1,11 +1,10 @@ package com.slife.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.slife.base.service.impl.BaseService; import com.slife.base.vo.JsTree; import com.slife.base.vo.PCAjaxVO; -import com.slife.constant.Global; +import com.slife.constants.Global; import com.slife.dao.SysDictDao; import com.slife.entity.SysDict; import com.slife.service.ISysDictService; diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysMenuService.java b/slife-sys/src/main/java/com/slife/service/impl/SysMenuService.java index adb4e98..7ce52b1 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysMenuService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysMenuService.java @@ -1,10 +1,9 @@ package com.slife.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.slife.base.service.impl.BaseService; import com.slife.base.vo.JsTree; -import com.slife.constant.Global; +import com.slife.constants.Global; import com.slife.dao.SysMenuDao; import com.slife.entity.SysMenu; import com.slife.entity.SysRoleMenu; diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysOfficeService.java b/slife-sys/src/main/java/com/slife/service/impl/SysOfficeService.java index 5a9d331..a7bb2ad 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysOfficeService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysOfficeService.java @@ -1,10 +1,9 @@ package com.slife.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.slife.base.service.impl.BaseService; import com.slife.base.vo.JsTree; -import com.slife.constant.Global; +import com.slife.constants.Global; import com.slife.dao.SysOfficeDao; import com.slife.entity.SysOffice; import com.slife.service.ISysOfficeService; diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java b/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java index 32c4c7c..bbf2faa 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java @@ -1,15 +1,14 @@ package com.slife.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.slife.base.service.impl.BaseService; import com.slife.base.vo.DataTable; import com.slife.base.vo.JsTree; import com.slife.base.vo.JsTreeState; -import com.slife.constant.Global; +import com.slife.constants.Global; +import com.slife.constants.SettingsConstants; import com.slife.dao.SysRoleDao; -import com.slife.entity.SysMenu; import com.slife.entity.SysRole; import com.slife.entity.SysRoleMenu; import com.slife.entity.SysUserRole; @@ -22,7 +21,7 @@ import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; + import java.util.*; import java.util.stream.Collectors; @@ -110,7 +109,7 @@ public class SysRoleService extends BaseService implements */ @Override public List ListSysRoleUseable() { - return list(new QueryWrapper().lambda().eq(SysRole::getDelFlag, Global.DEL_FLAG_NORMAL).eq(SysRole::getUseable, Global.YES)); + return list(new QueryWrapper().lambda().eq(SysRole::getDelFlag, SettingsConstants.DelFlag.NORMAL).eq(SysRole::getUseable, Global.YES)); } /** @@ -142,7 +141,7 @@ public class SysRoleService extends BaseService implements .stream().parallel() .map(SysUserRole::getSysRoleId) .collect(Collectors.toList()); - return list(new QueryWrapper().lambda().in(SysRole::getId, roleIds).eq(SysRole::getDelFlag, Global.DEL_FLAG_NORMAL).eq(SysRole::getUseable, Global.YES)); + return list(new QueryWrapper().lambda().in(SysRole::getId, roleIds).eq(SysRole::getDelFlag, SettingsConstants.DelFlag.NORMAL).eq(SysRole::getUseable, Global.YES)); } /** diff --git a/slife-web/src/main/java/com/slife/WebApplication.java b/slife-web/src/main/java/com/slife/WebApplication.java index 5ad397e..d740a0a 100644 --- a/slife-web/src/main/java/com/slife/WebApplication.java +++ b/slife-web/src/main/java/com/slife/WebApplication.java @@ -7,7 +7,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication(exclude={org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class, org.activiti.spring.boot.SecurityAutoConfiguration.class}) -//@SpringBootApplication @EnableTransactionManagement public class WebApplication { diff --git a/slife-web/src/main/java/com/slife/config/DruidConfig.java b/slife-web/src/main/java/com/slife/config/DruidConfig.java index 7353df6..6f94e9f 100644 --- a/slife-web/src/main/java/com/slife/config/DruidConfig.java +++ b/slife-web/src/main/java/com/slife/config/DruidConfig.java @@ -12,18 +12,14 @@ import java.util.HashMap; import java.util.Map; /** - * Created by chen on 2017/5/16. - *

- *

- * Describe: + * 通过访问http://localhost:${server.port}/druid/datasource.html查看监控信息 + * + * @author jamen + * @date 2017.5.16 */ @Configuration public class DruidConfig { - /** - * 注册DruidServlet - * http://localhost:8080/druid/datasource.html查看监控信息 - * @return - */ + @Bean public ServletRegistrationBean druidServletRegistrationBean() { ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(); @@ -32,16 +28,11 @@ public class DruidConfig { return servletRegistrationBean; } - /** - * 注册DruidFilter拦截 - * - * @return - */ @Bean public FilterRegistrationBean duridFilterRegistrationBean() { FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(); filterRegistrationBean.setFilter(new WebStatFilter()); - Map initParams = new HashMap(); + Map initParams = new HashMap<>(8); //设置忽略请求 initParams.put("exclusions", "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*"); filterRegistrationBean.setInitParameters(initParams);