将 User 中的 nickname 字段修改为 screenName, mobilePhone 字段修改为 mobile

manager/src/main/java/cn/reghao/devops/manager/account/controller/page/UserPageController.java

@@ -42,11 +42,11 @@ public class UserPageController {
 
     @ApiOperation(value = "用户列表页面")
     @GetMapping
-    public String userPage(@RequestParam(value = "nickname", required = false) String nickname, Model model) {
+    public String userPage(@RequestParam(value = "screenName", required = false) String screenName, Model model) {
         Page<UserVO> page;
         PageList<UserVO> pageList;
-        if (nickname != null) {
-            List<UserVO> list = userQuery.getByMatchNickname(nickname);
+        if (screenName != null) {
+            List<UserVO> list = userQuery.getByMatchScreenName(screenName);
             page = new PageImpl<>(list);
             pageList = PageList.pageList(page);
         } else {

manager/src/main/java/cn/reghao/devops/manager/account/db/query/UserQuery.java

@@ -15,7 +15,7 @@ import java.util.*;
  */
 public interface UserQuery extends BaseQuery<User> {
     Page<UserVO> getUserVOByPage(PageRequest pageRequest);
-    List<UserVO> getByMatchNickname(String nickname);
+    List<UserVO> getByMatchScreenName(String screenName);
     /**
      * 获取用户拥有的角色
      *

manager/src/main/java/cn/reghao/devops/manager/account/db/query/UserQueryImpl.java

@@ -43,10 +43,10 @@ public class UserQueryImpl implements UserQuery {
     }
 
     @Override
-    public List<UserVO> getByMatchNickname(String nickname) {
+    public List<UserVO> getByMatchScreenName(String screenName) {
         Specification<User> specification = (root, query, cb) -> {
-            String likeQuery = String.format("%%%s%%", nickname);
-            Predicate predicate = cb.like(root.get("nickname"), likeQuery);
+            String likeQuery = String.format("%%%s%%", screenName);
+            Predicate predicate = cb.like(root.get("screenName"), likeQuery);
             return cb.and(predicate);
         };
         return userRepository.findAll(specification).stream().map(UserVO::new).collect(Collectors.toList());

manager/src/main/java/cn/reghao/devops/manager/account/model/dto/UserAddDTO.java

@@ -26,9 +26,9 @@ public class UserAddDTO implements Serializable {
     private Set<Integer> roleIds;
 
     @NotBlank(message = "用户名不能为空白字符串")
-    private String nickname;
+    private String screenName;
     private int gender;
-    private String mobilePhone;
+    private String mobile;
     private String email;
 
     /*public User to() {
@@ -36,9 +36,9 @@ public class UserAddDTO implements Serializable {
         user.setUsername(username);
         user.setPassword(password);
         //user.setRoleIds(roleIds);
-        user.setNickname(nickname);
+        user.setNickname(screenName);
         user.setGender(gender);
-        user.setMobilePhone(mobilePhone);
+        user.setmobile(mobile);
         user.setEmail(email);
         return user;
     }*/

manager/src/main/java/cn/reghao/devops/manager/account/model/dto/UserCreateDto.java

@@ -16,7 +16,7 @@ public class UserCreateDto {
     @NotBlank(message = "必须指定登录名")
     private String username;
     @NotBlank(message = "必须指定用户名")
-    private String nickname;
+    private String screenName;
     @NotBlank(message = "必须指定登录密码")
     private String password;
     @NotNull(message = "必须选择用户角色")

manager/src/main/java/cn/reghao/devops/manager/account/model/dto/UserInfo.java

@@ -14,9 +14,9 @@ public class UserInfo implements Serializable {
     private static final long serialVersionUID = 1L;
     private Integer userId;
     @NotBlank(message = "用户名不能为空白字符串")
-    private String nickname;
+    private String screenName;
     // TODO 验证邮箱和手机号码是否有效
-    private String mobilePhone;
+    private String mobile;
     private String email;
     private Integer gender;
 }

manager/src/main/java/cn/reghao/devops/manager/account/model/dto/UserUpdateDTO.java

@@ -17,8 +17,8 @@ public class UserUpdateDTO implements Serializable {
     @NotNull(message = "用户 ID 不能为 NULL")
     private Integer userId;
     @NotBlank(message = "用户名不能为空白字符串")
-    private String nickname;
+    private String screenName;
     // TODO 验证邮箱和手机号码是否有效
-    private String mobilePhone;
+    private String mobile;
     private String email;
 }

manager/src/main/java/cn/reghao/devops/manager/account/model/po/User.java

@@ -35,6 +35,7 @@ public class User extends BaseEntity implements UserDetails {
     private String password;
     @Column(nullable = false)
     private String salt;
+
     @ElementCollection(fetch = FetchType.EAGER)
     @CollectionTable(name = "sys_user_role")
     private Set<String> role;
@@ -42,9 +43,9 @@ public class User extends BaseEntity implements UserDetails {
     private Boolean locked = false;
 
     @NotBlank(message = "用户名不能为空白字符串")
-    private String nickname;
+    private String screenName;
     private String avatarUrl;
-    private String mobilePhone;
+    private String mobile;
     private String email;
     private Integer gender;
 
@@ -52,7 +53,7 @@ public class User extends BaseEntity implements UserDetails {
         this.username = username;
         this.password = password;
         this.role = roles;
-        this.nickname = username;
+        this.screenName = username;
         this.avatarUrl = "/imgs/avatar.jpg";
         this.gender = 2;
     }

manager/src/main/java/cn/reghao/devops/manager/account/model/vo/UserVO.java

@@ -13,9 +13,9 @@ import lombok.Data;
 public class UserVO {
     private Integer userId;
     private String username;
-    private String nickname;
+    private String screenName;
     private String gender;
-    private String mobilePhone;
+    private String mobile;
     private String email;
     private String createTime;
     private String status;
@@ -23,9 +23,9 @@ public class UserVO {
     public UserVO(User user) {
         this.userId = user.getId();
         this.username = user.getUsername();
-        this.nickname = user.getNickname();
+        this.screenName = user.getScreenName();
         this.gender = UserGender.getDescByCode(user.getGender());
-        this.mobilePhone = user.getMobilePhone();
+        this.mobile = user.getMobile();
         this.email = user.getEmail();
         this.createTime = DateTimeConverter.format(user.getCreateTime());
         this.status = user.getEnabled() ? "启用" : "禁用";

manager/src/main/java/cn/reghao/devops/manager/account/service/impl/UserServiceImpl.java

@@ -91,8 +91,8 @@ public class UserServiceImpl implements UserService {
             return;
         }
 
-        userEntity.setNickname(userInfo.getNickname());
-        userEntity.setMobilePhone(userInfo.getMobilePhone());
+        userEntity.setScreenName(userInfo.getScreenName());
+        userEntity.setMobile(userInfo.getMobile());
         userEntity.setEmail(userInfo.getEmail());
         userRepository.save(userEntity);
     }

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/impl/BuildAppImpl.java

@@ -72,7 +72,7 @@ public class BuildAppImpl implements BuildApp {
             }
         }
         User user = (User) authToken.getDetails();
-        String buildBy = user.getNickname();
+        String buildBy = user.getScreenName();
         AppDto appDto = appConfig.getAppDto();
         localBuild(appDto, buildBy, deploy);
     }

manager/src/main/java/cn/reghao/devops/manager/util/UserContext.java

@@ -19,7 +19,7 @@ public class UserContext {
             return null;
         }
 
-        return user.getNickname();
+        return user.getScreenName();
     }
 
     public static User getUser() {

manager/src/main/resources/templates/main.html

@@ -27,7 +27,7 @@
                 </a>
             </li>
             <li class="layui-nav-item timo-nav-user">
-                <a class="timo-header-nickname" th:text="${user.nickname}">DevOps</a>
+                <a class="timo-header-screenName" th:text="${user.screenName}">DevOps</a>
                 <div class="layui-nav-child">
                     <div class="timo-nav-child-box">
                         <div>
@@ -53,7 +53,7 @@
             <div class="layui-side-user">
                 <img class="layui-side-user-avatar" th:src="@{${user.avatarUrl}}" alt="头像">
                 <div>
-                    <p class="layui-side-user-name" th:text="${user.nickname}">DevOps</p>
+                    <p class="layui-side-user-name" th:text="${user.screenName}">DevOps</p>
                     <p class="layui-side-user-designation">在线</p>
                 </div>
             </div>

manager/src/main/resources/templates/rbac/menu/detail.html

@@ -33,9 +33,9 @@
             </tr>
                 <!--<tr>
                     <th>创建用户</th>
-                    <td th:text="${menu.createBy?.nickname}"></td>
+                    <td th:text="${menu.createBy?.screenName}"></td>
                     <th>更新用户</th>
-                    <td th:text="${menu.updateBy?.nickname}"></td>
+                    <td th:text="${menu.updateBy?.screenName}"></td>
                 </tr>
                 <tr>
                     <th>创建时间</th>

manager/src/main/resources/templates/rbac/role/users.html

@@ -22,7 +22,7 @@
             </thead>
             <tbody>
             <tr th:each="item:${list}">
-                <td>[[${item.nickname}]]</td>
+                <td>[[${item.screenName}]]</td>
                 <td><a th:href="@{'/rbac/user/detail/'+${item.id}}">查看</a></td>
             </tr>
             <tr th:if="${list.isEmpty()}">

manager/src/main/resources/templates/rbac/user/add.html

@@ -13,7 +13,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label required">用户名</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="nickname" placeholder="请输入用户名">
+                <input class="layui-input" type="text" name="screenName" placeholder="请输入用户名">
             </div>
         </div>
         <div class="layui-form-item">

manager/src/main/resources/templates/rbac/user/detail.html

@@ -15,13 +15,13 @@
             </tr>
             <tr>
                 <th>用户名</th>
-                <td th:text="${user.nickname}"></td>
+                <td th:text="${user.screenName}"></td>
                 <th>用户性别</th>
                 <td th:text="${user.gender}"></td>
             </tr>
             <tr>
                 <th>电话号码</th>
-                <td th:text="${user.mobilePhone}"></td>
+                <td th:text="${user.mobile}"></td>
                 <th>邮箱</th>
                 <td th:text="${user.email}"></td>
             </tr>

manager/src/main/resources/templates/rbac/user/edit.html

@@ -14,13 +14,13 @@
         <div class="layui-form-item">
             <label class="layui-form-label required">用户名</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="nickname" placeholder="请输入用户名" th:value="${user.nickname}">
+                <input class="layui-input" type="text" name="screenName" placeholder="请输入用户名" th:value="${user.screenName}">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">手机号码</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="mobilePhone" placeholder="请输入手机号码" th:value="${user.mobilePhone}">
+                <input class="layui-input" type="text" name="mobile" placeholder="请输入手机号码" th:value="${user.mobile}">
             </div>
         </div>
         <div class="layui-form-item">

manager/src/main/resources/templates/rbac/user/index.html

@@ -14,7 +14,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">用户名</label>
                         <div class="layui-input-block">
-                            <input type="text" name="nickname" th:value="${param.nickname}" placeholder="请输入用户名"
+                            <input type="text" name="screenName" th:value="${param.screenName}" placeholder="请输入用户名"
                                    autocomplete="off" class="layui-input">
                         </div>
                     </div>
@@ -43,7 +43,7 @@
                 <thead>
                 <tr>
                     <th data-field="username">登录名</th>
-                    <th data-field="nickname">用户名</th>
+                    <th data-field="screenName">用户名</th>
                     <th data-field="createDate">创建时间</th>
                     <th>状态</th>
                     <th>分配角色</th>
@@ -54,7 +54,7 @@
                 <tbody>
                 <tr th:each="item:${list}">
                     <td th:text="${item.username}">登录名</td>
-                    <td th:text="${item.nickname}">用户名</td>
+                    <td th:text="${item.screenName}">用户名</td>
                     <td th:text="${item.createTime}">创建时间</td>
                     <td th:text="${item.status}">状态</td>
                     <td>

manager/src/main/resources/templates/rbac/user/userinfo.html

@@ -11,10 +11,10 @@
         </div>
         <ul class="detail-info">
             <li>账号：<span th:text="${user.username}" th:title="${user.username}"></span></li>
-            <li>昵称：<span th:text="${user.nickname}" th:title="${user.nickname}"></span></li>
+            <li>昵称：<span th:text="${user.screenName}" th:title="${user.screenName}"></span></li>
             <li>性别：<span th:text="${user.gender}"
                          th:title="${user.gender}"></span></li>
-            <li>电话：<span th:text="${user.mobilePhone}" th:title="${user.mobilePhone}"></span></li>
+            <li>电话：<span th:text="${user.mobile}" th:title="${user.mobile}"></span></li>
             <li>邮箱：<span th:text="${user.email}" th:title="${user.email}"></span></li>
         </ul>
     </div>
@@ -23,13 +23,13 @@
         <div class="layui-form-item">
             <label class="layui-form-label">用户昵称</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="nickname" placeholder="请输入用户昵称" th:value="${user.nickname}">
+                <input class="layui-input" type="text" name="screenName" placeholder="请输入用户昵称" th:value="${user.screenName}">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label">电话号码</label>
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="mobilePhone" placeholder="请输入电话号码" th:value="${user.mobilePhone}">
+                <input class="layui-input" type="text" name="mobile" placeholder="请输入电话号码" th:value="${user.mobile}">
             </div>
         </div>
         <div class="layui-form-item">

manager/src/test/java/AccountTest.java

@@ -25,13 +25,13 @@ public class AccountTest {
     public void createUserAccount() {
         String username = "admin";
         String password = "admin123456";
-        String nickname = "";
+        String screenName = "";
         int roleId = 1;
 
         UserCreateDto userCreateDto = new UserCreateDto();
         userCreateDto.setUsername(username);
         userCreateDto.setPassword(password);
-        userCreateDto.setNickname(nickname);
+        userCreateDto.setScreenName(screenName);
         userCreateDto.setRoleId(roleId);
         //userService.createUser(userCreateDto);
     }