diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java index 6a400910be..af552661cc 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java @@ -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")); } diff --git a/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java b/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java index 0e53560056..fea5442ed1 100644 --- a/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java +++ b/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java @@ -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("'),"); }