This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 27b296c [Fix-3256][ui] Fix admin user info update error (#3306)
27b296c is described below
commit 27b296c45b64677e24c5a1dbd4d77a89055d579a
Author: wuchunfu <319355...@qq.com>
AuthorDate: Mon Aug 3 13:50:30 2020 +0800
[Fix-3256][ui] Fix admin user info update error (#3306)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
Co-authored-by: dailidong <dailidon...@gmail.com>
---
e2e/testng.xml | 2 +-
sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql | 2 +-
sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql | 2 +-
sql/dolphinscheduler-postgre.sql | 2 +-
sql/dolphinscheduler_mysql.sql | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/e2e/testng.xml b/e2e/testng.xml
index 499fe11..7e5dc52 100644
--- a/e2e/testng.xml
+++ b/e2e/testng.xml
@@ -78,7 +78,7 @@
<class
name="org.apache.dolphinscheduler.testcase.testDeleteData.TestDeleteProject"></class>
<class
name="org.apache.dolphinscheduler.testcase.testDeleteData.TestDeleteAlert"></class>
<class
name="org.apache.dolphinscheduler.testcase.testDeleteData.TestDeleteToken"></class>
- <class
name="org.apache.dolphinscheduler.testcase.testDeleteData.TestDeleteUser"></class>
+<!-- <class
name="org.apache.dolphinscheduler.testcase.testDeleteData.TestDeleteUser"></class>-->
<class
name="org.apache.dolphinscheduler.testcase.testDeleteData.TestDeleteTenant"></class>
</classes>
</test>
diff --git a/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql
b/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql
index e8c797b..fd65d30 100644
--- a/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql
+++ b/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_dml.sql
@@ -16,7 +16,7 @@
*/
-- Records of t_escheduler_user,user : admin , password : dolphinscheduler123
-INSERT INTO `t_escheduler_user` VALUES ('1', 'admin',
'7ad2410b2f4c074479a8937a28a22b8f', '0', 'x...@qq.com', 'xx', '0', '2018-03-27
15:48:50', '2018-10-24 17:40:22');
+INSERT INTO `t_escheduler_user` VALUES ('1', 'admin',
'7ad2410b2f4c074479a8937a28a22b8f', '0', 'x...@qq.com', '', '0', '2018-03-27
15:48:50', '2018-10-24 17:40:22');
INSERT INTO `t_escheduler_alertgroup` VALUES (1, 'default admin warning
group', '0', 'default admin warning group','2018-11-29 10:20:39', '2018-11-29
10:20:39');
INSERT INTO `t_escheduler_relation_user_alertgroup` VALUES ('1', '1', '1',
'2018-11-29 10:22:33', '2018-11-29 10:22:33');
diff --git
a/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql
b/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql
index 4b83d78..d075cab 100644
--- a/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql
+++ b/sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql
@@ -16,7 +16,7 @@
*/
-- Records of t_ds_user，user : admin , password : dolphinscheduler123
-INSERT INTO
t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,create_time,update_time)
VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'x...@qq.com', 'xx',
'0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
+INSERT INTO
t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,create_time,update_time)
VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'x...@qq.com', '',
'0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
-- Records of t_ds_alertgroup，dolphinscheduler warning group
INSERT INTO
t_ds_alertgroup(group_name,group_type,description,create_time,update_time)
VALUES ('dolphinscheduler warning group', '0', 'dolphinscheduler warning
group','2018-11-29 10:20:39', '2018-11-29 10:20:39');
diff --git a/sql/dolphinscheduler-postgre.sql b/sql/dolphinscheduler-postgre.sql
index 1b27c7b..4a947d1 100644
--- a/sql/dolphinscheduler-postgre.sql
+++ b/sql/dolphinscheduler-postgre.sql
@@ -752,7 +752,7 @@ ALTER TABLE t_ds_worker_server ALTER COLUMN id SET DEFAULT
NEXTVAL('t_ds_worker_
-- Records of t_ds_user?user : admin , password : dolphinscheduler123
-INSERT INTO
t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,state,create_time,update_time)
VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'x...@qq.com', 'xx',
'0', 1, '2018-03-27 15:48:50', '2018-10-24 17:40:22');
+INSERT INTO
t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,state,create_time,update_time)
VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'x...@qq.com', '',
'0', 1, '2018-03-27 15:48:50', '2018-10-24 17:40:22');
-- Records of t_ds_alertgroup，dolphinscheduler warning group
INSERT INTO
t_ds_alertgroup(group_name,group_type,description,create_time,update_time)
VALUES ('dolphinscheduler warning group', '0', 'dolphinscheduler warning
group','2018-11-29 10:20:39', '2018-11-29 10:20:39');
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index cac32b6..f4ad9a3 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -815,4 +815,4 @@ INSERT INTO `t_ds_relation_user_alertgroup` VALUES ('1',
'1', '1', '2018-11-29 1
-- ----------------------------
-- Records of t_ds_user
-- ----------------------------
-INSERT INTO `t_ds_user` VALUES ('1', 'admin',
'7ad2410b2f4c074479a8937a28a22b8f', '0', 'x...@qq.com', 'xx', '0', '2018-03-27
15:48:50', '2018-10-24 17:40:22', null, 1);
+INSERT INTO `t_ds_user` VALUES ('1', 'admin',
'7ad2410b2f4c074479a8937a28a22b8f', '0', 'x...@qq.com', '', '0', '2018-03-27
15:48:50', '2018-10-24 17:40:22', null, 1);
