fix(chart): merge conflicts

Author: Cuiyansong

README_zh.md

@@ -64,3 +64,5 @@ datart 是新一代数据可视化开放平台，支持各类企业数据可视
 
 ## License
 datart is under the Apache 2.0 license. See the [LICENSE](https://gitee.com/running-elephant/datart/blob/master/LICENSE) file for details.
+
+**（在使用上遇到的任何问题，以及对 datart 的建议，欢迎创建 issue 提问和讨论）**

config/datart.conf

@@ -20,8 +20,8 @@ datart.user.register=true
 datart.register.expire-hours=
 # 邀请邮件有效期/小时, 默认48小时
 datart.invite.expire-hours=
-# 系统运行模式: normal-正常(默认)，single-单组织
-datart.mode=normal
-# 用户名/密码: 仅单组织模式且两者都不为空时重置
+# 租户管理模式：platform-平台(默认)，team-团队
+datart.tenant-management-mode=platform
+# 团队管理员用户名/密码: 仅team模式且两者都不为空时重置
 datart.admin.username=
 datart.admin.password=

config/profiles/application-config.yml

@@ -67,9 +67,9 @@ datart:
   server:
     address: ${datart.address:http://127.0.0.1:8080}
 
-  # 系统运行模式：normal-正常(默认)，single-单组织
-  mode: normal
-  # 用户名/密码: 仅单组织模式且两者都不为空时重置
+  # 租户管理模式：plateform-平台(默认)，team-团队
+  tenant-management-mode: platform
+  # 团队管理员用户名/密码: 仅team模式且两者都不为空时重置
   admin:
     username:
     password:

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

@@ -0,0 +1,9 @@
+package datart.core.base.consts;
+
+public enum TenantManagementMode {
+    /** 团队模式 */
+    TEAM,
+    /** 平台模式 */
+    PLATFORM;
+
+}

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

@@ -18,7 +18,7 @@
 
 package datart.core.common;
 
-import datart.core.base.consts.SystemMode;
+import datart.core.base.consts.TenantManagementMode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -28,15 +28,15 @@
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
 
-import static datart.core.base.consts.SystemMode.NORMAL;
+import static datart.core.base.consts.TenantManagementMode.PLATFORM;
 
 @Component
 @Slf4j
 public class Application implements ApplicationContextAware {
 
     private static ApplicationContext context;
 
-    private static SystemMode currMode;
+    private static TenantManagementMode currMode;
 
     @Override
     public void setApplicationContext(@NonNull ApplicationContext applicationContext) throws BeansException {
@@ -99,21 +99,21 @@ public static boolean canRegister() {
     }
 
     public static String getAdminId() {
-        if (getCurrMode().equals(SystemMode.SINGLE)){
+        if (getCurrMode().equals(TenantManagementMode.TEAM)){
             return getProperty("datart.admin-id", "datart-admin");
         }
         return "";
     }
 
-    public static SystemMode getCurrMode() {
+    public static TenantManagementMode getCurrMode() {
         if (currMode == null) {
-            String mode = Application.getProperty("datart.mode");
+            String mode = Application.getProperty("datart.tenant-management-mode");
             try {
-                return SystemMode.valueOf(mode.toUpperCase());
+                return TenantManagementMode.valueOf(mode.toUpperCase());
             } catch (Exception e) {
-                log.warn("Unrecognized mode: '{}', and this will run in normal mode", mode);
+                log.warn("Unrecognized tenant-management-mode: '{}', and this will run in platform tenant-management-mode", mode);
             }
-            currMode = NORMAL;
+            currMode = PLATFORM;
         }
         return currMode;
     }

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

@@ -0,0 +1,66 @@
+/*
+ * Datart
+ * <p>
+ * Copyright 2021
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package datart.core.common;
+
+import org.apache.ibatis.javassist.ClassPool;
+import org.apache.ibatis.javassist.CtClass;
+import org.apache.ibatis.javassist.CtMethod;
+
+public class ClassTransformer {
+
+    public static void transform() {
+        transformSqlWriter();
+        transformFlyway();
+    }
+
+    private static void transformSqlWriter() {
+        try {
+            ClassPool classPool = ClassPool.getDefault();
+            CtClass ctClass = classPool.get("org.apache.calcite.sql.pretty.SqlPrettyWriter");
+            CtMethod keyword = ctClass.getDeclaredMethod("keyword");
+            keyword.setBody("{    maybeWhitespace($1);" +
+                    "    buf.append($1);" +
+                    "    if (!$1.equals(\"\")) {" +
+                    "      setNeedWhitespace(needWhitespaceAfter($1));" +
+                    "    } " +
+                    "return;} ");
+            ctClass.toClass();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void transformFlyway() {
+        try {
+            ClassPool classPool = ClassPool.getDefault();
+            CtClass ctClass = classPool.get("org.flywaydb.core.internal.database.mysql.MySQLConnection");
+            CtMethod getIntVariableValue = ctClass.getDeclaredMethod("getIntVariableValue");
+            getIntVariableValue.setBody("return 0;");
+
+            CtMethod doRestoreOriginalState = ctClass.getDeclaredMethod("doRestoreOriginalState");
+            doRestoreOriginalState.setBody("return;");
+
+            CtMethod hasUserVariableResetCapability = ctClass.getDeclaredMethod("hasUserVariableResetCapability");
+            hasUserVariableResetCapability.setBody("{return false;}");
+            ctClass.toClass();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

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

@@ -73,14 +73,16 @@ public static <T> T screenShot(String url, OutputType<T> outputType, int imageWi
 
         Double contentHeight = Double.parseDouble(webDriver.findElement(By.id("height")).getAttribute("value"));
 
-        if (imageWidth != contentWidth) {
+        if (imageWidth>0 && imageWidth != contentWidth) {
             // scale the window
             webDriver.manage().window().setSize(new Dimension(imageWidth, contentHeight.intValue()));
-            Thread.sleep(1000);
         }
+        Thread.sleep(1500);
         // scale the window again
         contentWidth = Double.parseDouble(webDriver.findElement(By.id("width")).getAttribute("value"));
+        contentWidth = contentWidth>0 ? contentWidth : 1920;
         contentHeight = Double.parseDouble(webDriver.findElement(By.id("height")).getAttribute("value"));
+        contentHeight = contentHeight>0 ? contentHeight : 600;
         webDriver.manage().window().setSize(new Dimension(contentWidth.intValue(), contentHeight.intValue()));
         Thread.sleep(1000);
 
@@ -124,6 +126,7 @@ private static WebDriver createChromeWebDriver(String driverPath) throws Excepti
         options.addArguments("disable-web-security");
         options.addArguments("no-proxy-server");
         options.addArguments("disable-dev-shm-usage");
+        options.addArguments("window-size=2048,1536");
 
         if (isRemoteDriver(driverPath)) {
             return new RemoteWebDriver(new URL(driverPath), options);

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

@@ -18,6 +18,7 @@
 package datart.data.provider;
 
 import datart.core.data.provider.Dataframe;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
@@ -27,9 +28,13 @@
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.*;
 import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.ssl.SSLContexts;
 import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
@@ -38,14 +43,25 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
+@Slf4j
 public class HttpDataFetcher {
 
     private static final HttpClient httpClient;
 
     private final HttpRequestParam param;
 
     static {
-        httpClient = HttpClientBuilder.create().build();
+        HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
+        try {
+            // trust self-signed certificate and ignore hostname verification
+            SSLConnectionSocketFactory scsf = new SSLConnectionSocketFactory(
+                    SSLContexts.custom().loadTrustMaterial(null, new TrustSelfSignedStrategy()).build(),
+                    NoopHostnameVerifier.INSTANCE);
+            httpClientBuilder.setSSLSocketFactory(scsf);
+        } catch (Exception e) {
+            log.warn("HttpClient config ssl failed, and used default config.");
+        }
+        httpClient = httpClientBuilder.build();
     }
 
     public HttpDataFetcher(HttpRequestParam param) {

data-providers/http-data-provider/src/main/java/datart/data/provider/HttpDataFetcher.java

@@ -0,0 +1,33 @@
+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.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+public class HiveDataProviderAdapter extends JdbcDataProviderAdapter {
+
+    @Override
+    public Set<String> readAllDatabases() throws SQLException {
+        Set<String> schemas = new HashSet<>();
+        try (Connection conn = getConn()) {
+            String schema = conn.getSchema();
+            if (StringUtils.isNotBlank(schema)) {
+                return Collections.singleton(schema);
+            }
+            DatabaseMetaData metadata = conn.getMetaData();
+            try (ResultSet rs = metadata.getSchemas()) {
+                while (rs.next()) {
+                    String schemaName = rs.getString(1);
+                    schemas.add(schemaName);
+                }
+            }
+            return schemas;
+        }
+    }
+}