Merge branch 'master' into master

Author: zqburde

.gitignore

@@ -1,110 +1,33 @@
-.idea
-.idea/*
-
 .DS_Store
+.cache
 
-assembly/target
-assembly/dss-package/target
-
-
-# dss-commons
-dss-commons/dss-sender-service/target
-
-# dss-appconn
-dss-appconn/appconns/dss-datachecker-appconn/target
-dss-appconn/appconns/dss-eventchecker-appconn/target
-dss-appconn/appconns/dss-orchestrator-framework-appconn/target
-dss-appconn/appconns/dss-schedulis-appconn/target
-dss-appconn/appconns/dss-sendemail-appconn/esb-email-support/target
-dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/target
-dss-appconn/appconns/dss-workflow-appconn/target
-dss-appconn/appconns/dss-sso-appconn/target
-dss-appconn/appconns/dss-scriptis-appconn-appconn/target
-dss-appconn/dss-appconn-core/target
-dss-appconn/dss-appconn-loader/target
-dss-appconn/dss-schedule-appconn-core/target
-dss-appconn/linkis-appconn-engineplugin/target
-dss-appconn/appconns/dss-dolphinscheduler-appconn/target
-dss-appconn/dss-appconn-manager/dss-appconn-manager-client/target
-dss-appconn/dss-appconn-manager/dss-appconn-manager-core/target
-dss-appconn/dss-scheduler-appconn/target
-
-# dss-apps
-dss-apps/dss-apiservice-server/target
-dss-apps/dss-scriptis-server/target
-
-#dss-guide
-dss-apps/dss-user-guide/dss-user-guide-server/src/main/resources/
-dss-apps/dss-user-guide/dss-user-guide-server/target
-
-# dss-commons
-dss-commons/dss-common/target
-dss-commons/dss-contextservice/target
-
-# dss-framework
-dss-framework/dss-appconn-framework/target
-dss-framework/dss-framework-common/target
-dss-framework/dss-framework-orchestrator-server/target
-dss-framework/dss-framework-project-server/target
-dss-framework/dss-framework-workspace-server/target
-dss-framework/framework-plugins/dss-framework-orchestrator-publish/target
-dss-framework/framework-plugins/dss-framework-release-server/target
-dss-framework/framework-plugins/dss-framework-migrate-server/target
-dss-framework/dss-framework-admin/target
-dss-framework/dss-framework-sql-template/target
-dss-framework/dss-framework-dbapi-server/target
-dss-framework/dss-framework-admin-service/target
-
-
-# dss-orchestrator
-dss-orchestrator/dss-orchestrator-common/target
-dss-orchestrator/dss-orchestrator-core/target
-dss-orchestrator/dss-orchestrator-db/target
-dss-orchestrator/dss-orchestrator-loader/target
-dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/target
-dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/target
-dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/target
-dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/target
-dss-orchestrator/dss-orchestrator-conversion-standard/target
-dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/target
-dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/target
-
-# dss-standars
-dss-standard/dss-standard-common/target
-dss-standard/sso-standard/origin-sso-integration-standard/target
-dss-standard/sso-standard/spring-origin-sso-integration-plugin/target
-dss-standard/sso-standard/sso-integration-standard/target
-dss-standard/development-standard/development-process-standard/target
-dss-standard/development-standard/development-process-standard-execution/target
-dss-standard/structure-standard/dss-project-plugin/target
-dss-standard/structure-standard/dss-role-plugin/target
-dss-standard/structure-standard/dss-structure-integration-standard/target
-dss-standard/structure-standard/spring-origin-dss-project-plugin/target
-
-#dss-data-api
-dss-apps/dss-data-api/dss-data-api-server/src/main/resources
-dss-apps/dss-data-api/dss-api-sql-template/target
-dss-apps/dss-data-api/dss-data-api-server/target
-
-#dss-data-governance
-dss-apps/dss-data-governance/dss-data-governance-server/src/main/resources
-dss-apps/dss-data-governance/dss-data-governance-server/target
-dss-apps/dss-data-governance/dss-data-governance-common/target
-dss-apps/dss-data-governance/dss-data-asset-server/target
-dss-apps/dss-data-governance/dss-data-classification-server/target
-dss-apps/dss-data-governance/dss-data-warehouse-dao/target
-dss-apps/dss-data-governance/dss-data-warehouse-service/target
-dss-apps/dss-data-governance/dss-data-warehouse-server/target
-
-
-# plugins
-plugins/azkaban/linkis-jobtype/target
-plugins/linkis/dss-gateway-support/target
-
-logs
-logs/*
-
+# for ide
 *.iml
-/plugins/dolphinscheduler/dss-dolphinscheduler-client/target
-/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/target
-/plugins/dolphinscheduler/dss-dolphinscheduler-token/target
+*.ipr
+*.iws
+*.pyc
+*.pyo
+*.swp
+.idea/
+.idea_modules/
+.project
+.pydevproject
+.scala_dependencies
+.settings
+.classpath
+
+# For SBT
+.jvmopts
+
+# For Node.js
+node_modules/
+
+# generated file
+.mvn/wrapper/maven-wrapper.jar
+dist/
+out/
+target/
+
+# log folder
+logs/
+*.log

conf/log4j2.xml

@@ -21,8 +21,8 @@
             <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger{36} %L %M - %msg%xEx%n"/>
         </Console>
-        <RollingFile name="RollingFile" fileName="logs/dss-server.log"
-                     filePattern="logs/$${date:yyyy-MM}/${serviceName}-log-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="RollingFile" fileName="${env:DSS_LOG_DIR:-logs}/${sys:serviceName}.log"
+                     filePattern="${env:DSS_LOG_DIR:-logs}/$${date:yyyy-MM}/${sys:serviceName}-log-%d{yyyy-MM-dd}-%i.log">
             <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
             <SizeBasedTriggeringPolicy size="100MB"/>
             <DefaultRolloverStrategy max="20"/>

dss-appconn/appconns/dss-dolphinscheduler-appconn/pom.xml

@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>28.2-android</version>
+            <version>30.0-jre</version>
         </dependency>
 
 

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/pom.xml

@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.4</version>
+            <version>4.5.13</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/java/com/webank/wedatasphere/dss/appconn/sendemail/email/sender/SpringJavaEmailSender.java

@@ -27,6 +27,7 @@
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
 
+import java.util.Base64;
 import javax.mail.internet.MimeMessage;
 import javax.mail.util.ByteArrayDataSource;
 import java.util.Map;
@@ -45,10 +46,10 @@ public class SpringJavaEmailSender extends AbstractEmailSender {
     @Override
     public void init(Map<String, String> properties) {
         Properties prop = new Properties();
-        prop.put("mail.smtp.auth", Boolean.parseBoolean(EMAIL_SMTP_AUTH().getValue(properties)));
-        prop.put("mail.smtp.starttls.enable", Boolean.parseBoolean(EMAIL_SMTP_STARTTLS_ENABLE().getValue(properties)));
-        prop.put("mail.smtp.starttls.required", Boolean.parseBoolean(EMAIL_SMTP_STARTTLS_REQUIRED().getValue(properties)));
-        prop.put("mail.smtp.ssl.enable", Boolean.parseBoolean(EMAIL_SMTP_SSL_ENABLED().getValue(properties)));
+        prop.put("mail.smtp.auth", EMAIL_SMTP_AUTH().getValue(properties));
+        prop.put("mail.smtp.starttls.enable", EMAIL_SMTP_STARTTLS_ENABLE().getValue(properties));
+        prop.put("mail.smtp.starttls.required", EMAIL_SMTP_STARTTLS_REQUIRED().getValue(properties));
+        prop.put("mail.smtp.ssl.enable", EMAIL_SMTP_SSL_ENABLED().getValue(properties));
         prop.put("mail.smtp.timeout", EMAIL_SMTP_TIMEOUT().getValue(properties));
         javaMailSender.setJavaMailProperties(prop);
         BiConsumer<Consumer<String>, CommonVars<String>> setProp = (consumer, c) -> {
@@ -84,10 +85,10 @@ private MimeMessage parseToMimeMessage(Email email) {
         MimeMessage message = javaMailSender.createMimeMessage();
         try {
             MimeMessageHelper messageHelper = new MimeMessageHelper(message, true);
-            if (StringUtils.isBlank(email.getFrom())) {
+            if (StringUtils.isBlank(javaMailSender.getUsername())) {
                 messageHelper.setFrom(DEFAULT_EMAIL_FROM().getValue());
             } else {
-                messageHelper.setFrom(email.getFrom());
+                messageHelper.setFrom(javaMailSender.getUsername());
             }
             messageHelper.setSubject(email.getSubject());
             messageHelper.setTo(email.getTo());
@@ -97,10 +98,12 @@ private MimeMessage parseToMimeMessage(Email email) {
             if (StringUtils.isNotBlank(email.getBcc())) {
                 messageHelper.setBcc(email.getBcc());
             }
+            messageHelper.setText(email.getContent(), true);
             for (Attachment attachment : email.getAttachments()) {
-                messageHelper.addAttachment(attachment.getName(), new ByteArrayDataSource(attachment.getBase64Str(), attachment.getMediaType()));
+                messageHelper.addInline(attachment.getName(), new ByteArrayDataSource(Base64.getMimeDecoder().decode(attachment.getBase64Str()), attachment.getMediaType()));
+                messageHelper.addAttachment(attachment.getName(), new ByteArrayDataSource(Base64.getMimeDecoder().decode(attachment.getBase64Str()), attachment.getMediaType()));
             }
-            messageHelper.setText(email.getContent(), true);
+
         } catch (Exception e) {
             logger.error("Send mail failed", e);
         }

dss-appconn/dss-appconn-manager/dss-appconn-manager-core/src/main/java/com/webank/wedatasphere/dss/appconn/manager/utils/AppInstanceConstants.java

@@ -16,6 +16,8 @@
 
 package com.webank.wedatasphere.dss.appconn.manager.utils;
 
+import com.webank.wedatasphere.dss.common.utils.MapUtils;
+import com.webank.wedatasphere.dss.standard.app.sso.builder.SSOUrlBuilderOperation;
 import com.webank.wedatasphere.dss.standard.common.desc.AppInstance;
 import org.apache.commons.lang.StringUtils;
 import org.apache.linkis.common.conf.CommonVars;
@@ -26,12 +28,29 @@ public class AppInstanceConstants {
     static final String INDEX_FILE_PREFIX = "index_";
     static final String INDEX_FILE_SUFFIX = ".index";
 
+    static final String REQUEST_URI = "reqUri";
+
     public static final CommonVars<TimeType> APP_CONN_REFRESH_INTERVAL = CommonVars.apply("wds.dss.appconn.refresh.interval", new TimeType("5m"));
 
-    public static String getHomepageUrl(AppInstance appInstance,
+    public static String getHomepageUrl(AppInstance appInstance, SSOUrlBuilderOperation ssoUrlBuilderOperation,
                                         Long workspaceId, String workspaceName) {
-        return getHomepageUrl(appInstance.getBaseUrl(), appInstance.getHomepageUri(),
+        String homepageUrl = getHomepageUrl(appInstance.getBaseUrl(), appInstance.getHomepageUri(),
                 workspaceId, workspaceName);
+        if(MapUtils.isEmpty(appInstance.getConfig()) || ssoUrlBuilderOperation == null ||
+                !appInstance.getConfig().containsKey(REQUEST_URI)) {
+            return homepageUrl;
+        } else {
+            String reqUri = (String) appInstance.getConfig().get(REQUEST_URI);
+            String reqUrl;
+            if(appInstance.getBaseUrl().endsWith("/")) {
+                reqUrl = appInstance.getBaseUrl() + reqUri;
+            } else {
+                reqUrl = appInstance.getBaseUrl() + "/" + reqUri;
+            }
+            ssoUrlBuilderOperation.redirectTo(homepageUrl);
+            ssoUrlBuilderOperation.setReqUrl(reqUrl);
+            return ssoUrlBuilderOperation.getBuiltUrl();
+        }
     }
 
     public static String getHomepageUrl(String baseUrl, String homepageUri,

dss-apps/dss-apiservice-server/pom.xml

@@ -143,7 +143,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.3.3</version>
+            <version>42.3.7</version>
         </dependency>
         <dependency>
             <groupId>org.apache.linkis</groupId>

dss-apps/dss-data-api/dss-api-sql-template/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
 

dss-apps/dss-scriptis-server/pom.xml

@@ -136,7 +136,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.3.3</version>
+            <version>42.3.7</version>
         </dependency>
         <dependency>
             <groupId>org.apache.linkis</groupId>
@@ -212,7 +212,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/restful/WorkspaceRestfulApi.java

@@ -160,9 +160,10 @@ public Message getWorkspaceAppConns(HttpServletRequest req, @PathVariable("works
         String header = req.getHeader("Content-language").trim();
         boolean isChinese = "zh-CN".equals(header);
         String username = SecurityFilter.getLoginUsername(req);
+        Workspace workspace = SSOHelper.getWorkspace(req);
         List<WorkspaceMenuVo> appconns;
         try {
-            appconns = dssWorkspaceService.getWorkspaceAppConns(workspaceId, username, isChinese);
+            appconns = dssWorkspaceService.getWorkspaceAppConns(workspace, workspaceId, username, isChinese);
         } catch (DSSErrorException e) {
             LOGGER.warn("{} get appconns from workspace {} failed.", username, workspaceId, e);
             return Message.error(e);