diff --git a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/DolphinPluginDiscovery.java b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/DolphinPluginDiscovery.java index 00927ebbc9..92e687862c 100644 --- a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/DolphinPluginDiscovery.java +++ b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/DolphinPluginDiscovery.java @@ -97,7 +97,7 @@ final class DolphinPluginDiscovery { public FileVisitResult visitFile(Path file, BasicFileAttributes attributes) { if (file.getFileName().toString().endsWith(JAVA_CLASS_FILE_SUFFIX)) { String name = file.subpath(base.getNameCount(), file.getNameCount()).toString(); - list.add(javaName(name.substring(0, name.length() - JAVA_CLASS_FILE_SUFFIX.length()))); + list.add(convertClassName(name.substring(0, name.length() - JAVA_CLASS_FILE_SUFFIX.length()))); } return FileVisitResult.CONTINUE; } @@ -135,4 +135,8 @@ final class DolphinPluginDiscovery { private static String javaName(String binaryName) { return binaryName.replace('/', '.'); } + + private static String convertClassName(String pathName) { + return pathName.replace(File.separatorChar, '.'); + } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue index e53128b23e..53db31cb86 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue @@ -138,7 +138,8 @@ } }, props: { - item: Object + item: Object, + fromUserInfo: Boolean }, methods: { _ok () { @@ -292,8 +293,9 @@ this.userPassword = '' this.email = this.item.email this.phone = this.item.phone + this.state = this.item.state this.userState = this.item.state + '' || '1' - if (this.item.tenantId) { + if (this.fromUserInfo || this.item.tenantId) { this.tenantId = this.item.tenantId } this.$nextTick(() => { @@ -310,8 +312,9 @@ this.userPassword = '' this.email = this.item.email this.phone = this.item.phone + this.state = this.item.state this.userState = this.state + '' || '1' - if (this.item.tenantId) { + if (this.fromUserInfo || this.item.tenantId) { this.tenantId = this.item.tenantId } if (this.queueList.length > 0) { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue index 220346b9c0..f0789019e3 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue @@ -60,7 +60,7 @@