dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
junjun 2022-03-02 18:57:33 +08:00
commit 2c9d1479c7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
View File

@ -68,7 +68,7 @@ public class DePermissionAnnotationHandler {
return point.proceed(point.getArgs()); return point.proceed(point.getArgs());
} catch (Throwable throwable) { } catch (Throwable throwable) {
LogUtil.error(throwable.getMessage(), throwable); LogUtil.error(throwable.getMessage(), throwable);
throw new RuntimeException(throwable); throw new RuntimeException(throwable.getMessage());
} }
} }

2
backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -658,6 +658,8 @@ public class JdbcProvider extends DatasourceProvider {
case mariadb: case mariadb:
case de_doris: case de_doris:
case ds_doris: case ds_doris:
JdbcConfiguration jdbcConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), JdbcConfiguration.class);
return String.format("SELECT TABLE_NAME,'' FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = '%s' ;", jdbcConfiguration.getDataBase());
case ck: case ck:
return null; return null;
case sqlServer: case sqlServer: