From 7ef3bb24df350295173cea025cffc213e81da434 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 19 May 2020 15:47:10 +0800
Subject: [PATCH 1/2] Fix rename check parameter

---
 .../pages/resource/pages/file/pages/list/_source/rename.vue     | 2 +-
 .../pages/resource/pages/udf/pages/resource/_source/rename.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
index f7639bb959..2f18985df0 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
@@ -71,7 +71,7 @@
             })
           }else{
             return this.store.dispatch('resource/resourceVerifyName', {
-              fullName: localStore.getItem('currentDir')+'/'+this.name,
+              fullName: '/'+this.name,
               type: 'FILE'
             })
           }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
index 359a16a29f..c3a6a3897c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
@@ -72,7 +72,7 @@
             })
           }else{
             return this.store.dispatch('resource/resourceVerifyName', {
-              fullName: localStore.getItem('currentDir')+'/'+this.name,
+              fullName: '/'+this.name,
               type: 'UDF'
             })
           }

From 0e6494567f37d1dad6938adcd85f1c714b83a15c Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 19 May 2020 16:30:03 +0800
Subject: [PATCH 2/2] fix

---
 .../src/main/resources/config/install_config.conf                | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dolphinscheduler-server/src/main/resources/config/install_config.conf b/dolphinscheduler-server/src/main/resources/config/install_config.conf
index c8aa147124..3bb4d83902 100644
--- a/dolphinscheduler-server/src/main/resources/config/install_config.conf
+++ b/dolphinscheduler-server/src/main/resources/config/install_config.conf
@@ -67,7 +67,6 @@ mailPassword="xxxxxxxxxx"
 starttlsEnable="true"
 
 # SSL mail protocol support
-# note: The SSL protocol is enabled by default.
 # only one of TLS and SSL can be in the true state.
 sslEnable="false"