From b5fb24b36032c4e3c57b076102895d97a819a8a5 Mon Sep 17 00:00:00 2001 From: huyueeer Date: Fri, 6 Aug 2021 11:40:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=AE=A4=E8=AF=81=E6=88=96LD?= =?UTF-8?q?AP=E8=AE=A4=E8=AF=81=E6=94=AF=E6=8C=81=E6=90=BA=E5=B8=A6?= =?UTF-8?q?=E2=80=98=E5=A7=93=E5=90=8D=E2=80=99=E3=80=81=E2=80=98=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E2=80=99=E3=80=81=E2=80=98=E9=82=AE=E7=AE=B1=E2=80=99?= =?UTF-8?q?=E7=AD=89=E7=94=A8=E6=88=B7=E5=85=83=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/install_guide/create_mysql_table.sql | 3 ++ .../common/entity/dto/rd/AccountDTO.java | 36 ++++++++++++++++ .../manager/common/entity/pojo/AccountDO.java | 41 +++++++++++++++++-- .../src/main/resources/mapper/AccountDao.xml | 7 +++- .../component/sso/BaseSessionSignOn.java | 3 ++ .../web/converters/AccountConverter.java | 3 ++ 6 files changed, 87 insertions(+), 6 deletions(-) diff --git a/docs/install_guide/create_mysql_table.sql b/docs/install_guide/create_mysql_table.sql index 12910ae1..05a99278 100644 --- a/docs/install_guide/create_mysql_table.sql +++ b/docs/install_guide/create_mysql_table.sql @@ -16,6 +16,9 @@ CREATE TABLE `account` ( `status` int(16) NOT NULL DEFAULT '0' COMMENT '0标识使用中，-1标识已废弃', `gmt_create` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `gmt_modify` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `department` varchar(128) DEFAULT '' COMMENT '部门名', + `display_name` varchar(128) DEFAULT '' COMMENT '用户姓名', + `mail` varchar(128) DEFAULT '' COMMENT '邮箱', PRIMARY KEY (`id`), UNIQUE KEY `uniq_username` (`username`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='账号表'; diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/AccountDTO.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/AccountDTO.java index db2b0aff..ab1147a3 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/AccountDTO.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/dto/rd/AccountDTO.java @@ -21,6 +21,15 @@ public class AccountDTO { @ApiModelProperty(value = "角色") private Integer role; + @ApiModelProperty(value = "用户姓名") + private String displayName; + + @ApiModelProperty(value = "部门") + private String department; + + @ApiModelProperty(value = "邮箱") + private String mail; + public String getUsername() { return username; } @@ -45,12 +54,39 @@ public class AccountDTO { this.role = role; } + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getMail() { + return mail; + } + + public void setMail(String mail) { + this.mail = mail; + } + @Override public String toString() { return "AccountDTO{" + "username='" + username + '\'' + ", password='" + password + '\'' + ", role=" + role + + ", displayName='" + displayName + '\'' + + ", department='" + department + '\'' + + ", mail='" + mail + '\'' + '}'; } diff --git a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/AccountDO.java b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/AccountDO.java index 13623941..1fa25528 100644 --- a/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/AccountDO.java +++ b/kafka-manager-common/src/main/java/com/xiaojukeji/kafka/manager/common/entity/pojo/AccountDO.java @@ -21,6 +21,12 @@ public class AccountDO { private Integer role; + private String displayName; + + private String department; + + private String mail; + public String getUsername() { return username; } @@ -45,16 +51,43 @@ public class AccountDO { this.role = role; } + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getMail() { + return mail; + } + + public void setMail(String mail) { + this.mail = mail; + } + @Override public String toString() { return "AccountDO{" + - "username='" + username + '\'' + - ", password='" + password + '\'' + - ", role=" + role + - ", id=" + id + + "id=" + id + ", status=" + status + ", gmtCreate=" + gmtCreate + ", gmtModify=" + gmtModify + + ", username='" + username + '\'' + + ", password='" + password + '\'' + + ", role=" + role + + ", displayName='" + displayName + '\'' + + ", department='" + department + '\'' + + ", mail='" + mail + '\'' + '}'; } } \ No newline at end of file diff --git a/kafka-manager-dao/src/main/resources/mapper/AccountDao.xml b/kafka-manager-dao/src/main/resources/mapper/AccountDao.xml index ac920416..3401ae75 100644 --- a/kafka-manager-dao/src/main/resources/mapper/AccountDao.xml +++ b/kafka-manager-dao/src/main/resources/mapper/AccountDao.xml @@ -10,14 +10,17 @@ + + + diff --git a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java index c64a1717..3ccbd17c 100644 --- a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java +++ b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java @@ -68,6 +68,9 @@ public class BaseSessionSignOn extends AbstractSingleSignOn { accountDO.setUsername(dto.getUsername()); accountDO.setRole(AccountRoleEnum.getUserRoleEnum(authUserRegistrationRole).getRole()); accountDO.setPassword(dto.getPassword()); + accountDO.setDisplayName(ldapAttrsInfo.get("displayName").toString()); + accountDO.setDepartment(ldapAttrsInfo.get("department").toString()); + accountDO.setMail(ldapAttrsInfo.get("mail").toString()); accountService.createAccount(accountDO); } diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/AccountConverter.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/AccountConverter.java index a7eebff4..b774a718 100644 --- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/AccountConverter.java +++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/AccountConverter.java @@ -18,6 +18,9 @@ public class AccountConverter { accountDO.setUsername(dto.getUsername()); accountDO.setPassword(dto.getPassword()); accountDO.setRole(dto.getRole()); + accountDO.setDepartment(dto.getDepartment()); + accountDO.setMail(dto.getMail()); + accountDO.setDisplayName(dto.getDisplayName()); return accountDO; }