fix: 登陆校验不存在的用户信息

This commit is contained in:
taojinlong 2022-03-30 14:52:42 +08:00
parent 5fdc028602
commit 883861bee1
2 changed files with 6 additions and 5 deletions

View File

@ -91,14 +91,15 @@ public class AuthServer implements AuthApi {
SysUserEntity user = authUserService.getUserByName(username);
if (ObjectUtils.isEmpty(user)) {
DataEaseException.throwException(Translator.get("i18n_id_or_pwd_error"));
}
// 验证登录类型是否与用户类型相同
if (!sysUserService.validateLoginType(user.getFrom(), loginType)) {
DataEaseException.throwException(Translator.get("i18n_id_or_pwd_error"));
}
if (ObjectUtils.isEmpty(user)) {
DataEaseException.throwException(Translator.get("i18n_id_or_pwd_error"));
}
if (user.getEnabled() == 0) {
DataEaseException.throwException(Translator.get("i18n_id_or_pwd_error"));
}

View File

@ -2,10 +2,10 @@ package io.dataease.provider;
import io.dataease.base.domain.DatasetTableField;
import io.dataease.base.domain.Datasource;
import io.dataease.commons.utils.Md5Utils;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
public class DDLProviderImpl extends DDLProvider {
@Override
@ -40,7 +40,7 @@ public class DDLProviderImpl extends DDLProvider {
Integer realSize = page * pageNumber < dataList.size() ? page * pageNumber : dataList.size();
for (String[] strings : dataList.subList((page - 1) * pageNumber, realSize)) {
values.append("('").append(Md5Utils.md5(String.join(",", Arrays.asList(strings))))
values.append("('").append(UUID.randomUUID())
.append("','" ).append(String.join("','", Arrays.asList(strings)))
.append("'),");
}