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

zqburde · zqburde · commit 999ecd229a4e · 2022-07-08T16:06:26.000+08:00
diff --git a/db/dss_dml.sql b/db/dss_dml.sql
@@ -309,7 +309,7 @@ insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_ra
 insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('58','Regex','(.+)@(.+)@(.+)','此格式错误，例如：ProjectName@WFName@jobName','Invalid format,example:ProjectName@WFName@jobName','blur');
 INSERT INTO `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('59','OFT','["true","false"]','请填写是否复用引擎，false：不复用，true：复用','Please fill in whether or not to reuse engine, true: reuse, false: not reuse','blur');
 insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('60', 'Regex', '^[0-9.]*g{0,1}$', 'Spark内存设置如2g', 'Drive memory size, default value: 2', 'blur');
-insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('61','Regex','^.{1,5000}$','长度在1到5000个字符','The length is between 1 and 5000 characters','blur');
+insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('61','Regex','^(.|\s){1,500}$','长度在1到5000个字符','The length is between 1 and 5000 characters','blur');
 insert into `dss_workflow_node_ui_validate` (`id`, `validate_type`, `validate_range`, `error_msg`, `error_msg_en`, `trigger`) values('62','Regex','^.{1,150}$','长度在1到150个字符','The length is between 1 and 150 characters','blur');
 
 DELETE FROM dss_workflow_node_ui_to_validate;
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/java/com/webank/wedatasphere/dss/appconn/sendemail/email/Email.java b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/java/com/webank/wedatasphere/dss/appconn/sendemail/email/Email.java
@@ -41,4 +41,6 @@ public interface Email {
     String getBcc();
     void setBcc(String bcc);
 
+    String getEmailType();
+    void setEmailType(String emailType);
 }
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/conf/SendEmailAppConnConfiguration.scala b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/conf/SendEmailAppConnConfiguration.scala
@@ -25,7 +25,8 @@ object SendEmailAppConnConfiguration {
 
   val EMAIL_HOOK_CLASSES = CommonVars("wds.dss.appconn.email.hook.classes",
     "com.webank.wedatasphere.dss.appconn.sendemail.hook.SendEmailItsmCheckHook," +
-      "com.webank.wedatasphere.dss.appconn.sendemail.hook.SendEmailContentLimitHook")
+      "com.webank.wedatasphere.dss.appconn.sendemail.hook.SendEmailVisualisContentLimitHook," +
+      "com.webank.wedatasphere.dss.appconn.sendemail.hook.SendEmailTableauCheckHook")
 
   val EMAIL_IMAGE_HEIGHT = CommonVars("wds.dss.appconn.email.image.height", 500)
   val EMAIL_IMAGE_WIDTH = CommonVars("wds.dss.appconn.email.image.width", 1920)
@@ -44,4 +45,6 @@ object SendEmailAppConnConfiguration {
   val EMAIL_SMTP_SSL_ENABLED = CommonVars("wds.dss.appconn.email.smtp.ssl.enable", "true")
   val EMAIL_SMTP_TIMEOUT: CommonVars[Integer] = CommonVars("wds.dss.appconn.email.smtp.timeout", 25000)
 
+  val EMAIL_ENTITY_CLASSES = CommonVars("wds.dss.appconn.email.hook.entity.classes","com.webank.wedatasphere.dss.appconn.sendemail.hook.entity.newvisualis.NewVisualisEmailInfo," +
+    "com.webank.wedatasphere.dss.appconn.sendemail.hook.entity.visualis.VisualisEmailInfo")
 }
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/cs/EmailCSHelper.scala b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/cs/EmailCSHelper.scala
@@ -16,6 +16,10 @@
 
 package com.webank.wedatasphere.dss.appconn.sendemail.cs
 
+
+import java.util
+
+import com.google.gson.internal.LinkedTreeMap
 import com.webank.wedatasphere.dss.appconn.sendemail.exception.EmailSendFailedException
 import com.webank.wedatasphere.dss.standard.app.development.listener.core.ExecutionRequestRefContext
 import org.apache.linkis.common.utils.Logging
@@ -25,6 +29,7 @@ import org.apache.linkis.cs.common.entity.enumeration.{ContextScope, ContextType
 import org.apache.linkis.cs.common.entity.source.CommonContextKey
 import org.apache.linkis.cs.common.utils.CSCommonUtils
 import org.apache.linkis.server.JSONUtils
+import org.springframework.util.CollectionUtils
 
 import scala.collection.JavaConversions._
 
@@ -57,4 +62,16 @@ object EmailCSHelper extends Logging{
     info(s"Job IDs is ${jobIds.toList}.")
     jobIds
   }
+
+  def getJobTypes(refContext: ExecutionRequestRefContext):util.ArrayList[String] = {
+    val jobTypes = new util.ArrayList[String]()
+    getJobIds(refContext).foreach { jobId =>
+      jobTypes.add(refContext.fetchLinkisJob(jobId).getParams.get("labels").asInstanceOf[LinkedTreeMap[_,_]].get("codeType").toString)
+    }
+    if (CollectionUtils.isEmpty(jobTypes)) {
+      throw new EmailSendFailedException(80003 ,"empty result set is not allowed")
+    }
+    info(s"Job Types is $jobTypes.")
+    jobTypes
+  }
 }
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/email/domain/AbstractEmail.scala b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/email/domain/AbstractEmail.scala
@@ -29,6 +29,7 @@ class AbstractEmail extends Email {
   private var to: String = _
   private var cc: String = _
   private var bcc: String = _
+  private var emialType: String = _
 
   override def getContent: String = content
   override def setContent(content: String): Unit = this.content = content
@@ -52,4 +53,7 @@ class AbstractEmail extends Email {
 
   override def getBcc: String = bcc
   override def setBcc(bcc: String): Unit = this.bcc = bcc
+
+  override def getEmailType: String = emialType
+  override def setEmailType(emailType: String): Unit = this.emialType = emailType
 }
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/email/domain/MultiContentEmail.scala b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/email/domain/MultiContentEmail.scala
@@ -30,4 +30,6 @@ class MultiContentEmail extends AbstractEmail {
 
   def getEmailContents: Array[EmailContent[_]] = emailContents.toIterator.toArray
 
+
+
 }
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/email/generate/MultiContentEmailGenerator.scala b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/email/generate/MultiContentEmailGenerator.scala
@@ -16,11 +16,14 @@
 
 package com.webank.wedatasphere.dss.appconn.sendemail.email.generate
 
+import com.google.gson.internal.LinkedTreeMap
 import com.webank.wedatasphere.dss.appconn.sendemail.cs.EmailCSHelper
 import com.webank.wedatasphere.dss.appconn.sendemail.email.domain.{AbstractEmail, MultiContentEmail}
 import com.webank.wedatasphere.dss.appconn.sendemail.emailcontent.domain.PictureEmailContent
 import com.webank.wedatasphere.dss.appconn.sendemail.exception.EmailSendFailedException
+import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils
 import com.webank.wedatasphere.dss.standard.app.development.listener.ref.RefExecutionRequestRef
+import org.apache.commons.lang3.StringUtils
 import org.apache.linkis.storage.resultset.ResultSetFactory
 
 class MultiContentEmailGenerator extends AbstractEmailGenerator {
@@ -45,6 +48,10 @@ class MultiContentEmailGenerator extends AbstractEmailGenerator {
               }
               multiContentEmail.addEmailContent(emailContent)
             }
+            if (StringUtils.isBlank(multiContentEmail.getEmailType)) {
+              val emailType = refContext.fetchLinkisJob(jobId).getParams.get("labels").asInstanceOf[LinkedTreeMap[_,_]].get("codeType").toString
+              multiContentEmail.setEmailType(emailType)
+            }
           }
         case "file" => throw new EmailSendFailedException(80003 ,"file content is not allowed") //addContentEmail(c => new FileEmailContent(new FsPath(c)))
         case "text" => throw new EmailSendFailedException(80003 ,"text content is not allowed")//addContentEmail(new TextEmailContent(_))
diff --git a/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/emailcontent/parser/PictureEmailContentParser.scala b/dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/src/main/scala/com/webank/wedatasphere/dss/appconn/sendemail/emailcontent/parser/PictureEmailContentParser.scala
@@ -45,7 +45,8 @@ object PictureEmailContentParser extends AbstractEmailContentParser[PictureEmail
     val imageUUID: String = UUID.randomUUID.toString
     val width: Int = bufferedImage.getWidth
     val height: Int = bufferedImage.getHeight
-    val imagesCuts = if (height > EMAIL_IMAGE_HEIGHT.getValue) {
+    // 只支持修改visualis图片大小，后续如果有新增其他类型的邮件需要修改图片大小，需要在if中加上该邮件类型
+    val imagesCuts = if (email.getEmailType.contains("visualis") && height > EMAIL_IMAGE_HEIGHT.getValue) {
       val numOfCut = Math.ceil(height.toDouble / EMAIL_IMAGE_HEIGHT.getValue).toInt
       val realHeight = height / numOfCut
       (0 until numOfCut).map(i => bufferedImage.getSubimage(0, i * realHeight, width, realHeight)).toArray
@@ -62,7 +63,7 @@ object PictureEmailContentParser extends AbstractEmailContentParser[PictureEmail
       var iHeight = image.getHeight
       var iWidth = image.getWidth
 
-      if (iWidth > EMAIL_IMAGE_WIDTH.getValue) {
+      if (email.getEmailType.contains("visualis") && iWidth > EMAIL_IMAGE_WIDTH.getValue) {
         iHeight = ((EMAIL_IMAGE_WIDTH.getValue.toDouble / iWidth.toDouble) * iHeight.toDouble).toInt
         iWidth = EMAIL_IMAGE_WIDTH.getValue
       }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
@@ -28,6 +28,7 @@
 import com.webank.wedatasphere.dss.common.label.DSSLabel;
 import com.webank.wedatasphere.dss.common.utils.DSSCommonUtils;
 import com.webank.wedatasphere.dss.common.utils.IoUtils;
+import com.webank.wedatasphere.dss.common.utils.MapUtils;
 import com.webank.wedatasphere.dss.contextservice.service.ContextService;
 import com.webank.wedatasphere.dss.contextservice.service.impl.ContextServiceImpl;
 import com.webank.wedatasphere.dss.standard.app.development.utils.DSSJobContentConstant;
@@ -311,6 +312,11 @@ public DSSFlow copyRootFlow(Long rootFlowId, String userName, Workspace workspac
                                 String projectName, String version, String contextIdStr,
                                 String description, List<DSSLabel> dssLabels) throws DSSErrorException, IOException {
         DSSFlow dssFlow = flowMapper.selectFlowByID(rootFlowId);
+        if(dssFlow == null) {
+            throw new DSSErrorException(50030, "Workflow " + rootFlowId + " is not exists[工作流不存在，请检查是否已被删除].");
+        }
+        logger.info("User {} try to copy workflow {} in project {} with newVersion {} and contextId {}.", userName,
+                dssFlow.getName(), projectName, version, contextIdStr);
         DSSFlow rootFlowWithSubFlows = copyFlowAndSetSubFlowInDB(dssFlow, userName, description);
         updateFlowJson(userName, projectName, rootFlowWithSubFlows, version, null,
                 contextIdStr, workspace, dssLabels);
@@ -348,7 +354,7 @@ private void updateFlowJson(String userName, String projectName, DSSFlow rootFlo
         String flowJson = bmlService.readFlowJsonFromBML(userName, rootFlow.getResourceId(), rootFlow.getBmlVersion());
         //如果包含subflow,需要一同导入subflow内容，并更新parrentflow的json内容
         // TODO: 2020/7/31 优化update方法里面的saveContent
-        String updateFlowJson = updateFlowContextId(flowJson, contextIdStr);
+        String updateFlowJson = updateFlowContextIdAndVersion(flowJson, contextIdStr, version);
         //重新上传工作流资源
         updateFlowJson = uploadFlowResourceToBml(userName, updateFlowJson, projectName, rootFlow);
         //上传节点的资源或调用appconn的copyRef
@@ -408,8 +414,9 @@ private DSSFlow uploadFlowJsonToBml(String userName, String projectName, DSSFlow
         return dssFlow;
     }
 
-    private String updateFlowContextId(String flowJson, String contextIdStr) throws IOException {
-        return workFlowParser.updateFlowJsonWithKey(flowJson, CSCommonUtils.CONTEXT_ID_STR, contextIdStr);
+    private String updateFlowContextIdAndVersion(String flowJson, String contextIdStr, String orcVersion) throws IOException {
+        return workFlowParser.updateFlowJsonWithMap(flowJson, MapUtils.newCommonMap(CSCommonUtils.CONTEXT_ID_STR, contextIdStr,
+                DSSJobContentConstant.ORC_VERSION_KEY, orcVersion));
     }
 
     private String updateWorkFlowNodeJson(String userName, String projectName,
diff --git a/web/packages/workflows/module/process/module.vue b/web/packages/workflows/module/process/module.vue
@@ -701,7 +701,9 @@ export default {
       this.workflowExeteId = currentExecutorFlow[0].execID
       this.workflowTaskId = currentExecutorFlow[0].taskID
     }
-    this.getToolbarsConfig()
+    if (!this.myReadonly) {
+      this.getToolbarsConfig()
+    }
     // 基础信息
     this.setShapes().then(() => {
       this.getBaseInfo();

Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,6 @@ public interface Email {`
`41`	`41`	`String getBcc();`
`42`	`42`	`void setBcc(String bcc);`
`43`	`43`
	`44`	`+ String getEmailType();`
	`45`	`+ void setEmailType(String emailType);`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,6 @@ class MultiContentEmail extends AbstractEmail {`
`30`	`30`
`31`	`31`	`def getEmailContents: Array[EmailContent[_]] = emailContents.toIterator.toArray`
`32`	`32`
	`33`	`+`
	`34`	`+`
`33`	`35`	`}`