Merge branch 'master' of http://git.picaiba.com/kszny/ym-pass
Conflicts: ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java ym-gateway/src/main/resources/application.yml ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
This commit is contained in:
caixiang
commit
d22b778b8a
29
README.md
Normal file
29
README.md
Normal file
@ -0,0 +1,29 @@
|
||||
**项目说明**
|
||||
- 这是根据renren框架重新修改出来的框架
|
||||
- 采用SpringBoot、MyBatis、spring security框架
|
||||
- 提供了代码生成器，只需编写30%左右代码，其余的代码交给系统自动生成，可快速完成开发任务
|
||||
- 代码生成器是用的Velocity模版引擎，如果需要可以在ym-generator模块中进行vm模板的修改和一些包名等基础修改
|
||||
<br>
|
||||
|
||||
**新增业务模块需要注意**
|
||||
- 新增业务模块时，业务模块需要依赖ym-admin，并且ym-gateway模块maven需要依赖新建模块
|
||||
- 自动生成的controller接口都带鉴权注解，如果开发阶段可以先注释掉，后面开发完成之后再把鉴权添加到数据库
|
||||
<br>
|
||||
|
||||
**技术选型：**
|
||||
- 核心框架：Spring Boot 2.7
|
||||
- 安全框架：Spring Security
|
||||
- 持久层框架：MyBatis 3.5
|
||||
- 定时器：Quartz 2.3
|
||||
- 数据库连接池：HikariCP
|
||||
- 日志管理：log4j2
|
||||
- 页面交互：Vue2.x
|
||||
|
||||
<br>
|
||||
|
||||
**软件需求**
|
||||
- JDK1.8
|
||||
- Maven3.0+
|
||||
- MySQL8.0
|
||||
- redis6.0+
|
||||
<br>
|
||||
11
pom.xml
11
pom.xml
@ -35,7 +35,7 @@
|
||||
<java.version>1.8</java.version>
|
||||
<junit.version>4.13.2</junit.version>
|
||||
<jedis.version>4.2.2</jedis.version>
|
||||
<!-- <druid.version>1.2.9</druid.version>-->
|
||||
<druid.version>1.2.9</druid.version>
|
||||
<mybatisplus.version>3.5.1</mybatisplus.version>
|
||||
<sqlserver.version>4.0</sqlserver.version>
|
||||
<oracle.version>11.2.0.3</oracle.version>
|
||||
@ -136,9 +136,14 @@
|
||||
<artifactId>postgresql</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jdbc</artifactId>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>druid-spring-boot-starter</artifactId>
|
||||
<version>${druid.version}</version>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||
<!-- <artifactId>spring-boot-starter-data-jdbc</artifactId>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<dependency>
|
||||
<groupId>cn.afterturn</groupId>
|
||||
|
||||
@ -15,6 +15,7 @@ CREATE TABLE sys_user (
|
||||
create_date datetime COMMENT '创建时间',
|
||||
updater bigint COMMENT '更新者',
|
||||
update_date datetime COMMENT '更新时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
unique key uk_username (username),
|
||||
key idx_create_date (create_date)
|
||||
@ -31,6 +32,7 @@ CREATE TABLE sys_dept (
|
||||
create_date datetime COMMENT '创建时间',
|
||||
updater bigint COMMENT '更新者',
|
||||
update_date datetime COMMENT '更新时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
key idx_pid (pid),
|
||||
key idx_sort (sort)
|
||||
@ -47,6 +49,7 @@ create table sys_role
|
||||
create_date datetime COMMENT '创建时间',
|
||||
updater bigint COMMENT '更新者',
|
||||
update_date datetime COMMENT '更新时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
key idx_dept_id (dept_id)
|
||||
)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='角色管理';
|
||||
@ -66,6 +69,7 @@ create table sys_menu
|
||||
create_date datetime COMMENT '创建时间',
|
||||
updater bigint COMMENT '更新者',
|
||||
update_date datetime COMMENT '更新时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
key idx_pid (pid),
|
||||
key idx_sort (sort)
|
||||
@ -79,6 +83,7 @@ create table sys_role_user
|
||||
user_id bigint COMMENT '用户ID',
|
||||
creator bigint COMMENT '创建者',
|
||||
create_date datetime COMMENT '创建时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
key idx_role_id (role_id),
|
||||
key idx_user_id (user_id)
|
||||
@ -92,6 +97,7 @@ create table sys_role_menu
|
||||
menu_id bigint COMMENT '菜单ID',
|
||||
creator bigint COMMENT '创建者',
|
||||
create_date datetime COMMENT '创建时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
key idx_role_id (role_id),
|
||||
key idx_menu_id (menu_id)
|
||||
@ -105,6 +111,7 @@ create table sys_role_data_scope
|
||||
dept_id bigint COMMENT '部门ID',
|
||||
creator bigint COMMENT '创建者',
|
||||
create_date datetime COMMENT '创建时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
key idx_role_id (role_id)
|
||||
)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='角色数据权限';
|
||||
@ -121,6 +128,7 @@ create table sys_params
|
||||
create_date datetime COMMENT '创建时间',
|
||||
updater bigint COMMENT '更新者',
|
||||
update_date datetime COMMENT '更新时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
unique key uk_param_code (param_code),
|
||||
key idx_create_date (create_date)
|
||||
@ -138,6 +146,7 @@ create table sys_dict_type
|
||||
create_date datetime COMMENT '创建时间',
|
||||
updater bigint COMMENT '更新者',
|
||||
update_date datetime COMMENT '更新时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
UNIQUE KEY(dict_type)
|
||||
)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='字典类型';
|
||||
@ -155,6 +164,7 @@ create table sys_dict_data
|
||||
create_date datetime COMMENT '创建时间',
|
||||
updater bigint COMMENT '更新者',
|
||||
update_date datetime COMMENT '更新时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
unique key uk_dict_type_value (dict_type_id, dict_value),
|
||||
key idx_sort (sort)
|
||||
@ -171,6 +181,7 @@ create table sys_log_login
|
||||
creator_name varchar(50) COMMENT '用户名',
|
||||
creator bigint COMMENT '创建者',
|
||||
create_date datetime COMMENT '创建时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
key idx_status (status),
|
||||
key idx_create_date (create_date)
|
||||
@ -191,6 +202,7 @@ create table sys_log_operation
|
||||
creator_name varchar(50) COMMENT '用户名',
|
||||
creator bigint COMMENT '创建者',
|
||||
create_date datetime COMMENT '创建时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
key idx_create_date (create_date)
|
||||
)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='操作日志';
|
||||
@ -207,6 +219,7 @@ create table sys_log_error
|
||||
error_info text COMMENT '异常信息',
|
||||
creator bigint COMMENT '创建者',
|
||||
create_date datetime COMMENT '创建时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
primary key (id),
|
||||
key idx_create_date (create_date)
|
||||
)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='异常日志';
|
||||
@ -218,6 +231,7 @@ CREATE TABLE sys_oss (
|
||||
url varchar(200) COMMENT 'URL地址',
|
||||
creator bigint COMMENT '创建者',
|
||||
create_date datetime COMMENT '创建时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
PRIMARY KEY (id),
|
||||
key idx_create_date (create_date)
|
||||
) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='文件上传';
|
||||
@ -234,6 +248,7 @@ CREATE TABLE schedule_job (
|
||||
create_date datetime COMMENT '创建时间',
|
||||
updater bigint COMMENT '更新者',
|
||||
update_date datetime COMMENT '更新时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
PRIMARY KEY (id),
|
||||
key idx_create_date (create_date)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='定时任务';
|
||||
@ -248,6 +263,7 @@ CREATE TABLE schedule_job_log (
|
||||
error varchar(2000) DEFAULT NULL COMMENT '失败信息',
|
||||
times int NOT NULL COMMENT '耗时(单位：毫秒)',
|
||||
create_date datetime COMMENT '创建时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
PRIMARY KEY (id),
|
||||
key idx_job_id (job_id),
|
||||
key idx_create_date (create_date)
|
||||
@ -261,6 +277,7 @@ CREATE TABLE sys_user_token (
|
||||
expire_date datetime COMMENT '过期时间',
|
||||
update_date datetime COMMENT '更新时间',
|
||||
create_date datetime COMMENT '创建时间',
|
||||
valid tinyint COMMENT '删除标识，是否有效：1可用 0不可用',
|
||||
PRIMARY KEY (id),
|
||||
UNIQUE KEY user_id (user_id),
|
||||
UNIQUE KEY token (token)
|
||||
|
||||
@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author weihongyang
|
||||
@ -78,6 +79,7 @@ public class LogOperationAspect {
|
||||
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
|
||||
if(loginUser != null){
|
||||
log.setCreatorName(loginUser.getUsername());
|
||||
log.setCreator(loginUser.getSysUserEntity().getCreator());
|
||||
}
|
||||
|
||||
log.setStatus(status);
|
||||
@ -89,6 +91,7 @@ public class LogOperationAspect {
|
||||
log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
|
||||
log.setRequestUri(request.getRequestURI());
|
||||
log.setRequestMethod(request.getMethod());
|
||||
log.setCreateDate(new Date());
|
||||
|
||||
//请求参数
|
||||
Object[] args = joinPoint.getArgs();
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
package com.cnbm.admin.config;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
|
||||
import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
|
||||
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
|
||||
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
|
||||
import com.cnbm.common.interceptor.DataFilterInterceptor;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@Configuration
|
||||
public class MybatisPlusConfig {
|
||||
|
||||
@Bean
|
||||
public MybatisPlusInterceptor mybatisPlusInterceptor() {
|
||||
MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
|
||||
// 数据权限
|
||||
mybatisPlusInterceptor.addInnerInterceptor(new DataFilterInterceptor());
|
||||
// 分页插件
|
||||
mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor());
|
||||
// 乐观锁
|
||||
mybatisPlusInterceptor.addInnerInterceptor(new OptimisticLockerInnerInterceptor());
|
||||
// 防止全表更新与删除
|
||||
mybatisPlusInterceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
|
||||
|
||||
return mybatisPlusInterceptor;
|
||||
}
|
||||
|
||||
}
|
||||
@ -6,6 +6,7 @@ import com.cnbm.admin.service.CaptchaService;
|
||||
import com.cnbm.admin.service.LoginService;
|
||||
import com.cnbm.admin.utils.ResponseResult;
|
||||
import com.cnbm.common.exception.ErrorCode;
|
||||
import com.cnbm.common.utils.Result;
|
||||
import com.cnbm.common.validator.AssertUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
@ -52,13 +53,16 @@ public class LoginController {
|
||||
|
||||
@PostMapping("/login")
|
||||
@ApiOperation(value = "登录")
|
||||
public ResponseResult login(HttpServletRequest request, @RequestBody LoginParam loginParam) {
|
||||
public Result login(HttpServletRequest request, @RequestBody LoginParam loginParam) {
|
||||
return loginService.login(request,loginParam);
|
||||
}
|
||||
|
||||
@PostMapping("/doLogout")
|
||||
@PostMapping("logout")
|
||||
@ApiOperation(value = "退出")
|
||||
public void logout(){
|
||||
public Result logout(HttpServletRequest request){
|
||||
loginService.logout(request);
|
||||
return new Result();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -40,10 +40,11 @@ public class SysDictDataController {
|
||||
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
|
||||
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
|
||||
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) ,
|
||||
@ApiImplicitParam(name = "dictTypeId", value = "字典类型id", paramType = "query", dataTypeClass = String.class),
|
||||
@ApiImplicitParam(name = "dictLabel", value = "字典标签", paramType = "query", dataTypeClass=String.class),
|
||||
@ApiImplicitParam(name = "dictValue", value = "字典值", paramType = "query", dataTypeClass=String.class)
|
||||
})
|
||||
@PreAuthorize("@ex.hasAuthority('sys:dept:page')")
|
||||
@PreAuthorize("@ex.hasAuthority('sys:dict:page')")
|
||||
public Result<PageData<SysDictDataDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
|
||||
//字典类型
|
||||
PageData<SysDictDataDTO> page = sysDictDataService.page(params);
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
package com.cnbm.admin.controller;
|
||||
|
||||
import com.cnbm.admin.annotation.LogOperation;
|
||||
import com.cnbm.admin.dto.SysLogLoginDTO;
|
||||
import com.cnbm.admin.execl.SysLogLoginExcel;
|
||||
import com.cnbm.admin.service.SysLogLoginService;
|
||||
import com.cnbm.common.constant.Constant;
|
||||
import com.cnbm.common.page.PageData;
|
||||
import com.cnbm.common.utils.ExcelUtils;
|
||||
import com.cnbm.common.utils.Result;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.log4j.Log4j2;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import springfox.documentation.annotations.ApiIgnore;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("sys/log/login")
|
||||
@Api(tags="登录日志")
|
||||
@Log4j2
|
||||
public class SysLogLoginController {
|
||||
@Autowired
|
||||
private SysLogLoginService sysLogLoginService;
|
||||
|
||||
@GetMapping("page")
|
||||
@ApiOperation("分页")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
|
||||
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
|
||||
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
|
||||
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class) ,
|
||||
@ApiImplicitParam(name = "status", value = "状态 0：失败 1：成功 2：账号已锁定", paramType = "query", dataTypeClass=Integer.class),
|
||||
@ApiImplicitParam(name = "creatorName", value = "用户名", paramType = "query", dataTypeClass=String.class)
|
||||
})
|
||||
@PreAuthorize("@ex.hasAuthority('sys:log:login')")
|
||||
public Result<PageData<SysLogLoginDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
|
||||
PageData<SysLogLoginDTO> page = sysLogLoginService.page(params);
|
||||
|
||||
log.info("PageData<SysLogLoginDTO>====={}",page.toString());
|
||||
|
||||
return new Result<PageData<SysLogLoginDTO>>().ok(page);
|
||||
}
|
||||
|
||||
@GetMapping("export")
|
||||
@ApiOperation("导出")
|
||||
@LogOperation("导出")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "status", value = "状态 0：失败 1：成功 2：账号已锁定", paramType = "query", dataTypeClass=Integer.class),
|
||||
@ApiImplicitParam(name = "creatorName", value = "用户名", paramType = "query", dataTypeClass=String.class)
|
||||
})
|
||||
@PreAuthorize("@ex.hasAuthority('sys:log:login')")
|
||||
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
|
||||
List<SysLogLoginDTO> list = sysLogLoginService.list(params);
|
||||
|
||||
ExcelUtils.exportExcelToTarget(response, null, list, SysLogLoginExcel.class);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package com.cnbm.admin.dao;
|
||||
|
||||
import com.cnbm.admin.entity.SysLogLoginEntity;
|
||||
import com.cnbm.common.dao.BaseDao;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface SysLogLoginDao extends BaseDao<SysLogLoginEntity> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package com.cnbm.admin.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@ApiModel(value = "登录日志")
|
||||
public class SysLogLoginDTO implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "id")
|
||||
private Long id;
|
||||
|
||||
@ApiModelProperty(value = "用户操作 0：用户登录 1：用户退出")
|
||||
private Integer operation;
|
||||
|
||||
@ApiModelProperty(value = "状态 0：失败 1：成功 2：账号已锁定")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty(value = "用户代理")
|
||||
private String userAgent;
|
||||
|
||||
@ApiModelProperty(value = "操作IP")
|
||||
private String ip;
|
||||
|
||||
@ApiModelProperty(value = "用户名")
|
||||
private String creatorName;
|
||||
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private Date createDate;
|
||||
|
||||
}
|
||||
@ -1,16 +1,19 @@
|
||||
package com.cnbm.admin.entity;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import java.io.Serializable;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
import org.springframework.security.core.authority.SimpleGrantedAuthority;
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* @Author weihongyang
|
||||
@ -20,7 +23,9 @@ import java.util.stream.Collectors;
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class LoginUser implements UserDetails {
|
||||
public class LoginUser implements UserDetails,Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private SysUserEntity sysUserEntity;
|
||||
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
package com.cnbm.admin.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.cnbm.common.entity.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper=false)
|
||||
@TableName("sys_log_login")
|
||||
public class SysLogLoginEntity extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 用户操作 0：用户登录 1：用户退出
|
||||
*/
|
||||
private Integer operation;
|
||||
/**
|
||||
* 状态 0：失败 1：成功 2：账号已锁定
|
||||
*/
|
||||
private Integer status;
|
||||
/**
|
||||
* 用户代理
|
||||
*/
|
||||
private String userAgent;
|
||||
/**
|
||||
* 操作IP
|
||||
*/
|
||||
private String ip;
|
||||
/**
|
||||
* 用户名
|
||||
*/
|
||||
private String creatorName;
|
||||
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package com.cnbm.admin.enums;
|
||||
|
||||
public enum LoginOperationEnum {
|
||||
/**
|
||||
* 用户登录
|
||||
*/
|
||||
LOGIN(0),
|
||||
/**
|
||||
* 用户退出
|
||||
*/
|
||||
LOGOUT(1);
|
||||
|
||||
private int value;
|
||||
|
||||
LoginOperationEnum(int value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public int value() {
|
||||
return this.value;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
package com.cnbm.admin.enums;
|
||||
|
||||
public enum LoginStatusEnum {
|
||||
/**
|
||||
* 失败
|
||||
*/
|
||||
FAIL(0),
|
||||
/**
|
||||
* 成功
|
||||
*/
|
||||
SUCCESS(1),
|
||||
/**
|
||||
* 账号已锁定
|
||||
*/
|
||||
LOCK(2);
|
||||
|
||||
private int value;
|
||||
|
||||
LoginStatusEnum(int value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public int value() {
|
||||
return this.value;
|
||||
}
|
||||
}
|
||||
52
ym-admin/src/main/java/com/cnbm/admin/enums/WhetherEnum.java
Normal file
52
ym-admin/src/main/java/com/cnbm/admin/enums/WhetherEnum.java
Normal file
@ -0,0 +1,52 @@
|
||||
package com.cnbm.admin.enums;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 是、否有效枚举
|
||||
* </P>
|
||||
*
|
||||
* @author xcc
|
||||
* @date 2022年7月5日
|
||||
* @since 1.0
|
||||
*/
|
||||
public enum WhetherEnum {
|
||||
|
||||
NO(0, "否"),
|
||||
|
||||
YES(1, "是");
|
||||
|
||||
private final Integer value;
|
||||
private final String label;
|
||||
private final String remark;
|
||||
|
||||
WhetherEnum(final int value, final String label) {
|
||||
this(value, label, null);
|
||||
}
|
||||
|
||||
WhetherEnum(final int value, final String label, final String remark) {
|
||||
this.value = value;
|
||||
this.label = label;
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return 数据值
|
||||
*/
|
||||
public Integer getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return 标签名
|
||||
*/
|
||||
public String getLabel() {
|
||||
return label;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return 备注
|
||||
*/
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package com.cnbm.admin.execl;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class SysLogLoginExcel {
|
||||
@Excel(name = "用户操作")
|
||||
private String operation;
|
||||
@Excel(name = "状态", replace = {"失败_0", "成功_1", "账号已锁定_1"})
|
||||
private Integer status;
|
||||
@Excel(name = "User-Agent")
|
||||
private String userAgent;
|
||||
@Excel(name = "操作IP")
|
||||
private String ip;
|
||||
@Excel(name = "用户名")
|
||||
private String creatorName;
|
||||
@Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createDate;
|
||||
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package com.cnbm.admin.service;
|
||||
|
||||
import com.cnbm.admin.params.LoginParam;
|
||||
import com.cnbm.admin.utils.ResponseResult;
|
||||
import com.cnbm.common.utils.Result;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
@ -12,6 +12,8 @@ import javax.servlet.http.HttpServletRequest;
|
||||
*/
|
||||
public interface LoginService {
|
||||
|
||||
ResponseResult login(HttpServletRequest request, LoginParam loginParam);
|
||||
Result login(HttpServletRequest request, LoginParam loginParam);
|
||||
|
||||
void logout(HttpServletRequest request);
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
package com.cnbm.admin.service;
|
||||
|
||||
import com.cnbm.admin.dto.SysLogLoginDTO;
|
||||
import com.cnbm.admin.entity.SysLogLoginEntity;
|
||||
import com.cnbm.common.page.PageData;
|
||||
import com.cnbm.common.service.BaseService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface SysLogLoginService extends BaseService<SysLogLoginEntity> {
|
||||
|
||||
PageData<SysLogLoginDTO> page(Map<String, Object> params);
|
||||
|
||||
List<SysLogLoginDTO> list(Map<String, Object> params);
|
||||
|
||||
void save(SysLogLoginEntity entity);
|
||||
}
|
||||
@ -1,14 +1,22 @@
|
||||
package com.cnbm.admin.service.impl;
|
||||
|
||||
import com.cnbm.admin.entity.LoginUser;
|
||||
import com.cnbm.admin.entity.SysLogLoginEntity;
|
||||
import com.cnbm.admin.enums.LoginOperationEnum;
|
||||
import com.cnbm.admin.enums.LoginStatusEnum;
|
||||
import com.cnbm.admin.params.LoginParam;
|
||||
import com.cnbm.admin.service.CaptchaService;
|
||||
import com.cnbm.admin.service.SysLogLoginService;
|
||||
import com.cnbm.admin.utils.JwtUtil;
|
||||
import com.cnbm.admin.service.LoginService;
|
||||
import com.cnbm.admin.utils.ResponseResult;
|
||||
import com.cnbm.common.exception.ErrorCode;
|
||||
import com.cnbm.common.utils.IpUtils;
|
||||
import com.cnbm.common.utils.Result;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.security.authentication.AuthenticationManager;
|
||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||
import org.springframework.security.core.Authentication;
|
||||
@ -16,6 +24,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
@ -37,16 +46,30 @@ public class LoginServiceImpl implements LoginService {
|
||||
@Autowired
|
||||
private CaptchaService captchaService;
|
||||
|
||||
@Autowired
|
||||
private SysLogLoginService sysLogLoginService;
|
||||
|
||||
@Override
|
||||
public ResponseResult login(HttpServletRequest request, LoginParam loginParam) {
|
||||
public Result login(HttpServletRequest request, LoginParam loginParam) {
|
||||
//验证码是否正确
|
||||
boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
|
||||
if(!flag){
|
||||
return new ResponseResult(ErrorCode.CAPTCHA_ERROR,"验证码错误");
|
||||
return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误");
|
||||
}
|
||||
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginParam.getUsername(),loginParam.getPassword());
|
||||
Authentication authenticate = authenticationManager.authenticate(authenticationToken);
|
||||
//登录日志
|
||||
SysLogLoginEntity log = new SysLogLoginEntity();
|
||||
log.setOperation(LoginOperationEnum.LOGIN.value());
|
||||
log.setCreateDate(new Date());
|
||||
log.setIp(IpUtils.getIpAddr(request));
|
||||
log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
|
||||
log.setCreatorName(loginParam.getUsername());
|
||||
|
||||
if (Objects.isNull(authenticate)) {
|
||||
log.setStatus(LoginStatusEnum.FAIL.value());
|
||||
log.setCreatorName(loginParam.getUsername());
|
||||
sysLogLoginService.save(log);
|
||||
throw new RuntimeException("登录失败");
|
||||
}
|
||||
//如果认证通过了，使用userid生成一个jwt jwt存入ResponseResult返回
|
||||
@ -57,7 +80,33 @@ public class LoginServiceImpl implements LoginService {
|
||||
map.put("token",jwt);
|
||||
//把完整的用户信息存入redis userid作为key
|
||||
redisTemplate.opsForValue().set("login:"+userid,loginUser);
|
||||
return new ResponseResult(200,"登录成功",map);
|
||||
//登录成功
|
||||
log.setStatus(LoginStatusEnum.SUCCESS.value());
|
||||
log.setCreator(loginUser.getSysUserEntity().getId());
|
||||
log.setCreatorName(loginUser.getUsername());
|
||||
sysLogLoginService.save(log);
|
||||
return new Result<>().ok(map);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void logout(HttpServletRequest request) {
|
||||
//获取SecurityContextHolder中的用户id
|
||||
UsernamePasswordAuthenticationToken authentication = (UsernamePasswordAuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
|
||||
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
|
||||
Long userid = loginUser.getSysUserEntity().getId();
|
||||
//日志
|
||||
SysLogLoginEntity log = new SysLogLoginEntity();
|
||||
log.setOperation(LoginOperationEnum.LOGOUT.value());
|
||||
log.setIp(IpUtils.getIpAddr(request));
|
||||
log.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
|
||||
log.setIp(IpUtils.getIpAddr(request));
|
||||
log.setStatus(LoginStatusEnum.SUCCESS.value());
|
||||
log.setCreator(userid);
|
||||
log.setCreatorName(loginUser.getUsername());
|
||||
log.setCreateDate(new Date());
|
||||
sysLogLoginService.save(log);
|
||||
//删除redis中的值
|
||||
redisTemplate.delete("login:"+userid);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
package com.cnbm.admin.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.cnbm.admin.dao.SysLogLoginDao;
|
||||
import com.cnbm.admin.dto.SysLogLoginDTO;
|
||||
import com.cnbm.admin.entity.SysLogLoginEntity;
|
||||
import com.cnbm.admin.service.SysLogLoginService;
|
||||
import com.cnbm.common.constant.Constant;
|
||||
import com.cnbm.common.page.PageData;
|
||||
import com.cnbm.common.service.impl.BaseServiceImpl;
|
||||
import com.cnbm.common.utils.ConvertUtils;
|
||||
import lombok.extern.log4j.Log4j2;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
@Log4j2
|
||||
public class SysLogLoginServiceImpl extends BaseServiceImpl<SysLogLoginDao, SysLogLoginEntity> implements SysLogLoginService {
|
||||
|
||||
@Override
|
||||
public PageData<SysLogLoginDTO> page(Map<String, Object> params) {
|
||||
IPage<SysLogLoginEntity> page = baseDao.selectPage(
|
||||
getPage(params, Constant.CREATE_DATE, false),
|
||||
getWrapper(params)
|
||||
);
|
||||
log.info("page======{}",page.toString());
|
||||
|
||||
return getPageData(page, SysLogLoginDTO.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogLoginDTO> list(Map<String, Object> params) {
|
||||
List<SysLogLoginEntity> entityList = baseDao.selectList(getWrapper(params));
|
||||
|
||||
return ConvertUtils.sourceToTarget(entityList, SysLogLoginDTO.class);
|
||||
}
|
||||
|
||||
private QueryWrapper<SysLogLoginEntity> getWrapper(Map<String, Object> params){
|
||||
String status = (String) params.get("status");
|
||||
String creatorName = (String) params.get("creatorName");
|
||||
|
||||
QueryWrapper<SysLogLoginEntity> wrapper = new QueryWrapper<>();
|
||||
wrapper.eq(StringUtils.isNotBlank(status), "status", status);
|
||||
wrapper.like(StringUtils.isNotBlank(creatorName), "creator_name", creatorName);
|
||||
return wrapper;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void save(SysLogLoginEntity entity) {
|
||||
insert(entity);
|
||||
}
|
||||
|
||||
}
|
||||
@ -5,23 +5,24 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.cnbm.admin.dto.SysMenuDTO;
|
||||
import com.cnbm.admin.dto.SysUserDTO;
|
||||
import com.cnbm.admin.entity.LoginUser;
|
||||
import com.cnbm.admin.entity.SysLogLoginEntity;
|
||||
import com.cnbm.admin.entity.SysMenuEntity;
|
||||
import com.cnbm.admin.entity.SysUserEntity;
|
||||
import com.cnbm.admin.enums.LoginOperationEnum;
|
||||
import com.cnbm.admin.exception.LoginStatusException;
|
||||
import com.cnbm.admin.service.SysMenuService;
|
||||
import com.cnbm.common.utils.ConvertUtils;
|
||||
import com.cnbm.common.utils.IpUtils;
|
||||
import lombok.extern.log4j.Log4j2;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.security.authentication.DisabledException;
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
import org.springframework.security.core.userdetails.UserDetailsService;
|
||||
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
@ -45,6 +46,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
|
||||
LambdaQueryWrapper<SysUserEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
lambdaQueryWrapper.eq(SysUserEntity::getUsername,username);
|
||||
SysUserEntity sysUserEntity = userDao.selectOne(lambdaQueryWrapper);
|
||||
|
||||
if (Objects.isNull(sysUserEntity)) {
|
||||
throw new UsernameNotFoundException("用户名不存在");
|
||||
}
|
||||
|
||||
@ -0,0 +1,136 @@
|
||||
/*
|
||||
* Copyright (c) 2018.
|
||||
* http://www.ulabcare.com
|
||||
*/
|
||||
|
||||
package com.cnbm.admin.utils;
|
||||
|
||||
import com.cnbm.admin.entity.LoginUser;
|
||||
import com.cnbm.admin.entity.SysUserEntity;
|
||||
import com.cnbm.admin.enums.WhetherEnum;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 接口支持基类
|
||||
*
|
||||
* @author jiff
|
||||
* @date 2018/11/1
|
||||
* @since 1.0
|
||||
*/
|
||||
public abstract class BaseSupportUtils {
|
||||
|
||||
/**
|
||||
* 获取当前登录用户信息
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
private static SysUserEntity getLoginUser() {
|
||||
//登录用户信息
|
||||
UsernamePasswordAuthenticationToken authentication = (UsernamePasswordAuthenticationToken) SecurityContextHolder.getContext().getAuthentication();
|
||||
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
|
||||
return loginUser.getSysUserEntity();
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置公共字段值，一般用于创建新记录，包含以下字段：
|
||||
*
|
||||
* <p>
|
||||
* {@link CommonField#enabled}<br>
|
||||
* {@link CommonField#valid}<br>
|
||||
* {@link CommonField#creatorId}<br>
|
||||
* {@link CommonField#creatorName}<br>
|
||||
* {@link CommonField#createTime}<br>
|
||||
* {@link CommonField#updaterId}<br>
|
||||
* {@link CommonField#updaterName}<br>
|
||||
* {@link CommonField#updateTime}<br>
|
||||
* </p>
|
||||
*
|
||||
* @param t 需要设置的对象
|
||||
* @param ignoreProperties 忽略的字段
|
||||
* @param <T>
|
||||
*/
|
||||
public static <T extends Serializable> T setCommonField(T t, String... ignoreProperties) {
|
||||
CommonField commonField = CommonField.builder()
|
||||
.enabled(WhetherEnum.YES.getValue())
|
||||
.valid(WhetherEnum.YES.getValue())
|
||||
.createTime(LocalDateTime.now())
|
||||
.creatorId(getLoginUser().getId())
|
||||
.creatorName(getLoginUser().getUsername())
|
||||
.updateTime(LocalDateTime.now())
|
||||
.updaterId(getLoginUser().getId())
|
||||
.updaterName(getLoginUser().getUsername())
|
||||
.build();
|
||||
BeanUtils.copyProperties(commonField, t, ignoreProperties);
|
||||
return t;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置更新的公共字段值，一般用于更新记录，包含以下字段：
|
||||
*
|
||||
* <p>
|
||||
* {@link CommonField#updaterId}<br>
|
||||
* {@link CommonField#updaterName}<br>
|
||||
* {@link CommonField#updateTime}<br>
|
||||
* </p>
|
||||
*
|
||||
* @param t 需要设置的对象
|
||||
* @param <T>
|
||||
*/
|
||||
public static <T extends Serializable> T setUpdateCommonField(T t) {
|
||||
CommonField commonField = CommonField.builder()
|
||||
.updaterId(getLoginUser().getId())
|
||||
.updaterName(getLoginUser().getUsername())
|
||||
.updateTime(LocalDateTime.now())
|
||||
.build();
|
||||
BeanUtils.copyProperties(commonField, t, "enabled", "valid");
|
||||
return t;
|
||||
}
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
private static class CommonField implements Serializable {
|
||||
/**
|
||||
* 启用状态:0 、停用，1、启用
|
||||
*/
|
||||
private Integer enabled;
|
||||
/**
|
||||
* 删除标志，是否有效:1 可用 0不可用
|
||||
*/
|
||||
private Integer valid;
|
||||
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
private Long creatorId;
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
private String creatorName;
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private LocalDateTime createTime;
|
||||
|
||||
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
private Long updaterId;
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
private String updaterName;
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
private LocalDateTime updateTime;
|
||||
}
|
||||
}
|
||||
6
ym-admin/src/main/resources/mapper/SysLogLoginDao.xml
Normal file
6
ym-admin/src/main/resources/mapper/SysLogLoginDao.xml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.cnbm.admin.dao.SysLogLoginDao">
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,76 @@
|
||||
package com.cnbm.common.interceptor;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
|
||||
import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
|
||||
import net.sf.jsqlparser.JSQLParserException;
|
||||
import net.sf.jsqlparser.expression.Expression;
|
||||
import net.sf.jsqlparser.expression.StringValue;
|
||||
import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
|
||||
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
|
||||
import net.sf.jsqlparser.statement.select.PlainSelect;
|
||||
import net.sf.jsqlparser.statement.select.Select;
|
||||
import org.apache.ibatis.executor.Executor;
|
||||
import org.apache.ibatis.mapping.BoundSql;
|
||||
import org.apache.ibatis.mapping.MappedStatement;
|
||||
import org.apache.ibatis.session.ResultHandler;
|
||||
import org.apache.ibatis.session.RowBounds;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class DataFilterInterceptor implements InnerInterceptor {
|
||||
|
||||
@Override
|
||||
public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) {
|
||||
DataScope scope = getDataScope(parameter);
|
||||
// 不进行数据过滤
|
||||
if(scope == null || StrUtil.isBlank(scope.getSqlFilter())){
|
||||
return;
|
||||
}
|
||||
|
||||
// 拼接新SQL
|
||||
String buildSql = getSelect(boundSql.getSql(), scope);
|
||||
|
||||
// 重写SQL
|
||||
PluginUtils.mpBoundSql(boundSql).sql(buildSql);
|
||||
}
|
||||
|
||||
private DataScope getDataScope(Object parameter){
|
||||
if (parameter == null){
|
||||
return null;
|
||||
}
|
||||
|
||||
// 判断参数里是否有DataScope对象
|
||||
if (parameter instanceof Map) {
|
||||
Map<?, ?> parameterMap = (Map<?, ?>) parameter;
|
||||
for (Map.Entry entry : parameterMap.entrySet()) {
|
||||
if (entry.getValue() != null && entry.getValue() instanceof DataScope) {
|
||||
return (DataScope) entry.getValue();
|
||||
}
|
||||
}
|
||||
} else if (parameter instanceof DataScope) {
|
||||
return (DataScope) parameter;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private String getSelect(String buildSql, DataScope scope){
|
||||
try {
|
||||
Select select = (Select) CCJSqlParserUtil.parse(buildSql);
|
||||
PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
|
||||
|
||||
Expression expression = plainSelect.getWhere();
|
||||
if(expression == null){
|
||||
plainSelect.setWhere(new StringValue(scope.getSqlFilter()));
|
||||
}else{
|
||||
AndExpression andExpression = new AndExpression(expression, new StringValue(scope.getSqlFilter()));
|
||||
plainSelect.setWhere(andExpression);
|
||||
}
|
||||
|
||||
return select.toString().replaceAll("'", "");
|
||||
}catch (JSQLParserException e){
|
||||
return buildSql;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package com.cnbm.common.interceptor;
|
||||
|
||||
public class DataScope {
|
||||
private String sqlFilter;
|
||||
|
||||
public DataScope(String sqlFilter) {
|
||||
this.sqlFilter = sqlFilter;
|
||||
}
|
||||
|
||||
public String getSqlFilter() {
|
||||
return sqlFilter;
|
||||
}
|
||||
|
||||
public void setSqlFilter(String sqlFilter) {
|
||||
this.sqlFilter = sqlFilter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return this.sqlFilter;
|
||||
}
|
||||
}
|
||||
@ -20,10 +20,36 @@ spring:
|
||||
# url: jdbc:postgresql://192.168.10.10:5432/postgres
|
||||
# username: postgres
|
||||
# password: 123456
|
||||
hikari:
|
||||
pool-name: GrowUpHikariCP
|
||||
minimum-idle: 1
|
||||
maximum-pool-size: 10
|
||||
initial-size: 10
|
||||
max-active: 100
|
||||
min-idle: 10
|
||||
max-wait: 60000
|
||||
pool-prepared-statements: true
|
||||
max-pool-prepared-statement-per-connection-size: 20
|
||||
time-between-eviction-runs-millis: 60000
|
||||
min-evictable-idle-time-millis: 300000
|
||||
#Oracle需要打开注释
|
||||
#validation-query: SELECT 1 FROM DUAL
|
||||
test-while-idle: true
|
||||
test-on-borrow: false
|
||||
test-on-return: false
|
||||
stat-view-servlet:
|
||||
enabled: true
|
||||
url-pattern: /druid/*
|
||||
#login-username: admin
|
||||
#login-password: admin
|
||||
filter:
|
||||
stat:
|
||||
log-slow-sql: true
|
||||
slow-sql-millis: 1000
|
||||
merge-sql: false
|
||||
wall:
|
||||
config:
|
||||
multi-statement-allow: true
|
||||
# hikari:
|
||||
# pool-name: GrowUpHikariCP
|
||||
# minimum-idle: 1
|
||||
# maximum-pool-size: 10
|
||||
|
||||
##多数据源的配置，需要引用renren-dynamic-datasource
|
||||
#dynamic:
|
||||
|
||||
21
ym-gateway/src/main/resources/logback-spring.xml
Normal file
21
ym-gateway/src/main/resources/logback-spring.xml
Normal file
@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration>
|
||||
<include resource="org/springframework/boot/logging/logback/base.xml" />
|
||||
<logger name="org.springframework.web" level="INFO"/>
|
||||
<logger name="org.springboot.sample" level="TRACE" />
|
||||
|
||||
<!-- 开发、测试环境 -->
|
||||
<springProfile name="dev,test">
|
||||
<logger name="org.springframework.web" level="INFO"/>
|
||||
<logger name="org.springboot.sample" level="INFO" />
|
||||
<logger name="com.cnbm" level="DEBUG" />
|
||||
</springProfile>
|
||||
|
||||
<!-- 生产环境 -->
|
||||
<springProfile name="prod">
|
||||
<logger name="org.springframework.web" level="ERROR"/>
|
||||
<logger name="org.springboot.sample" level="ERROR" />
|
||||
<logger name="com.cnbm" level="ERROR" />
|
||||
</springProfile>
|
||||
|
||||
</configuration>
|
||||
@ -68,26 +68,26 @@ public class ${table.controllerName} {
|
||||
@ApiOperation("保存")
|
||||
@LogOperation("保存")
|
||||
@PreAuthorize("@ex.hasAuthority('${package.ModuleName}:${table.entityPath}:save')")
|
||||
public Result save(@RequestBody ${entity}DTO dto){
|
||||
public Result<Long> save(@RequestBody ${entity}DTO dto){
|
||||
//效验数据
|
||||
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
|
||||
|
||||
${table.entityPath}Service.save(dto);
|
||||
|
||||
return new Result();
|
||||
return new Result<Long>().ok(dto.getId());
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
@ApiOperation("修改")
|
||||
@LogOperation("修改")
|
||||
@PreAuthorize("@ex.hasAuthority('${package.ModuleName}:${table.entityPath}:update')")
|
||||
public Result update(@RequestBody ${entity}DTO dto){
|
||||
public Result<Long> update(@RequestBody ${entity}DTO dto){
|
||||
//效验数据
|
||||
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
|
||||
|
||||
${table.entityPath}Service.update(dto);
|
||||
|
||||
return new Result();
|
||||
return new Result<Long>().ok(dto.getId());
|
||||
}
|
||||
|
||||
@DeleteMapping
|
||||
|
||||
@ -1,39 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="${package.Mapper}.${table.mapperName}">
|
||||
|
||||
#if(${enableCache})
|
||||
<!-- 开启二级缓存 -->
|
||||
<cache type="${cacheClassName}"/>
|
||||
|
||||
#end
|
||||
#if(${baseResultMap})
|
||||
<!-- 通用查询映射结果 -->
|
||||
<resultMap id="BaseResultMap" type="${package.Entity}.${entity}">
|
||||
<resultMap type="${package.Entity}.${table.entityName}" id="${table.entityName}Map">
|
||||
#foreach($field in ${table.fields})
|
||||
#if(${field.keyFlag})##生成主键排在第一位
|
||||
<id column="${field.name}" property="${field.propertyName}" />
|
||||
#end
|
||||
#end
|
||||
#foreach($field in ${table.commonFields})##生成公共字段
|
||||
<result column="${field.name}" property="${field.propertyName}" />
|
||||
#end
|
||||
#foreach($field in ${table.fields})
|
||||
#if(!${field.keyFlag})##生成普通字段
|
||||
<result column="${field.name}" property="${field.propertyName}" />
|
||||
#end
|
||||
#end
|
||||
</resultMap>
|
||||
|
||||
#end
|
||||
#if(${baseColumnList})
|
||||
<!-- 通用查询结果列 -->
|
||||
<sql id="Base_Column_List">
|
||||
#foreach($field in ${table.commonFields})
|
||||
${field.columnName},
|
||||
#end
|
||||
${table.fieldNames}
|
||||
</sql>
|
||||
|
||||
#end
|
||||
</mapper>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user