From 654fa397891e16cfe541fb62a82017735842ff33 Mon Sep 17 00:00:00 2001 From: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com> Date: Mon, 5 Jul 2021 23:21:57 +0800 Subject: [PATCH] [Feature][JsonSplit-api]merge code from dev to json_split_two (#5750) * [BUG-#5678][Registry]fix registry init node miss (#5686) * [Improvement][UI] Update the update time after the user information is successfully modified (#5684) * improve edit the userinfo success, but the updatetime is not the latest. * Improved shell task execution result log information, adding process.waitFor() and process.exitValue() information to the original log (#5691) Co-authored-by: shenglm * [Feature-#5565][Master Worker-Server] Global Param passed by sense dependencies (#5603) * add globalParams new plan with varPool * add unit test * add python task varPoolParams Co-authored-by: wangxj * Issue robot translation judgment changed to Chinese (#5694) Co-authored-by: chenxingchun <438044805@qq.com> * the update function should use post instead of get (#5703) * enhance form verify (#5696) * checkState only supports %s not {} (#5711) * [Fix-5701]When deleting a user, the accessToken associated with the user should also be deleted (#5697) * update * fix the codestyle error * fix the compile error * support rollback * [Fix-5699][UI] Fix update user error in user information (#5700) * [Improvement] the automatically generated spi service name in alert-plugin is wrong (#5676) * bug fix the auto generated spi service can't be recongized * include a new method * [Improvement-5622][project management] Modify the title (#5723) Co-authored-by: Kirs Co-authored-by: kyoty Co-authored-by: ji04xiaogang Co-authored-by: shenglm Co-authored-by: wangxj3 <857234426@qq.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> Co-authored-by: chenxingchun <438044805@qq.com> Co-authored-by: Shiwen Cheng Co-authored-by: Jianchao Wang Co-authored-by: JinyLeeChina <297062848@qq.com> --- .../spi/plugin/DolphinPluginDiscovery.java | 6 +++++- .../pages/security/pages/users/_source/createUser.vue | 9 ++++++--- .../js/conf/home/pages/security/pages/users/index.vue | 6 ++++-- .../conf/home/pages/user/pages/account/_source/info.vue | 9 ++------- dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 2 +- dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 2 +- 6 files changed, 19 insertions(+), 15 deletions(-) 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 @@