From 88645dea1dc533aa6fb8152015c65a69cb7994d2 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Mon, 27 Jul 2020 15:21:34 +0800
Subject: [PATCH 1/2] [bugFix][ui]Fix the log page refresh button does not
 rotate (#3316)

---
 .../home/pages/dag/_source/formModel/log.vue  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
index 7874b53885..39a6989f42 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
@@ -303,25 +303,26 @@
             color: #0097e0;
             font-size: 12px;
             margin-left: 10px;
-            i {
+            em {
               vertical-align: middle;
             }
           }
           .clock {
-            >i {
+            >em {
               font-size: 20px;
               vertical-align: middle;
               transform: scale(1);
             }
           }
           .refresh-log {
-            >i {
+            >em {
+              text-decoration: none;
               font-size: 20px;
               vertical-align: middle;
               transform: scale(1);
             }
             &.active {
-              >i {
+              >em {
                 -webkit-transition-property: -webkit-transform;
                 -webkit-transition-duration: 1s;
                 -moz-transition-property: -moz-transform;
@@ -368,5 +369,16 @@
       }
     }
   }
-
+  @-webkit-keyframes rotateloading{from{-webkit-transform: rotate(0deg)}
+    to{-webkit-transform: rotate(360deg)}
+  }
+  @-moz-keyframes rotateloading{from{-moz-transform: rotate(0deg)}
+    to{-moz-transform: rotate(359deg)}
+  }
+  @-o-keyframes rotateloading{from{-o-transform: rotate(0deg)}
+    to{-o-transform: rotate(359deg)}
+  }
+  @keyframes rotateloading{from{transform: rotate(0deg)}
+    to{transform: rotate(359deg)}
+  }
 </style>

From 6b964be60a2f35b9a77963c76302500c91f98549 Mon Sep 17 00:00:00 2001
From: lgcareer <18610854716@163.com>
Date: Tue, 28 Jul 2020 10:55:35 +0800
Subject: [PATCH 2/2] [Feature][server]support one worker can belongs different
 worker groups when execute install script (#3307)

---
 .../src/main/resources/worker.properties                 | 4 ++--
 script/scp-hosts.sh                                      | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-server/src/main/resources/worker.properties b/dolphinscheduler-server/src/main/resources/worker.properties
index 0365c8a9c9..72e7163bf2 100644
--- a/dolphinscheduler-server/src/main/resources/worker.properties
+++ b/dolphinscheduler-server/src/main/resources/worker.properties
@@ -30,5 +30,5 @@
 # worker listener port
 #worker.listen.port: 1234
 
-# default worker group
-#worker.groups=default
+# default worker group,if this worker belongs different groups,you can config the following like that `worker.groups=default,test`
+worker.groups=default
diff --git a/script/scp-hosts.sh b/script/scp-hosts.sh
index 4a94cffa29..27ee932a40 100644
--- a/script/scp-hosts.sh
+++ b/script/scp-hosts.sh
@@ -34,7 +34,12 @@ do
   echo $workerGroup;
   worker=`echo $workerGroup|awk -F':' '{print $1}'`
   groupName=`echo $workerGroup|awk -F':' '{print $2}'`
-  workersGroupMap+=([$worker]=$groupName)
+  if [ -z ${workersGroupMap[$worker]} ];then
+      workersGroupMap+=([$worker]=$groupName)
+  else
+      finalGroupName="${workersGroupMap[$worker]},$groupName"
+      workersGroupMap[$worker]=$finalGroupName
+  fi
 done
 
 
@@ -53,7 +58,7 @@ do
   do
     # if worker in workersGroupMap
     if [[ "${workersGroupMap[${host}]}" ]] && [[ "${dsDir}" == "conf" ]]; then
-      sed -i ${txt} "s#worker.group.*#worker.group=${workersGroupMap[${host}]}#g" ${dsDir}/worker.properties
+      sed -i ${txt} "s#worker.groups.*#worker.groups=${workersGroupMap[${host}]}#g" ${dsDir}/worker.properties
     fi
 
     echo "start to scp $dsDir to $host/$installPath"