添加线程发送消息

base-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntityExt.java → base-manager/src/main/java/com/mortals/xhx/base/system/user/model/vo/UserVo.java

-package com.mortals.xhx.base.system.user.model;
+package com.mortals.xhx.base.system.user.model.vo;
+
 
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.model.model.ModelEntity;
@@ -7,15 +8,20 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * Description:User
- * date: 2021-9-26 16:11:48
+ * 用户信息业务视图对象
+ *
+ * @author zxfei
+ * @date 2022-07-05
  */
 @Data
-public class UserEntityExt extends BaseEntityLong {
+public class UserVo extends BaseEntityLong {
+
     /**
      * 站点名称
      */
     private String siteName;
+
+    private String roleIds;
     /**
      * 唯一标识
      */
@@ -35,12 +41,9 @@ public class UserEntityExt extends BaseEntityLong {
      */
     private Long expireTime;
 
+    private String oldPassword;
+    private String newPassword;
+    private String siteIds;
 
     private List<ModelEntity> modleList;
-
-    /**
-     * 所属区域code,多个逗号分隔
-     */
-    private String areaCodes;
-
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -252,7 +252,6 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
             entity.initAttrValue();
             entity.setLoginName(loginName);
             entity.setRealName(userName);
-            entity.setCustomerId(customerId);
             entity.setLoginPwd(password);
             entity.setMobile(mobile);
             entity.setUserType(UserType.CUSTOMER.getValue());
@@ -298,10 +297,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
         }
         try {
             sysUser.setLoginPwd(SecurityUtil.md5DoubleEncoding(newPwd));
-            sysUser.setLoginPwd3(sysUser.getLoginPwd2());
-            sysUser.setLoginPwd2(sysUser.getLoginPwd1());
-            sysUser.setLoginPwd1(sysUser.getLoginPwd());
-            sysUser.setLastModPwdTime(new Date());
+
         } catch (Exception e) {
             throw new AppException("密码转换异常！", e);
         }

base-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java

@@ -58,25 +58,6 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
         }
     }
 
-
-    @Override
-    protected int editAfter(Long id, Map<String, Object> model, UserEntity entity, Context context) throws AppException {
-        entity.setLoginPwd(null);
-        entity.setLoginPwd1(null);
-        entity.setLoginPwd2(null);
-
-        return super.editAfter(id, model, entity, context);
-    }
-
-    @Override
-    protected int saveAfter(UserEntity entity, Map<String, Object> model, Context context) throws AppException {
-        if (entity.getId() == getCurUser().getId()) {
-            //saveCurrUserForSession(request, response, userService.get(form.getEntity().getId(), false));
-        }
-        return super.saveAfter(entity, model, context);
-    }
-
-
     @Override
     protected void saveBefore(UserEntity entity, Map<String, Object> model, Context context) throws AppException {
         if (service.existUser(entity.getLoginName(), entity.getId())) {