Merge pull request #1124 from xiaohuangdou666/develop

feat: download image and pdf

Author: tianlu-root

core/src/main/java/datart/core/base/consts/AttachmentType.java

@@ -2,8 +2,23 @@
 
 public enum AttachmentType {
 
-    EXCEL,
+    EXCEL(".xlsx"),
 
-    IMAGE
+    IMAGE(".png"),
 
+    PDF(".pdf");
+
+    private String suffix;
+
+    AttachmentType(String suffix) {
+        this.suffix = suffix;
+    }
+
+    public void setSuffix(String suffix) {
+        this.suffix = suffix;
+    }
+
+    public String getSuffix() {
+        return suffix;
+    }
 }

core/src/main/java/datart/core/common/Application.java

@@ -51,6 +51,10 @@ public static <T> T getBean(Class<T> t) {
         return context.getBean(t);
     }
 
+    public static <T> T getBean(String beanName, Class<T> t) {
+        return context.getBean(beanName, t);
+    }
+
     public static String getProperty(String key) {
         return context.getEnvironment().getProperty(key);
     }

core/src/main/java/datart/core/common/FileUtils.java

@@ -55,7 +55,11 @@ public static void mkdirParentIfNotExist(String path) {
     }
 
     public static String withBasePath(String path) {
-        return concatPath(Application.getFileBasePath(), path);
+        String fileBasePath = Application.getFileBasePath();
+        if (path.startsWith(fileBasePath)) {
+            return path;
+        }
+        return concatPath(fileBasePath, path);
     }
 
     public static void delete(String path) {

data-providers/jdbc-data-provider/src/main/java/datart/data/provider/JdbcDataProvider.java

@@ -299,7 +299,7 @@ private static List<JdbcDriverInfo> loadDriverInfoFromResource() {
                     log.error("DbType " + entry.getKey() + " driver read Exception", e);
                 }
                 return null;
-            }).filter(Objects::nonNull).collect(Collectors.toList());
+            }).filter(Objects::nonNull).sorted(Comparator.comparing(JdbcDriverInfo::getDbType)).collect(Collectors.toList());
         }
 
         private static Map<String, Map<String, String>> loadYml(String file) {

data-providers/jdbc-data-provider/src/main/java/datart/data/provider/jdbc/adapters/MsSqlDataProviderAdapter.java

@@ -0,0 +1,34 @@
+package datart.data.provider.jdbc.adapters;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Set;
+
+public class MsSqlDataProviderAdapter extends JdbcDataProviderAdapter {
+
+    @Override
+    public Set<String> readAllDatabases() throws SQLException {
+        String databaseName = StringUtils.substringAfterLast(jdbcProperties.getUrl().toLowerCase(), "databasename=");
+        databaseName = StringUtils.substringBefore(databaseName, ";");
+        if (StringUtils.isBlank(databaseName)) {
+            Set<String> catalogs = new HashSet<>();
+            try (Connection conn = getConn()) {
+                DatabaseMetaData metadata = conn.getMetaData();
+                try (ResultSet rs = metadata.getCatalogs()) {
+                    while (rs.next()) {
+                        String catalogName = rs.getString(1);
+                        catalogs.add(catalogName);
+                    }
+                }
+                return catalogs;
+            }
+        }
+        return super.readAllDatabases();
+    }
+
+}

data-providers/jdbc-data-provider/src/main/resources/jdbc-driver.yml

@@ -1,129 +1,166 @@
 ACCESS:
   db-type: ACCESS
   name: ACCESS
-  driver-class:
-  url-prefix:
+  driver-class: net.ucanaccess.jdbc.UcanaccessDriver
+  url-prefix: jdbc:ucanaccess://
 
 BIG_QUERY:
   db-type: BIG_QUERY
   name: BIG_QUERY
-  driver-class:
-  url-prefix:
+  driver-class: com.simba.googlebigquery.jdbc.Driver
+  url-prefix: jdbc:bigquery://
 
 CALCITE:
   db-type: CALCITE
   name: CALCITE
-  driver-class:
-  url-prefix:
+  driver-class: org.apache.calcite.avatica.remote.Driver
+  url-prefix: jdbc:avatica:remote
 
 CLICKHOUSE:
   db-type: CLICKHOUSE
   name: CLICKHOUSE
-  driver-class:
-  url-prefix:
+  driver-class: com.clickhouse.jdbc.ClickHouseDriver
+  url-prefix: jdbc:clickhouse://
   sql-dialect: datart.data.provider.calcite.dialect.ClickHouseSqlDialectSupport
 
-MSSQL:
-  db-type: MSSQL
-  name: MSSQL
-  sql-dialect: datart.data.provider.calcite.dialect.MsSqlStdOperatorSupport
-  driver-class: com.microsoft.sqlserver.jdbc.SQLServerDriver
-  url-prefix: jdbc:sqlserver://
-
-MYSQL:
-  db-type: MYSQL
-  name: MYSQL
-  driver-class: com.mysql.cj.jdbc.Driver
-  url-prefix: jdbc:mysql://
-  sql-dialect: datart.data.provider.calcite.dialect.MysqlSqlStdOperatorSupport
-
-ORACLE:
-  db-type: ORACLE
-  name: ORACLE
-  driver-class: oracle.jdbc.driver.OracleDriver
-  adapter-class: datart.data.provider.jdbc.adapters.OracleDataProviderAdapter
-  url-prefix: jdbc:oracle:thin:@
-  sql-dialect: datart.data.provider.calcite.dialect.OracleSqlStdOperatorSupport
-
 DERBY:
   db-type: DERBY
   name: DERBY
-  driver-class:
-  url-prefix:
+  driver-class: org.apache.derby.client.ClientAutoloadedDriver
+  url-prefix: jdbc:derby://
 
 DB2:
   db-type: DB2
   name: DB2
-  driver-class: com.ibm.db2.jdbc.app.DB2Driver
+  driver-class: com.ibm.db2.jdbc.jcc.DB2Driver
   url-prefix: jdbc:db2://
 
 FIREBIRD:
   db-type: FIREBIRD
   name: FIREBIRD
-  driver-class:
-  url-prefix:
+  driver-class: org.firebirdsql.jdbc.FBDriver
+  url-prefix: jdbc:firebirdsql://
+
 H2:
   db-type: H2
   name: H2
   driver-class: org.h2.Driver
   url-prefix: jdbc:h2
   sql-dialect: datart.data.provider.calcite.dialect.H2Dialect
+
 HIVE:
   db-type: HIVE
   name: HIVE
-  driver-class:
-  url-prefix:
+  driver-class: org.apache.hive.jdbc.HiveDriver
+  url-prefix: jdbc:hive2://
+
+HSQLDB:
+  db-type: HSQLDB
+  name: HSQLDB
+  driver-class: org.hsqldb.jdbcDriver
+  url-prefix: jdbc:hsqldb
+
+INFOBRIGHT:
+  db-type: INFOBRIGHT
+  name: INFOBRIGHT
+  driver-class: com.mysql.cj.jdbc.Driver
+  url-prefix: jdbc:mysql://
+
 INFORMIX:
   db-type: INFORMIX
   name: INFORMIX
   driver-class: com.informix.jdbc.IfxDriver
   url-prefix: jdbc:informix-sqli://
+
 INGRES:
   db-type: INGRES
   name: INGRES
-  driver-class:
-  url-prefix:
+  driver-class: com.ingres.jdbc.IngresDriver
+  url-prefix: jdbc:ingres://
+
+INTERBASE:
+  db-type: INTERBASE
+  name: INTERBASE
+  driver-class: interbase.interclient.Driver
+  url-prefix: jdbc:interbase://
+
 JETHRO:
   db-type: JETHRO
   name: JETHRO
-  driver-class:
-  url-prefix:
+  driver-class: com.jethrodata.JethroDriver
+  url-prefix: jdbc:JethroData://
+
 LUCIDDB:
   db-type: LUCIDDB
   name: LUCIDDB
-  driver-class:
-  url-prefix:
-INTERBASE:
-  db-type: INTERBASE
-  name: INTERBASE
-  driver-class:
-  url-prefix:
+  driver-class: org.luciddb.jdbc.LucidDbClientDriver
+  url-prefix: jdbc:luciddb
+
+MSSQL:
+  db-type: MSSQL
+  name: MSSQL
+  sql-dialect: datart.data.provider.calcite.dialect.MsSqlStdOperatorSupport
+  adapter-class: datart.data.provider.jdbc.adapters.MsSqlDataProviderAdapter
+  driver-class: com.microsoft.sqlserver.jdbc.SQLServerDriver
+  url-prefix: jdbc:sqlserver://
+
+MYSQL:
+  db-type: MYSQL
+  name: MYSQL
+  driver-class: com.mysql.cj.jdbc.Driver
+  url-prefix: jdbc:mysql://
+  sql-dialect: datart.data.provider.calcite.dialect.MysqlSqlStdOperatorSupport
+
+NEOVIEW:
+  db-type: NEOVIEW
+  name: NEOVIEW
+  driver-class: com.hp.t4jdbc.HPT4Driver
+  url-prefix: jdbc:hpt4jdbc://
+
+NETEZZA:
+  db-type: NETEZZA
+  name: NETEZZA
+  driver-class: org.netezza.Driver
+  url-prefix: jdbc:netezza://
+
+ORACLE:
+  db-type: ORACLE
+  name: ORACLE
+  driver-class: oracle.jdbc.driver.OracleDriver
+  adapter-class: datart.data.provider.jdbc.adapters.OracleDataProviderAdapter
+  url-prefix: jdbc:oracle:thin:@
+  sql-dialect: datart.data.provider.calcite.dialect.OracleSqlStdOperatorSupport
+
 PHOENIX:
   db-type: PHOENIX
   name: PHOENIX
-  driver-class:
-  url-prefix:
+  driver-class: org.apache.phoenix.jdbc.PhoenixDriver
+  url-prefix: jdbc:phoenix
+
+POSTGRESQL:
+  db-type: POSTGRESQL
+  name: POSTGRESQL
+  driver-class: org.postgresql.Driver
+  url-prefix: jdbc:postgresql://
+
 PRESTO:
   db-type: PRESTO
   name: PRESTO
   driver-class: io.prestosql.jdbc.PrestoDriver
   url-prefix: jdbc:presto://
 
-NETEZZA:
-  db-type: NETEZZA
-  name: NETEZZA
-  driver-class:
-  url-prefix:
-INFOBRIGHT:
-  db-type: INFOBRIGHT
-  name: INFOBRIGHT
-  driver-class:
-  url-prefix:
-NEOVIEW:
-  db-type: NEOVIEW
-  name: NEOVIEW
-  driver-class:
-  url-prefix:
+SPARK:
+  db-type: SPARK
+  name: SPARK
+  driver-class: org.apache.hive.jdbc.HiveDriver
+  url-prefix: jdbc:hive2://
+
+SQLSTREAM:
+  db-type: SQLSTREAM
+  name: SQLSTREAM
+  driver-class: com.sqlstream.jdbc.Driver
+  url-prefix: jdbc:sqlstream://
+
 SYBASE:
   db-type: SYBASE
   name: SYBASE
@@ -133,32 +170,13 @@ SYBASE:
 TERADATA:
   db-type: TERADATA
   name: TERADATA
-  driver-class:
-  url-prefix:
-HSQLDB:
-  db-type: HSQLDB
-  name: HSQLDB
-  driver-class:
-  url-prefix:
+  driver-class: com.teradata.jdbc.TeraDriver
+  url-prefix: jdbc:teradata://
+
 VERTICA:
   db-type: VERTICA
   name: VERTICA
-  driver-class:
-  url-prefix:
-SQLSTREAM:
-  db-type: SQLSTREAM
-  name: SQLSTREAM
-  driver-class:
-  url-prefix:
-SPARK:
-  db-type: SPARK
-  name: SPARK
-  driver-class:
-  url-prefix:
+  driver-class: com.vertica.jdbc.Driver
+  url-prefix: jdbc:vertica://
 
-POSTGRESQL:
-  db-type: POSTGRESQL
-  name: POSTGRESQL
-  driver-class: org.postgresql.Driver
-  url-prefix: jdbc:postgresql://
 

security/src/main/java/datart/security/base/ResourceType.java

@@ -5,15 +5,28 @@ public enum ResourceType {
     SOURCE,
     VIEW,
 
-    DATACHART,
-    DASHBOARD,
+    DATACHART("shareChart"),
+    WIDGET,
+    DASHBOARD("shareDashboard"),
     FOLDER,
-    STORYBOARD,
+    STORYBOARD("shareStoryPlayer"),
     VIZ,
 
     SCHEDULE,
 
     ROLE,
-    USER,
+    USER;
 
+    private String shareRoute;
+
+    ResourceType() {
+    }
+
+    ResourceType(String shareRoute) {
+        this.shareRoute = shareRoute;
+    }
+
+    public String getShareRoute() {
+        return shareRoute;
+    }
 }