b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user实体类上表名设置的另名去除，系统用户列表添加组织结构多查询

Browse Source
This commit is contained in:
b2baccline
2020-10-15 15:59:47 +08:00
parent ddfb3ad2f4
commit 091c8f87a7
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java
View File

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
* @date 2019-09-12 20:39:31
*/
@Data
@TableName("sys_user su")
@TableName("sys_user")
@ApiModel(value = "系统用户表")
public class SysUser implements Serializable {

4
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java
View File

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author Hccake
* @version 1.0
@@ -53,7 +55,7 @@ public class SysUserQO {
* 组织机构ID
*/
@ApiModelProperty(value = "organizationId")
private Integer organizationId;
private List<Integer> organizationId;
@ApiModelProperty(value = "用户类型:1:系统用户， 2：客户用户")
private Integer type;

2
ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java
View File

@@ -82,7 +82,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
.eq(ObjectUtil.isNotNull(qo.getStatus()), TABLE_ALIAS_PREFIX + "status", qo.getStatus())
.eq(ObjectUtil.isNotNull(qo.getSex()), TABLE_ALIAS_PREFIX + "sex", qo.getSex())
.eq(ObjectUtil.isNotNull(qo.getType()), TABLE_ALIAS_PREFIX + "type", qo.getType())
.eq(ObjectUtil.isNotNull(qo.getOrganizationId()), TABLE_ALIAS_PREFIX + "organization_id",
.in(ObjectUtil.isNotNull(qo.getOrganizationId()), TABLE_ALIAS_PREFIX + "organization_id",
qo.getOrganizationId());
if (StringUtils.isNotBlank(qo.getStartTime()) && StringUtils.isNotBlank(qo.getEndTime())) {
wrapper.between(TABLE_ALIAS_PREFIX + "create_time", qo.getStartTime(), qo.getEndTime());

5
ballcat-samples/ballcat-sample-monitor/src/main/java/com/hccake/ballcat/monitor/security/AuthHeaderProvider.java
View File

@@ -27,7 +27,6 @@ public class AuthHeaderProvider implements HttpHeadersProvider {
/**
* 当授权中心剥离时，目前BallCat的设计是简单启动 所以不做独立的授权中心，在此记录下拓展使用方式 可以考虑 client_credentials 客户端授权模式
*
* @param instance
* @return
*/
@@ -42,8 +41,8 @@ public class AuthHeaderProvider implements HttpHeadersProvider {
// 客户端ID
headers.set(HeaderConstants.SECRET_ID, secretId);
// sign
String tempSign =
new StringBuilder().append(reqTime).reverse().append(secretId).append(secretKey).toString();
String tempSign = new StringBuilder().append(reqTime).reverse().append(secretId).append(secretKey)
.toString();
String sign = SecureUtil.md5(tempSign);
headers.set(HeaderConstants.SIGN, sign);
}