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.get("access_token");
-            } else {
-                return null;
-            }
+            return map == null ? null : map.get("access_token");
         } finally {
             httpClient.close();
         }

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

@@ -539,11 +539,11 @@ 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) {
+        if (map != null) {
             StringBuilder otherSb = new StringBuilder();
-                for (Map.Entry<String, String> entry : map.entrySet()) {
+            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())) {
@@ -552,8 +552,6 @@ public class DataSourceService extends BaseService {
             parameterMap.put(Constants.OTHER, otherSb);
         }
 
-        }
-
         if (logger.isDebugEnabled()) {
             logger.info("parameters map:{}", JSONUtils.toJsonString(parameterMap));
         }

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

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