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

backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java

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

backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java

@@ -658,6 +658,8 @@ public class JdbcProvider extends DatasourceProvider {
             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: