Alawn/slife
1
0
Fork 0
mirror of https://gitee.com/jamen/slife.git synced 2026-10-31 22:33:39 +00:00
Code Issues Releases Wiki Activity

review

Browse Source
This commit is contained in:
felixu
2019-03-25 16:32:04 +08:00
parent 7dcf676dbc
commit 8b89da9c1f
18 changed files with 56 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slife-common/src/main/java/com/slife/base/controller/BaseController.java
+1 -1
View File
@@ -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;
slife-common/src/main/java/com/slife/base/entity/DataEntity.java
+3 -2
View File
@@ -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<T extends Model> extends BaseEntity<T> {
public DataEntity() {
super();
this.delFlag = Global.DEL_FLAG_NORMAL;
this.delFlag = SettingsConstants.DelFlag.NORMAL;
}
slife-common/src/main/java/com/slife/base/service/impl/BaseService.java
+1 -1
View File
@@ -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;
slife-common/src/main/java/com/slife/constant/Global.java → slife-common/src/main/java/com/slife/constants/Global.java
+1 -9
View File
@@ -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
*/
slife-common/src/main/java/com/slife/constant/SearchParam.java → slife-common/src/main/java/com/slife/constants/SearchParam.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.slife.constant;
package com.slife.constants;
/**
* Created by chen on 2017/9/21.
slife-common/src/main/java/com/slife/constant/Setting.java → slife-common/src/main/java/com/slife/constants/Setting.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.slife.constant;
package com.slife.constants;
/**
* Created by chen on 2017/9/4.
slife-common/src/main/java/com/slife/constants/SettingsConstants.java
+26
View File
@@ -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";
}
}
slife-sys-api/src/main/java/com/slife/entity/CompanyLinkEntity.java
+3 -2
View File
@@ -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<T extends Model> extends DataEntity<T> {
public CompanyLinkEntity() {
super();
this.delFlag = Global.DEL_FLAG_NORMAL;
this.delFlag = SettingsConstants.DelFlag.NORMAL;
}
slife-sys-api/src/main/java/com/slife/entity/SysRole.java
+1 -1
View File
@@ -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;
slife-sys-api/src/main/java/com/slife/entity/SysUser.java
+1 -1
View File
@@ -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;
slife-sys/src/main/java/com/slife/config/shiro/AuthRealm.java
+2 -2
View File
@@ -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;
slife-sys/src/main/java/com/slife/controller/FileController.java
+1 -1
View File
@@ -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;
slife-sys/src/main/java/com/slife/service/impl/SysDictService.java
+1 -2
View File
@@ -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;
slife-sys/src/main/java/com/slife/service/impl/SysMenuService.java
+1 -2
View File
@@ -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;
slife-sys/src/main/java/com/slife/service/impl/SysOfficeService.java
+1 -2
View File
@@ -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;
slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java
+5 -6
View File
@@ -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<SysRoleDao, SysRole> implements
*/
@Override
public List<SysRole> ListSysRoleUseable() {
return list(new QueryWrapper<SysRole>().lambda().eq(SysRole::getDelFlag, Global.DEL_FLAG_NORMAL).eq(SysRole::getUseable, Global.YES));
return list(new QueryWrapper<SysRole>().lambda().eq(SysRole::getDelFlag, SettingsConstants.DelFlag.NORMAL).eq(SysRole::getUseable, Global.YES));
}
/**
@@ -142,7 +141,7 @@ public class SysRoleService extends BaseService<SysRoleDao, SysRole> implements
.stream().parallel()
.map(SysUserRole::getSysRoleId)
.collect(Collectors.toList());
return list(new QueryWrapper<SysRole>().lambda().in(SysRole::getId, roleIds).eq(SysRole::getDelFlag, Global.DEL_FLAG_NORMAL).eq(SysRole::getUseable, Global.YES));
return list(new QueryWrapper<SysRole>().lambda().in(SysRole::getId, roleIds).eq(SysRole::getDelFlag, SettingsConstants.DelFlag.NORMAL).eq(SysRole::getUseable, Global.YES));
}
/**
slife-web/src/main/java/com/slife/WebApplication.java
-1
View File
@@ -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 {
slife-web/src/main/java/com/slife/config/DruidConfig.java
+6 -15
View File
@@ -12,18 +12,14 @@ import java.util.HashMap;
import java.util.Map;
/**
* Created by chen on 2017/5/16.
* <p>
* <p>
* 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<String, String> initParams = new HashMap<String, String>();
Map<String, String> initParams = new HashMap<>(8);
//设置忽略请求
initParams.put("exclusions", "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*");
filterRegistrationBean.setInitParameters(initParams);