From d0eff9de36b628a756789b269afe7a418ce6c51e Mon Sep 17 00:00:00 2001
From: wuchunfu <319355703@qq.com>
Date: Mon, 30 Sep 2019 16:31:20 +0800
Subject: [PATCH] fix #586 User password plain text display problem (#917)
* fix #586 User password plain text display problem
* update install.sh and common.properties file
---
.../src/main/resources/common/common.properties | 2 +-
.../pages/security/pages/users/_source/createUser.vue | 2 +-
install.sh | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/escheduler-common/src/main/resources/common/common.properties b/escheduler-common/src/main/resources/common/common.properties
index 27d525f8f5..5de705c8f8 100644
--- a/escheduler-common/src/main/resources/common/common.properties
+++ b/escheduler-common/src/main/resources/common/common.properties
@@ -35,7 +35,7 @@ login.user.keytab.path=/opt/hdfs.headless.keytab
escheduler.env.path=/opt/.escheduler_env.sh
#resource.view.suffixs
-resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml
+resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties
# is development state? default "false"
development.state=true
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
index b6bf0a73f8..138c06ffc1 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
@@ -36,7 +36,7 @@
*{{$t('Password')}}
diff --git a/install.sh b/install.sh
index dc09ce3c97..309563310f 100644
--- a/install.sh
+++ b/install.sh
@@ -13,14 +13,14 @@ elif [[ "$OSTYPE" == "linux-gnu" ]]; then
txt=""
elif [[ "$OSTYPE" == "cygwin" ]]; then
# POSIX compatibility layer and Linux environment emulation for Windows
- echo "Easy Scheduler not support Windows operating system"
+ echo "Dolphin Scheduler not support Windows operating system"
exit 1
elif [[ "$OSTYPE" == "msys" ]]; then
# Lightweight shell and GNU utilities compiled for Windows (part of MinGW)
- echo "Easy Scheduler not support Windows operating system"
+ echo "Dolphin Scheduler not support Windows operating system"
exit 1
elif [[ "$OSTYPE" == "win32" ]]; then
- echo "Easy Scheduler not support Windows operating system"
+ echo "Dolphin Scheduler not support Windows operating system"
exit 1
elif [[ "$OSTYPE" == "freebsd"* ]]; then
# ...
@@ -164,7 +164,7 @@ execPath="/tmp/escheduler/exec"
shellEnvPath="$installPath/conf/env/.escheduler_env.sh"
# suffix of the resource file
-resSuffixs="txt,log,sh,conf,cfg,py,java,sql,hql,xml"
+resSuffixs="txt,log,sh,conf,cfg,py,java,sql,hql,xml,properties"
# development status, if true, for the SHELL script, you can view the encapsulated SHELL script in the execPath directory.
# If it is false, execute the direct delete