Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev-kill-yarn-job

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java

@@ -104,11 +104,7 @@ public class EnterpriseWeChatUtils {
             }
 
             Map<String, String> map = JSONUtils.toMap(resp);
-            if (map != null) {
+            return map == null ? null : map.get("access_token");
-                return map.get("access_token");
-            } else {
-                return null;
-            }
         } finally {
             httpClient.close();
         }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java

@@ -539,19 +539,17 @@ public class DataSourceService extends BaseService {
                 (type == DbType.HIVE || type == DbType.SPARK)) {
             parameterMap.put(Constants.PRINCIPAL, principal);
         }
-        if (other != null && !"".equals(other)) {
-            Map<String, String> map = JSONUtils.toMap(other);
-            if (map.size() > 0) {
-                StringBuilder otherSb = new StringBuilder();
-                for (Map.Entry<String, String> entry : map.entrySet()) {
-                    otherSb.append(String.format("%s=%s%s", entry.getKey(), entry.getValue(), separator));
-                }
-                if (!Constants.DB2.equals(type.name())) {
-                    otherSb.deleteCharAt(otherSb.length() - 1);
-                }
-                parameterMap.put(Constants.OTHER, otherSb);
-            }
 
+        Map<String, String> map = JSONUtils.toMap(other);
+        if (map != null) {
+            StringBuilder otherSb = new StringBuilder();
+            for (Map.Entry<String, String> entry: map.entrySet()) {
+                otherSb.append(String.format("%s=%s%s", entry.getKey(), entry.getValue(), separator));
+            }
+            if (!Constants.DB2.equals(type.name())) {
+                otherSb.deleteCharAt(otherSb.length() - 1);
+            }
+            parameterMap.put(Constants.OTHER, otherSb);
         }
 
         if (logger.isDebugEnabled()) {

dolphinscheduler-ui/src/js/module/components/crontab/source/_times/day.vue

@@ -352,8 +352,8 @@
       },
       monthLastWeeksVal (val) {
         if (this.radioDay === 'monthLastWeeks') {
-          this.weekValue = `?`
+          this.weekValue = val
-          this.dayValue = val
+          this.dayValue = `?`
         }
       },
       WkmonthNumWeeksWeekVal (val) {