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

fzllcc · Mar 2, 2022 · 2c9d147 · 2c9d147
2 parents 5dea563 + afd843f
commit 2c9d147
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java b/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
@@ -68,7 +68,7 @@ public Object PermissionsAround(ProceedingJoinPoint point) {
  return point.proceed(point.getArgs());
  } catch (Throwable throwable) {
  LogUtil.error(throwable.getMessage(), throwable);
- throw new RuntimeException(throwable);
+ throw new RuntimeException(throwable.getMessage());
  }
  }
 

diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
@@ -658,6 +658,8 @@ private String getViewSql(DatasourceRequest datasourceRequest) throws Exception
  case mariadb:
  case de_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:
  return null;
  case sqlServer: