补充v2.6.0升级说明及修复新增account提示mysql错误问题

Author: zengqiao

distribution/conf/create_mysql_table.sql

@@ -13,12 +13,12 @@ CREATE TABLE `account` (
   `username` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT '用户名',
   `password` varchar(128) NOT NULL DEFAULT '' COMMENT '密码',
   `role` tinyint(8) NOT NULL DEFAULT '0' COMMENT '角色类型, 0:普通用户 1:研发 2:运维',
+  `department` varchar(256) DEFAULT '' COMMENT '部门名',
+  `display_name` varchar(256) DEFAULT '' COMMENT '用户姓名',
+  `mail` varchar(256) DEFAULT '' COMMENT '邮箱',
   `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='账号表';

distribution/upgrade_config.md

@@ -39,4 +39,14 @@ ALTER TABLE `gateway_config`
 ADD COLUMN `description` TEXT NULL COMMENT '描述信息' AFTER `version`;
 ```
 
+### 升级至`2.6.0`版本
 
+#### 1.mysql变更
+`2.6.0`版本在`account`表增加用户姓名，部门名，邮箱三个字段，因此需要执行下面的sql进行字段的增加。
+
+```sql
+ALTER TABLE `account`
+ADD COLUMN `display_name` VARCHAR(256) NOT NULL DEFAULT '' COMMENT '用户名' AFTER `role`,
+ADD COLUMN `department` VARCHAR(256) NOT NULL DEFAULT '' COMMENT '部门名' AFTER `display_name`,
+ADD COLUMN `mail` VARCHAR(256) NOT NULL DEFAULT '' COMMENT '邮箱' AFTER `department`;
+```

docs/dev_guide/upgrade_manual/logi-km-v2.2.0.md

@@ -8,11 +8,11 @@
         <result property="username"     column="username" />
         <result property="password"     column="password" />
         <result property="role"         column="role" />
+        <result property="displayName"  column="display_name" />
+        <result property="department"   column="department" />
+        <result property="mail"         column="mail" />
         <result property="gmtCreate"    column="gmt_create" />
         <result property="gmtModify"    column="gmt_modify" />
-        <result property="displayName"    column="display_name" />
-        <result property="department"    column="department" />
-        <result property="mail"    column="mail" />
     </resultMap>
 
     <insert id="insert" parameterType="com.xiaojukeji.kafka.manager.common.entity.pojo.AccountDO">

docs/dev_guide/upgrade_manual/logi-km-v2.3.0.md

@@ -58,6 +58,7 @@ public Result<String> loginAndGetLdap(HttpServletRequest request, HttpServletRes
             if(ValidateUtils.isNull(ldapAttrsInfo)){
                 return Result.buildFrom(ResultStatus.LDAP_AUTHENTICATION_FAILED);
             }
+
             //LDAP验证通过，拿LDAP的sAMAccountName替换dto对象的值，便于第一次自动注册采用LDAP值，并且第二次也避免REPLACE
             dto.setUsername(ldapAttrsInfo.get("sAMAccountName").toString());
             accountResult = accountService.getAccountDO(dto.getUsername());
@@ -68,9 +69,9 @@ public Result<String> loginAndGetLdap(HttpServletRequest request, HttpServletRes
                 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());
+                accountDO.setDisplayName(ldapAttrsInfo.getOrDefault("displayName", "").toString());
+                accountDO.setDepartment(ldapAttrsInfo.getOrDefault("department", "").toString());
+                accountDO.setMail(ldapAttrsInfo.getOrDefault("mail", "").toString());
                 accountService.createAccount(accountDO);
             }
 

kafka-manager-dao/src/main/resources/mapper/AccountDao.xml

@@ -13,14 +13,19 @@
  * @date 19/5/3
  */
 public class AccountConverter {
+    private AccountConverter() {
+    }
+
     public static AccountDO convert2AccountDO(AccountDTO dto) {
         AccountDO accountDO = new AccountDO();
         accountDO.setUsername(dto.getUsername());
         accountDO.setPassword(dto.getPassword());
         accountDO.setRole(dto.getRole());
-        accountDO.setDepartment(dto.getDepartment());
-        accountDO.setMail(dto.getMail());
-        accountDO.setDisplayName(dto.getDisplayName());
+
+        // 兼容前端未传这些信息的情况
+        accountDO.setDepartment(dto.getDepartment() == null? "": dto.getDepartment());
+        accountDO.setMail(dto.getMail() == null? "": dto.getMail());
+        accountDO.setDisplayName(dto.getDisplayName() == null? "": dto.getDisplayName());
         return accountDO;
     }