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

# Conflicts:
#	dss-framework/dss-framework-workspace-server/src/main/java/com/webank/wedatasphere/dss/framework/workspace/service/impl/DSSWorkspaceServiceImpl.java

db/dss_ddl.sql

@@ -47,6 +47,7 @@ CREATE TABLE `dss_orchestrator_info` (
    `workspace_id` int(11) DEFAULT NULL COMMENT '空间id',
    `orchestrator_mode` varchar(100) DEFAULT NULL COMMENT '编排模式，取得的值是dss_dictionary中的dic_key(parent_key=p_arrangement_mode)',
    `orchestrator_way` varchar(256) DEFAULT NULL COMMENT '编排方式',
+   `orchestrator_level` varchar(32) DEFAULT NULL COMMENT '工作流级别',
    `update_user` varchar(100) DEFAULT NULL COMMENT '更新人',
    `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
    PRIMARY KEY (`id`) USING BTREE,
@@ -71,6 +72,7 @@ CREATE TABLE `dss_orchestrator_version_info` (
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=422 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT;
 
+DROP TABLE IF EXISTS `dss_orchestrator_ref_orchestration_relation`;
 CREATE TABLE `dss_orchestrator_ref_orchestration_relation` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID',
   `orchestrator_id` bigint(20) NOT NULL COMMENT 'dss的编排模式id',
@@ -350,7 +352,7 @@ CREATE TABLE `dss_workflow_edit_lock` (
    UNIQUE KEY `dss_workflow_edit_lock_flow_id_IDX` (`flow_id`) USING BTREE
  ) ENGINE=InnoDB AUTO_INCREMENT=571 DEFAULT CHARSET=utf8;
 
- DROP TABLE IF EXISTS `dss_workflow_task`;
+DROP TABLE IF EXISTS `dss_workflow_task`;
 CREATE TABLE `dss_workflow_task` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Primary Key, auto increment',
   `instance` varchar(50) DEFAULT NULL COMMENT 'An instance of Entrance, consists of IP address of the entrance server and port',
@@ -380,6 +382,7 @@ CREATE TABLE `dss_workflow_task` (
   KEY `um_user` (`um_user`)
 ) ENGINE=InnoDB AUTO_INCREMENT=715 DEFAULT CHARSET=utf8mb4;
 
+DROP TABLE IF EXISTS `dss_workflow_execute_info`;
 CREATE TABLE `dss_workflow_execute_info` (
    `id` bigint(20) NOT NULL AUTO_INCREMENT,
    `task_id` bigint(20) NOT NULL COMMENT '任务id',
@@ -603,3 +606,15 @@ CREATE TABLE `dss_workspace_user_role` (
 --  PRIMARY KEY (`receiver`,`topic`,`msg_name`)
 --) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='消息消费状态表';
 
+DROP TABLE IF EXISTS `dss_proxy_user`;
+CREATE TABLE `dss_proxy_user` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `username` varchar(64) DEFAULT NULL,
+  `proxy_user_name` varchar(64) DEFAULT NULL,
+  `create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=214 DEFAULT CHARSET=utf8;
+

dss-appconn/appconns/dss-datachecker-appconn/src/main/scala/com/webank/wedatapshere/dss/appconn/datachecker/DataCheckerRefExecutionOperation.scala

@@ -16,16 +16,17 @@
 
 package com.webank.wedatapshere.dss.appconn.datachecker
 
+
 import java.util
 import java.util.{Properties, UUID}
 
-import com.webank.wedatasphere.dss.common.utils.VariableUtils
 import com.webank.wedatasphere.dss.standard.app.development.listener.common._
 import com.webank.wedatasphere.dss.standard.app.development.listener.core.{Killable, LongTermRefExecutionOperation, Procedure}
 import com.webank.wedatasphere.dss.standard.app.development.listener.ref.ExecutionResponseRef.ExecutionResponseRefBuilder
 import com.webank.wedatasphere.dss.standard.app.development.listener.ref.{AsyncExecutionResponseRef, ExecutionResponseRef, RefExecutionRequestRef}
 import org.apache.linkis.common.log.LogUtils
 import org.apache.linkis.common.utils.Utils
+import org.apache.linkis.common.utils.VariableUtils
 
 import scala.collection.mutable
 
@@ -77,11 +78,11 @@ class DataCheckerRefExecutionOperation
         properties.put(record._1, "")
       }
       else {
-        if(inputParams.exists(x=>x._1.equalsIgnoreCase(VariableUtils.RUN_DATE))) {
-          val tmp:util.HashMap[String, Any]  = new util.HashMap[String,Any]()
-          tmp.put(VariableUtils.RUN_DATE,inputParams.getOrElse(VariableUtils.RUN_DATE, null))
-          properties.put(record._1, VariableUtils.replace(record._2.toString,tmp))
-        }else {
+        if (inputParams.exists(x => x._1.equalsIgnoreCase(VariableUtils.RUN_DATE))) {
+          val tmp: util.HashMap[String, Any] = new util.HashMap[String, Any]()
+          tmp.put(VariableUtils.RUN_DATE, inputParams.getOrElse(VariableUtils.RUN_DATE, null))
+          properties.put(record._1, VariableUtils.replace(record._2.toString, tmp))
+        } else {
           properties.put(record._1, VariableUtils.replace(record._2.toString))
         }
       }

dss-appconn/appconns/dss-dolphinscheduler-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/dolphinscheduler/operation/DolphinSchedulerProjectDeletionOperation.java

@@ -36,7 +36,7 @@ public void init() {
     public ResponseRef deleteProject(RefProjectContentRequestRef.RefProjectContentRequestRefImpl projectRef) throws ExternalOperationFailedException {
         // Dolphin Scheduler项目名
         String dsProjectName =
-                ProjectUtils.generateDolphinProjectName(projectRef.getWorkspace().getWorkspaceName(), projectRef.getName());
+                ProjectUtils.generateDolphinProjectName(projectRef.getWorkspace().getWorkspaceName(), projectRef.getProjectName());
         logger.info("User {} begin to delete project in DolphinScheduler, project name is {}.", projectRef.getUserName(), dsProjectName);
         DolphinSchedulerHttpUtils.getHttpGetResult(ssoRequestOperation, this.deleteProjectByIdUrl, DolphinSchedulerConf.DS_ADMIN_USER.getValue(),
                 MapUtils.newCommonMap("projectId", projectRef.getRefProjectId()));

dss-appconn/appconns/dss-schedulis-appconn/src/main/java/com/webank/wedatasphere/dss/appconn/schedulis/operation/SchedulisProjectDeletionOperation.java

@@ -51,7 +51,7 @@ public void init() {
     public ResponseRef deleteProject(RefProjectContentRequestRef.RefProjectContentRequestRefImpl projectRef) throws ExternalOperationFailedException {
         try {
             Map<String, Object> params = new HashMap<>(2);
-            params.put("project", projectRef.getName());
+            params.put("project", projectRef.getProjectName());
             params.put("delete", "true");
             String responseContent = SchedulisHttpUtils.getHttpGetResult(this.managerUrl, params, ssoRequestOperation, projectRef.getWorkspace());
             logger.info("delete Schedulis Project with response: {}.", responseContent);

dss-appconn/appconns/dss-visualis-appconn/src/main/icons/view.icon

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><!-- Generator: Sketch 64 (93537) - https://sketch.com --><title>display</title><desc>Created with Sketch.</desc><defs><path d="M0.683,0.287 L5.241,2.766 C5.066,2.671 4.85,2.635 4.606,2.669 L0.047,0.189" id="path-1"></path><path d="M0.683,0.287 L5.241,2.766 C5.066,2.671 4.85,2.635 4.606,2.669 L0.047,0.189" id="path-3"></path><path d="M0.683,0.287 L5.241,2.766 C5.066,2.671 4.85,2.635 4.606,2.669 L0.047,0.189" id="path-5"></path><path d="M1.726,0.728 L6.285,3.207 C5.947,3.024 5.547,2.946 5.12,3.005 L0.561,0.526" id="path-7"></path><path d="M1.726,0.728 L6.285,3.207 C5.947,3.024 5.547,2.946 5.12,3.005 L0.561,0.526" id="path-9"></path><path d="M1.726,0.728 L6.285,3.207 C5.947,3.024 5.547,2.946 5.12,3.005 L0.561,0.526" id="path-11"></path><path d="M1.669,0.07 L6.228,2.549 C5.563,2.643 5.106,3.2 5.105,3.926 C5.104,4.381 5.287,4.724 5.592,4.89 L1.033,2.41 C0.728,2.245 0.545,1.902 0.545995923,1.446" id="path-13"></path><path d="M1.669,0.07 L6.228,2.549 C5.563,2.643 5.106,3.2 5.105,3.926 C5.104,4.381 5.287,4.724 5.592,4.89 L1.033,2.41 C0.728,2.245 0.545,1.902 0.545995923,1.446" id="path-15"></path><path d="M1.669,0.07 L6.228,2.549 C5.563,2.643 5.106,3.2 5.105,3.926 C5.104,4.381 5.287,4.724 5.592,4.89 L1.033,2.41 C0.728,2.245 0.545,1.902 0.545995923,1.446" id="path-17"></path><path d="M1.669,0.07 L6.228,2.549 C5.563,2.643 5.106,3.2 5.105,3.926 C5.104,4.381 5.287,4.724 5.592,4.89 L1.033,2.41 C0.728,2.245 0.545,1.902 0.545995923,1.446" id="path-19"></path><path d="M1.669,0.07 L6.228,2.549 C5.563,2.643 5.106,3.2 5.105,3.926 C5.104,4.381 5.287,4.724 5.592,4.89 L1.033,2.41 C0.728,2.245 0.545,1.902 0.545995923,1.446" id="path-21"></path><path d="M1.669,0.07 L6.228,2.549 C5.563,2.643 5.106,3.2 5.105,3.926 C5.104,4.381 5.287,4.724 5.592,4.89 L1.033,2.41 C0.728,2.245 0.545,1.902 0.545995923,1.446" id="path-23"></path><path d="M1.669,0.07 L6.228,2.549 C5.563,2.643 5.106,3.2 5.105,3.926 C5.104,4.381 5.287,4.724 5.592,4.89 L1.033,2.41 C0.728,2.245 0.545,1.902 0.545995923,1.446" id="path-25"></path><path d="M1.669,0.07 L6.228,2.549 C5.563,2.643 5.106,3.2 5.105,3.926 C5.104,4.381 5.287,4.724 5.592,4.89 L1.033,2.41 C0.728,2.245 0.545,1.902 0.545995923,1.446" id="path-27"></path><path d="M-7.12878811e-06,0.008 L4.559,2.488 C4.557,3.333 4.976,4.029 5.599,4.369 L1.041,1.889" id="path-29"></path><polygon id="path-31" points="0 0.3587 4.5879 0.3587 4.5879 18.4877 0 18.4877"></polygon><path d="M2.244,0.663 L6.803,3.142 C5.594,3.312 4.59,4.534 4.588,5.839 L0.029,3.359" id="path-33"></path><path d="M2.244,0.663 L6.803,3.142 C5.594,3.312 4.59,4.534 4.588,5.839 L0.029,3.359" id="path-35"></path><path d="M2.244,0.663 L6.803,3.142 C5.594,3.312 4.59,4.534 4.588,5.839 L0.029,3.359" id="path-37"></path><path d="M2.244,0.663 L6.803,3.142 C5.594,3.312 4.59,4.534 4.588,5.839 L0.029,3.359" id="path-39"></path><path d="M2.244,0.663 L6.803,3.142 C5.594,3.312 4.59,4.534 4.588,5.839 L0.029,3.359" id="path-41"></path><path d="M2.244,0.663 L6.803,3.142 C5.594,3.312 4.59,4.534 4.588,5.839 L0.029,3.359" id="path-43"></path><path d="M2.244,0.663 L6.803,3.142 C5.594,3.312 4.59,4.534 4.588,5.839 L0.029,3.359" id="path-45"></path><path d="M2.244,0.663 L6.803,3.142 C5.594,3.312 4.59,4.534 4.588,5.839 L0.029,3.359" id="path-47"></path><polygon id="path-49" points="0.558993261 0.985244832 27.2873382 0.985244832 27.2873382 30 0.558993261 30"></polygon></defs><g id="工作空间项目-开发中心-具体工作流" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="侧边栏icon" transform="translate(-33.000000, -426.000000)"><g id="display" transform="translate(31.000000, 424.000000)"><g id="编组-30"><rect id="矩形备份-17" x="0" y="0" width="36" height="36"></rect></g><g id="编组" transform="translate(2.000000, 2.000000)"><g transform="translate(20.000000, 25.000000)"><g><mask id="mask-2" fill="white"><use xlink:href="#path-1"></use></mask><g id="Clip-2"></g><path d="M4.6057,2.6694 L0.0467,0.1894 C0.2047,0.1674 0.3507,0.1744 0.4817,0.2084 L5.0407,2.6884 C4.9097,2.6544 4.7637,2.6474 4.6057,2.6694" id="Fill-1" fill="#9AC2F0" mask="url(#mask-2)"></path></g><g><mask id="mask-4" fill="white"><use xlink:href="#path-3"></use></mask><g id="Clip-4"></g><path d="M5.0408,2.6879 L0.4818,0.2089 C0.5418,0.2239 0.5988,0.2449 0.6518,0.2709 L5.2098,2.7499 C5.1568,2.7239 5.1008,2.7039 5.0408,2.6879" id="Fill-3" fill="#9DC4F0" mask="url(#mask-4)"></path></g><g><mask id="mask-6" fill="white"><use xlink:href="#path-5"></use></mask><g id="Clip-6"></g><path d="M5.2102,2.7504 L0.6512,0.2714 C0.6622,0.2754 0.6722,0.2804 0.6832,0.2864 L5.2412,2.7664 C5.2312,2.7614 5.2212,2.7554 5.2102,2.7504" id="Fill-5" fill="#A0C6F1" mask="url(#mask-6)"></path></g></g><polygon id="Fill-7" fill="#93BEEF" points="22.8035 27.9223 18.2445 25.4433 20.0475 25.1893 24.6055 27.6693"></polygon><polygon id="Fill-9" fill="#B3D1F3" points="20.2156 28.2866 15.6566 25.8066 14.7986 22.3226 19.3576 24.8026"></polygon><polygon id="Fill-11" fill="#B1D0F3" points="28.2386 20.5981 23.6796 18.1191 23.7066 3.6021 28.2656 6.0811"></polygon><polygon id="Fill-13" fill="#93BEEF" points="15.618 28.9321 11.059 26.4531 15.657 25.8061 20.216 28.2861"></polygon><g transform="translate(24.000000, 0.000000)"><g><mask id="mask-8" fill="white"><use xlink:href="#path-7"></use></mask><g id="Clip-16"></g><path d="M5.1199,3.0053 L0.5609,0.5263 C0.8249,0.4883 1.0779,0.5043 1.3119,0.5653 L5.8709,3.0443 C5.6359,2.9843 5.3829,2.9683 5.1199,3.0053" id="Fill-15" fill="#9AC2F0" mask="url(#mask-8)"></path></g><g><mask id="mask-10" fill="white"><use xlink:href="#path-9"></use></mask><g id="Clip-18"></g><path d="M5.8709,3.0444 L1.3119,0.5654 C1.4329,0.5964 1.5489,0.6394 1.6589,0.6924 L6.2179,3.1724 C6.1079,3.1184 5.9919,3.0754 5.8709,3.0444" id="Fill-17" fill="#9DC4F0" mask="url(#mask-10)"></path></g><g><mask id="mask-12" fill="white"><use xlink:href="#path-11"></use></mask><g id="Clip-20"></g><path d="M6.2176,3.1723 L1.6586,0.6933 C1.6816,0.7033 1.7036,0.7153 1.7266,0.7283 L6.2846,3.2073 C6.2626,3.1953 6.2406,3.1843 6.2176,3.1723" id="Fill-19" fill="#A0C6F1" mask="url(#mask-12)"></path></g></g><polygon id="Fill-21" fill="#ABCDF2" points="12.9827 29.3032 8.4237 26.8232 9.4397 23.0752 13.9987 25.5562"></polygon><polygon id="Fill-23" fill="#93BEEF" points="11.2283 29.5493 6.6693 27.0703 8.4243 26.8223 12.9823 29.3033"></polygon><g transform="translate(5.000000, 27.000000)"><g><mask id="mask-14" fill="white"><use xlink:href="#path-13"></use></mask><g id="Clip-26"></g><path d="M5.5916,4.8901 L1.0326,2.4101 C0.7286,2.2441 0.5456,1.9021 0.5456,1.4461 C0.5466,1.2531 0.5786,1.0741 0.6386,0.9111 L5.1966,3.3901 C5.1376,3.5531 5.1046,3.7341 5.1046,3.9261 C5.1036,4.3811 5.2876,4.7241 5.5916,4.8901" id="Fill-25" fill="#AFCFF3" mask="url(#mask-14)"></path></g><g><mask id="mask-16" fill="white"><use xlink:href="#path-15"></use></mask><g id="Clip-28"></g><path d="M5.1971,3.3901 L0.6381,0.9111 C0.6611,0.8481 0.6881,0.7871 0.7191,0.7311 L5.2781,3.2101 C5.2471,3.2681 5.2201,3.3281 5.1971,3.3901" id="Fill-27" fill="#ACCDF3" mask="url(#mask-16)"></path></g><g><mask id="mask-18" fill="white"><use xlink:href="#path-17"></use></mask><g id="Clip-30"></g><path d="M5.2776,3.2104 L0.7186,0.7314 C0.7436,0.6844 0.7716,0.6394 0.8016,0.5964 L5.3606,3.0764 C5.3306,3.1184 5.3026,3.1634 5.2776,3.2104" id="Fill-29" fill="#A9CBF2" mask="url(#mask-18)"></path></g><g><mask id="mask-20" fill="white"><use xlink:href="#path-19"></use></mask><g id="Clip-32"></g><path d="M5.3601,3.0766 L0.8011,0.5966 C0.8291,0.5566 0.8591,0.5186 0.8901,0.4836 L5.4491,2.9636 C5.4171,2.9996 5.3881,3.0366 5.3601,3.0766" id="Fill-31" fill="#A6CAF2" mask="url(#mask-20)"></path></g><g><mask id="mask-22" fill="white"><use xlink:href="#path-21"></use></mask><g id="Clip-34"></g><path d="M5.449,2.9633 L0.89,0.4843 C0.922,0.4473 0.956,0.4133 0.991,0.3813 L5.551,2.8603 C5.515,2.8933 5.481,2.9273 5.449,2.9633" id="Fill-33" fill="#A3C8F1" mask="url(#mask-22)"></path></g><g><mask id="mask-24" fill="white"><use xlink:href="#path-23"></use></mask><g id="Clip-36"></g><path d="M5.5506,2.8608 L0.9916,0.3818 C1.0306,0.3458 1.0726,0.3128 1.1166,0.2828 L5.6756,2.7618 C5.6316,2.7928 5.5896,2.8258 5.5506,2.8608" id="Fill-35" fill="#A0C6F1" mask="url(#mask-24)"></path></g><g><mask id="mask-26" fill="white"><use xlink:href="#path-25"></use></mask><g id="Clip-38"></g><path d="M5.6751,2.7621 L1.1161,0.2831 C1.1721,0.2431 1.2321,0.2101 1.2941,0.1811 L5.8521,2.6601 C5.7901,2.6901 5.7311,2.7241 5.6751,2.7621" id="Fill-37" fill="#9DC4F0" mask="url(#mask-26)"></path></g><g><mask id="mask-28" fill="white"><use xlink:href="#path-27"></use></mask><g id="Clip-40"></g><path d="M5.8523,2.6606 L1.2933,0.1816 C1.4093,0.1266 1.5353,0.0886 1.6693,0.0696 L6.2283,2.5496 C6.0933,2.5676 5.9673,2.6056 5.8523,2.6606" id="Fill-39" fill="#9AC2F0" mask="url(#mask-28)"></path></g></g><polygon id="Fill-41" fill="#93BEEF" points="7.5794 23.5014 3.0204 21.0224 23.6804 18.1184 28.2384 20.5984"></polygon><g transform="translate(0.000000, 22.000000)"><mask id="mask-30" fill="white"><use xlink:href="#path-29"></use></mask><g id="Clip-44"></g><path d="M5.5994,4.3686 L1.0404,1.8896 C0.4164,1.5496 -0.0016,0.8536 -0.000601790338,0.0086 L4.5584,2.4876 C4.5574,3.3336 4.9754,4.0286 5.5994,4.3686" id="Fill-43" fill="#AFCFF3" mask="url(#mask-30)"></path></g><polygon id="Fill-45" fill="#93BEEF" points="6.803 6.142 2.244 3.663 24.561 0.526 29.12 3.005"></polygon><g transform="translate(0.000000, 6.000000)"><mask id="mask-32" fill="white"><use xlink:href="#path-31"></use></mask><g id="Clip-48"></g><polygon id="Fill-47" fill="#B1D0F3" mask="url(#mask-32)" points="4.5589 18.4877 -0.0001 16.0087 0.0289 0.3587 4.5879 2.8397"></polygon></g><g transform="translate(0.000000, 3.000000)"><g><mask id="mask-34" fill="white"><use xlink:href="#path-33"></use></mask><g id="Clip-50"></g><path d="M4.5877,5.8393 L0.0287,3.3593 C0.0297,3.0413 0.0897,2.7283 0.1977,2.4343 L4.7557,4.9133 C4.6487,5.2073 4.5877,5.5213 4.5877,5.8393" id="Fill-49" fill="#AFCFF3" mask="url(#mask-34)"></path></g><g><mask id="mask-36" fill="white"><use xlink:href="#path-35"></use></mask><g id="Clip-52"></g><path d="M4.7561,4.9135 L0.1971,2.4345 C0.2451,2.3045 0.3011,2.1795 0.3661,2.0585 L4.9251,4.5385 C4.8601,4.6585 4.8031,4.7845 4.7561,4.9135" id="Fill-51" fill="#ACCDF3" mask="url(#mask-36)"></path></g><g><mask id="mask-38" fill="white"><use xlink:href="#path-37"></use></mask><g id="Clip-54"></g><path d="M4.9251,4.5385 L0.3661,2.0585 C0.4221,1.9565 0.4831,1.8565 0.5491,1.7625 L5.1081,4.2425 C5.0411,4.3375 4.9801,4.4355 4.9251,4.5385" id="Fill-53" fill="#A9CBF2" mask="url(#mask-38)"></path></g><g><mask id="mask-40" fill="white"><use xlink:href="#path-39"></use></mask><g id="Clip-56"></g><path d="M5.1077,4.2426 L0.5487,1.7626 C0.6117,1.6736 0.6797,1.5876 0.7517,1.5056 L5.3097,3.9856 C5.2377,4.0666 5.1707,4.1526 5.1077,4.2426" id="Fill-55" fill="#A6CAF2" mask="url(#mask-40)"></path></g><g><mask id="mask-42" fill="white"><use xlink:href="#path-41"></use></mask><g id="Clip-58"></g><path d="M5.3098,3.9858 L0.7508,1.5058 C0.8238,1.4238 0.8998,1.3468 0.9808,1.2748 L5.5388,3.7548 C5.4588,3.8268 5.3818,3.9038 5.3098,3.9858" id="Fill-57" fill="#A3C8F1" mask="url(#mask-42)"></path></g><g><mask id="mask-44" fill="white"><use xlink:href="#path-43"></use></mask><g id="Clip-60"></g><path d="M5.5393,3.7543 L0.9803,1.2753 C1.0663,1.1963 1.1563,1.1253 1.2503,1.0603 L5.8093,3.5403 C5.7153,3.6053 5.6253,3.6773 5.5393,3.7543" id="Fill-59" fill="#A0C6F1" mask="url(#mask-44)"></path></g><g><mask id="mask-46" fill="white"><use xlink:href="#path-45"></use></mask><g id="Clip-62"></g><path d="M5.8094,3.5405 L1.2504,1.0605 C1.3654,0.9805 1.4854,0.9115 1.6104,0.8525 L6.1684,3.3335 C6.0444,3.3925 5.9244,3.4615 5.8094,3.5405" id="Fill-61" fill="#9DC4F0" mask="url(#mask-46)"></path></g><g><mask id="mask-48" fill="white"><use xlink:href="#path-47"></use></mask><g id="Clip-64"></g><path d="M6.1687,3.3334 L1.6097,0.8534 C1.8117,0.7584 2.0247,0.6924 2.2447,0.6624 L6.8027,3.1424 C6.5837,3.1734 6.3697,3.2384 6.1687,3.3334" id="Fill-63" fill="#9AC2F0" mask="url(#mask-48)"></path></g></g><g transform="translate(4.000000, 2.000000)"><mask id="mask-50" fill="white"><use xlink:href="#path-49"></use></mask><g id="Clip-66"></g><path d="M11.618,26.9321 L16.216,26.2861 L15.358,22.8021 L12.53,23.2001 L11.618,26.9321 L11.618,26.9321 Z M24.239,18.5981 L24.265,4.0811 L3.606,6.9851 L3.579,21.5011 L24.239,18.5981 L24.239,18.5981 Z M25.12,1.0051 C26.33,0.8351 27.329,1.7761 27.286,3.0861 L27.258,18.7361 C27.255,20.0411 26.252,21.2721 25.042,21.4421 L17.809,22.4581 L18.804,25.9221 L20.606,25.6691 C21.271,25.5761 21.726,26.0041 21.725,26.7311 C21.723,27.4491 21.266,28.0141 20.601,28.1081 L7.223,29.9881 C6.55899326,30.0801 6.103,29.6441 6.105,28.9261 C6.106,28.2001 6.563,27.6431 7.228,27.5491 L8.983,27.3031 L9.998,23.5561 L2.765,24.5731 C1.555,24.7431 0.556,23.7931 0.558993261,22.4881 L0.588,6.8391 C0.59,5.5341 1.594,4.3121 2.803,4.1421 L25.12,1.0051 Z" id="Fill-65" fill="#79AFEB" mask="url(#mask-50)"></path></g></g></g></g></g></svg>