merge dev code

Author: SoarBlueSky

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 提问和讨论）**

bin/datart-server.sh

@@ -29,7 +29,8 @@ START_CLASS="datart.DatartServerApplication"
 #java -server -Xms2G -Xmx2G  -Dspring.profiles.active=config -Dfile.encoding=UTF-8 -cp "${CLASS_PATH}" datart.DatartServerApplication
 
 datart_status(){
-    result=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}' | wc -l`
+    #result=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}' | wc -l`
+    result=`ps -ef | grep -v grep | grep "${BASE_DIR}/lib" | grep 'DatartServerApplication' | awk {'print $2'} | wc -l`
 
     if [[ $result -eq 0 ]]; then
         return 0
@@ -47,7 +48,8 @@ datart_start(){
 
     else
         echo ""
-        PID=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'`
+        #PID=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'`
+        PID=`ps -ef | grep -v grep | grep "${BASE_DIR}/lib" | grep 'DatartServerApplication' | awk {'print $2'}`
         echo "Datart is Running Now..... PID is ${PID} "
     fi
 }
@@ -60,7 +62,8 @@ datart_stop(){
         echo "Datart is not Running....."
         echo ""
     else
-         ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'| xargs kill -9
+         #ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'| xargs kill -9
+         ps -ef | grep -v grep | grep "$BASE_DIR/lib" | grep 'DatartServerApplication' | awk {'print $2'} | xargs kill -9
 
     fi
 }
@@ -77,7 +80,7 @@ case $1 in
     stop )
         echo ""
 
-        echo "Datart Stoping.......... "
+        echo "Datart Stopping.......... "
 
         echo ""
         datart_stop
@@ -100,7 +103,8 @@ case $1 in
             echo ""
         else
             echo ""
-            PID=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'`
+            #PID=`ps -ef | awk '/DatartServerApplication/ && !/awk/{print $2}'`
+            PID=`ps -ef | grep -v grep | grep "${BASE_DIR}/lib" | grep 'DatartServerApplication' | awk {'print $2'}`
             echo "Datart is Running..... PID is ${PID}"
             echo ""
         fi

config/datart.conf

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

config/profiles/application-config.yml

@@ -62,14 +62,20 @@ spring:
 server:
   port: ${server.port:8080}
   address: ${server.ip:0.0.0.0}
+  ssl:
+    enabled: false
+    key-store: keystore.p12 # Absolute path
+    key-store-password: password
+    keyStoreType: PKCS12
+    keyAlias: tomcat
 
 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:
@@ -78,9 +84,9 @@ datart:
     register: true # 是否允许注册
     active:
       send-mail: ${datart.send-mail:false}  # 注册用户时是否需要邮件验证激活
-
-  invite:
-    duration: ${datart.invite.duration:3} #邀请有效期/天
+      expire-hours: ${datart.register.expire-hours:48} # 注册邮件有效期/小时
+    invite:
+      expire-hours: ${datart.invite.expire-hours:48} # 邀请邮件有效期/小时
 
   security:
     token:

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 {
@@ -86,6 +86,10 @@ public static String getApiPrefix() {
         return getProperty("datart.server.path-prefix");
     }
 
+    public static String getServerPrefix() {
+        return getProperty("server.servlet.context-path","/");
+    }
+
     public static String getTokenSecret() {
         return getProperty("datart.security.token.secret", "d@a$t%a^r&a*t");
     }
@@ -95,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

@@ -17,7 +17,6 @@
  */
 package datart.core.common;
 
-import datart.core.base.exception.BaseException;
 import datart.core.base.exception.Exceptions;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -74,19 +73,23 @@ 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);
 
         TakesScreenshot screenshot = (TakesScreenshot) webDriver;
-        return screenshot.getScreenshotAs(outputType);
+        T output = screenshot.getScreenshotAs(outputType);
+        webDriver.quit();
+        return output;
     }
 
     public static File screenShot2File(String url, String path, int imageWidth) throws Exception {
@@ -123,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

@@ -79,6 +79,8 @@ public DataProviderConfigTemplate getConfigTemplate() throws IOException {
 
     public abstract String getConfigDescription(String name);
 
+    public abstract String getQueryKey(DataProviderSource config, QueryScript script, ExecuteParam executeParam) throws Exception;
+
     public abstract Dataframe execute(DataProviderSource config, QueryScript script, ExecuteParam executeParam) throws Exception;
 
     /**
@@ -121,5 +123,4 @@ public Set<StdSqlOperator> supportedStdFunctions(DataProviderSource source) {
     public void resetSource(DataProviderSource source) {
     }
 
-
 }