You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2023/04/03 13:37:17 UTC
[incubator-streampark] branch dev updated: [fix] remove logintype in create user page and set default value of logintype to PASSWORD (#2559)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new d936c81d6 [fix] remove logintype in create user page and set default value of logintype to PASSWORD (#2559)
d936c81d6 is described below
commit d936c81d6db77f7b5c60771ae475734735a9ba0e
Author: totoro <zh...@foxmail.com>
AuthorDate: Mon Apr 3 21:37:10 2023 +0800
[fix] remove logintype in create user page and set default value of logintype to PASSWORD (#2559)
* [fix] remove logintype in create user page
* [fix] set logintype explicitly in UserController
---------
Co-authored-by: zhoulii <zh...@hikvision.com.cn>
---
.../src/main/assembly/script/schema/mysql-schema.sql | 2 +-
.../src/main/assembly/script/schema/pgsql-schema.sql | 2 +-
.../streampark/console/system/controller/UserController.java | 2 ++
.../src/main/resources/db/schema-h2.sql | 2 +-
.../src/locales/lang/en/system/user.ts | 2 --
.../src/locales/lang/zh-CN/system/user.ts | 2 --
.../src/views/system/user/user.data.ts | 12 ------------
7 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
index b2996cacd..fac581662 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
@@ -377,7 +377,7 @@ create table `t_user` (
`password` varchar(128) collate utf8mb4_general_ci not null comment 'password',
`email` varchar(128) collate utf8mb4_general_ci default null comment 'email',
`user_type` int not null comment 'user type 1:admin 2:user',
- `login_type` tinyint not null comment 'login type 0:password 1:ldap',
+ `login_type` tinyint default 0 comment 'login type 0:password 1:ldap',
`last_team_id` bigint default null comment 'last team id',
`status` char(1) collate utf8mb4_general_ci not null comment 'status 0:locked 1:active',
`create_time` datetime not null default current_timestamp comment 'create time',
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
index 90b561b4f..0ddab7ca6 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
@@ -690,7 +690,7 @@ create table "public"."t_user" (
"password" varchar(128) collate "pg_catalog"."default" not null,
"email" varchar(128) collate "pg_catalog"."default",
"user_type" int4,
- "login_type" int2,
+ "login_type" int2 default 0,
"last_team_id" int8,
"status" int2,
"create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
index 570895780..f96d81257 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/controller/UserController.java
@@ -22,6 +22,7 @@ import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.domain.RestResponse;
import org.apache.streampark.console.base.exception.ApiAlertException;
import org.apache.streampark.console.base.util.ShaHashUtils;
+import org.apache.streampark.console.core.enums.LoginType;
import org.apache.streampark.console.core.enums.UserType;
import org.apache.streampark.console.core.service.CommonService;
import org.apache.streampark.console.system.entity.Team;
@@ -80,6 +81,7 @@ public class UserController {
@PostMapping("post")
@RequiresPermissions("user:add")
public RestResponse addUser(@Valid User user) throws Exception {
+ user.setLoginType(LoginType.PASSWORD);
this.userService.createUser(user);
return RestResponse.success();
}
diff --git a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
index f4c11fe47..f2e9afc46 100644
--- a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
+++ b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
@@ -323,7 +323,7 @@ create table if not exists `t_user` (
`password` varchar(128) not null comment 'password',
`email` varchar(128) default null comment 'email',
`user_type` int not null comment 'user type 1:admin 2:user',
- `login_type` tinyint not null comment 'login type 0:password 1:ldap',
+ `login_type` tinyint default 0 comment 'login type 0:password 1:ldap',
`last_team_id` bigint default null comment 'last team id',
`status` char(1) not null comment 'status 0:locked 1:active',
`create_time` datetime not null default current_timestamp comment 'create time',
diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts
index 4998129e9..0140553e5 100644
--- a/streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts
+++ b/streampark-console/streampark-console-webapp/src/locales/lang/en/system/user.ts
@@ -54,6 +54,4 @@ export default {
secret: 'secret',
locked: 'locked',
effective: 'effective',
- password: 'PASSWORD',
- ldap: 'LDAP',
};
diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts
index c87b62ef3..96d3342c5 100644
--- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts
+++ b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/system/user.ts
@@ -54,6 +54,4 @@ export default {
secret: '未知',
locked: '锁定',
effective: '有效',
- password: '密码',
- ldap: 'LDAP',
};
diff --git a/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts b/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts
index 856fa1847..eb588b195 100644
--- a/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts
+++ b/streampark-console/streampark-console-webapp/src/views/system/user/user.data.ts
@@ -150,18 +150,6 @@ export const formSchema = (formType: string): FormSchema[] => {
},
rules: [{ required: true }],
},
- {
- label: t('system.user.form.loginType'),
- field: 'loginType',
- component: 'Select',
- componentProps: {
- options: [
- { label: t('system.user.password'), value: LoginTypeEnum[LoginTypeEnum.PASSWORD] },
- { label: t('system.user.ldap'), value: LoginTypeEnum[LoginTypeEnum.LDAP] },
- ],
- },
- rules: [{ required: true }],
- },
{
field: 'status',
label: t('system.user.form.status'),