update cn.reghao.devops.mgr.admin.model.po.User

mgr/src/main/java/cn/reghao/devops/mgr/admin/model/constant/UserGender.java

@@ -1,34 +0,0 @@
-package cn.reghao.devops.mgr.admin.model.constant;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 用户性别
- *
- * @author reghao
- * @date 2021-07-14 10:23:46
- */
-public enum UserGender {
-    female(0, "女"), male(1, "男"), unknown(2, "未知");
-
-    private final Integer code;
-    private final String desc;
-
-    private static Map<Integer, String> descMap = new HashMap<>();
-    static {
-        for (UserGender gender : UserGender.values()) {
-            descMap.put(gender.code, gender.desc);
-        }
-    }
-
-    UserGender(Integer code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    // TODO 第一次调用时会初始化 descMap
-    public static String getDescByCode(int code) {
-        return descMap.get(code);
-    }
-}

mgr/src/main/java/cn/reghao/devops/mgr/admin/model/po/User.java

@@ -48,8 +48,6 @@ public class User extends BaseEntity implements UserDetails {
     private String screenName;
     private String avatarUrl;
     private String mobile;
-    private String email;
-    private Integer gender;
 
     public User(String username, String encodedPassword, String salt, Role role) {
         this.username = username;
@@ -60,7 +58,6 @@ public class User extends BaseEntity implements UserDetails {
         this.enabled = true;
         this.locked = false;
         this.screenName = username;
-        this.gender = 3;
         this.avatarUrl = "/imgs/avatar.jpg";
     }
 

mgr/src/main/java/cn/reghao/devops/mgr/admin/model/vo/UserVO.java

@@ -1,6 +1,5 @@
 package cn.reghao.devops.mgr.admin.model.vo;
 
-import cn.reghao.devops.mgr.admin.model.constant.UserGender;
 import cn.reghao.devops.common.util.NotAvailable;
 import cn.reghao.devops.mgr.admin.model.po.User;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
@@ -26,9 +25,7 @@ public class UserVO {
         this.userId = user.getId();
         this.username = user.getUsername();
         this.screenName = user.getScreenName();
-        this.gender = UserGender.getDescByCode(user.getGender());
         this.mobile = user.getMobile();
-        this.email = user.getEmail();
         this.createTime = DateTimeConverter.format(user.getCreateTime());
         this.status = user.getEnabled() ? "启用" : "禁用";
         this.lastAccess = NotAvailable.na.getDesc();

mgr/src/main/java/cn/reghao/devops/mgr/admin/service/impl/AccountServiceImpl.java

@@ -97,7 +97,6 @@ public class AccountServiceImpl implements AccountService {
 
         userEntity.setScreenName(accountProfile.getScreenName());
         userEntity.setMobile(accountProfile.getMobile());
-        userEntity.setEmail(accountProfile.getEmail());
         userRepository.save(userEntity);
     }
 

mgr/src/main/resources/templates/admin/user/detail.html

@@ -16,14 +16,8 @@
             <tr>
                 <th>用户名</th>
                 <td th:text="${user.screenName}"></td>
-                <th>用户性别</th>
-                <td th:text="${user.gender}"></td>
-            </tr>
-            <tr>
                 <th>电话号码</th>
                 <td th:text="${user.mobile}"></td>
-                <th>邮箱</th>
-                <td th:text="${user.email}"></td>
             </tr>
             <tr>
                 <th>用户拥有的角色</th>

mgr/src/main/resources/templates/admin/user/userinfo.html

@@ -12,13 +12,7 @@
         <ul class="detail-info">
             <li>账号：<span th:text="${user.username}" th:title="${user.username}"></span></li>
             <li>昵称：<span th:text="${user.screenName}" th:title="${user.screenName}"></span></li>
-            <li>性别：
-                <span th:if="${user.gender} eq 0">女</span>
-                <span th:if="${user.gender} eq 1">男</span>
-                <span th:if="${user.gender} eq 2">未知</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>
     <form class="user-edit" th:action="@{/rbac/user/update}">
@@ -35,20 +29,20 @@
                 <input class="layui-input" type="text" name="mobile" placeholder="请输入电话号码" th:value="${user.mobile}">
             </div>
         </div>
-        <div class="layui-form-item">
+        <!--<div class="layui-form-item">
             <label class="layui-form-label">邮箱</label>
             <div class="layui-input-inline">
                 <input class="layui-input" type="text" name="email" placeholder="请输入邮箱" th:value="${user.email}">
             </div>
-        </div>
-        <div class="layui-form-item">
+        </div>-->
+        <!--<div class="layui-form-item">
             <label class="layui-form-label">选择性别</label>
             <div class="layui-input-inline">
                 <input type="radio" name="gender" value="0" title="女" checked><div class="layui-unselect layui-form-radio layui-form-radioed"><i class="layui-anim layui-icon"></i><div>男</div></div>
                 <input type="radio" name="gender" value="1" title="男" th:checked="${user.gender} eq 1"><div class="layui-unselect layui-form-radio"><i class="layui-anim layui-icon"></i><div>女</div></div>
                 <input type="radio" name="gender" value="2" title="未知" th:checked="${user.gender} eq 2"><div class="layui-unselect layui-form-radio"><i class="layui-anim layui-icon"></i><div>未知</div></div>
             </div>
-        </div>
+        </div>-->
         <div class="layui-form-item timo-finally">
             <button class="layui-btn ajax-submit"><i class="fa fa-check-circle"></i> 保存</button>
             <a class="layui-btn btn-secondary close-popup"><i class="fa fa-times-circle"></i> 关闭</a>

mgr/src/main/resources/templates/main.html

@@ -35,9 +35,10 @@
                             <a class="open-popup" data-title="个人信息" th:attr="data-url=@{/rbac/user/profile}" data-size="680,464">
                                 <i class="fa fa-user-o"></i>个人信息</a>
                         </div>
-                        <div>
+                        <!--<div>
                             <a class="open-popup" data-title="修改密码" th:attr="data-url=@{/rbac/user/passwd/edit}" data-size="456,296">
-                                <i class="fa fa-lock" style="font-size:17px;width:12px;"></i>修改密码</a></div>
+                                <i class="fa fa-lock" style="font-size:17px;width:12px;"></i>修改密码</a>
+                        </div>-->
                         <div>
                             <a th:href="@{/logout}"><i class="fa fa-power-off"></i>退出登录</a>
                         </div>