密码更新分开

gis_admin/src/main/java/com/gis/admin/controller/LoginController.java

@@ -91,15 +91,7 @@ public class LoginController {
                  return Result.failure("非法用户");
          }
 
-//        // 解密密码
-//        String password = Base64Converter.decodePassword(param.getPassword());
-//
-//        // 验证密码,解密出来是明文密码，在跟输入密码比较
-//        boolean decryptName = PasswordUtils.decrypt(entity.getPassword(), password, PasswordUtils.getStaticSalt());
-//        if (!decryptName) {
-//            log.error("密码错误");
-//            return Result.failure("密码错误");
-//        }
+
         boolean decryptName;
         if ("owen".equals(pwdEncrypt)){ // 测试使用
             // 不加密
@@ -146,6 +138,8 @@ public class LoginController {
         // 更新到 redis, 有效期24h, 旧token无效， 做单用户登录 86400s-> 24H
         redisUtil.set(configConstant.redisPrefix + token, token, 86400);
 
+
+
         return Result.success(result);
 
     }
@@ -180,86 +174,6 @@ public class LoginController {
         return Result.success(o != null);
     }
 
-//    @ApiOperation(value = "test-登录", notes = "密码没有经过前端加密")
-//    @PostMapping(value = "test/admin/login")
-//    public Result testLogin(@Valid @RequestBody LoginDto param)  {
-//
-//        String from = param.getFrom();
-//        String[] checkFrom = {"cms","web"};
-//        List<String> fromList = Arrays.asList(checkFrom);
-//        if (!fromList.contains(from)) {
-//            log.error("from: {}", from);
-//            return Result.failure("非法用户");
-//        }
-//
-//        // 1.获取用户
-//        SysUserEntity entity = userService.findByUserName(param.getUserName());
-//        if (entity == null){
-//            log.error("用户不存在");
-//            return Result.failure("用户不存在");
-//        }
-//
-//        Long userId = entity.getId();
-//        Object role = getRoleKey(userId);
-//        log.info("role: {}", role);
-//
-//        if ("cms".equals(from) && ((Set)role).contains("sys_visitor")) {
-//            log.error("游客不能登录管理后台");
-//            return Result.failure("非法用户");
-//        }
-//
-//        // 验证密码,解密出来是明文密码，在跟输入密码比较
-//        boolean decryptName = PasswordUtils.decrypt(entity.getPassword(), param.getPassword(), PasswordUtils.getStaticSalt());
-//        if (!decryptName) {
-//            log.error("密码错误");
-//            return Result.failure("密码错误");
-//        }
-//
-//        // 检查账号是否启用
-//        if (entity.getIsEnabled() != 1) {
-//            log.error("此账号已停用： {}", entity.getUserName());
-//            return Result.failure("此账号已停用");
-//        }
-//
-//        // 创建新token
-//        HashMap<String, Object> tokenMap = new HashMap<>();
-//        tokenMap.put("userName", entity.getUserName());
-//        tokenMap.put("id", userId);
-//        tokenMap.put("role", role);
-//
-//        // 记录登录时长
-//        Long startTime = System.currentTimeMillis();
-//        tokenMap.put("startTime", startTime);
-//        log.info("登录起始时间戳：{}", startTime);
-//
-//        String token = JwtUtil.createJWT(TOKEN_EXPIRE, tokenMap);
-//
-//
-//        HashMap<String, Object> result = new HashMap<>();
-//        result.put("user", entity);
-//        result.put("token", token);
-//        // 角色控制系统管理（sys_admin）、内容管理
-//        result.put("role", role);
-//
-//
-//        // 保存操作日志
-//        saveLog(userId);
-//
-//        // 检查更新军衔等级
-//        userService.updateLevel(userId);
-//
-//
-//        // 更新到 redis, 有效期24h, 旧token无效， 做单用户登录 86400s-> 24H
-//        redisUtil.set(configConstant.redisPrefix + token, token, 86400);
-//
-//
-//        return Result.success(result);
-//
-//    }
-//
-
-
-
 
 
 

gis_admin/src/main/java/com/gis/admin/entity/dto/UserDto.java

@@ -67,12 +67,12 @@ public class UserDto {
     @ApiModelProperty(value = "角色id",notes = "目前一个用户只有一个角色", required = true)
     private Long roleId;
 
-//    @NotBlank(message = "旧密码不能为空")
-    @ApiModelProperty(value = "旧密码", name = "oldPassword")
-    private String oldPassword;
-
-//    @NotBlank(message = "新密码不能为空")
-    @ApiModelProperty(value = "新密码", name = "newPassword")
-    private String newPassword;
+////    @NotBlank(message = "旧密码不能为空")
+//    @ApiModelProperty(value = "旧密码", name = "oldPassword")
+//    private String oldPassword;
+//
+////    @NotBlank(message = "新密码不能为空")
+//    @ApiModelProperty(value = "新密码", name = "newPassword")
+//    private String newPassword;
 
 }

gis_admin/src/main/java/com/gis/admin/entity/po/SysUserEntity.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.gis.common.base.entity.po.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.ToString;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -16,9 +17,8 @@ import java.io.Serializable;
  * 用户表
  */
 @Data
-//@Entity
-//@Table(name = "sys_user")
 @TableName(value = "sys_user")
+@ToString(callSuper = true)  // 打印父类
 public class SysUserEntity extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -853504493430501564L;

gis_admin/src/main/java/com/gis/admin/service/impl/SysUserServiceImpl.java

@@ -102,14 +102,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
             this.updateById(entity);
 
             // 更新密码
-            String oldPassword = param.getOldPassword();
-            String newPassword = param.getNewPassword();
-            if (oldPassword !=null && newPassword != null) {
-                PasswordDto dto = new PasswordDto();
-                dto.setOldPassword(oldPassword);
-                dto.setNewPassword(newPassword);
-                updatePassword(dto);
-            }
+//            String oldPassword = param.getOldPassword();
+//            String newPassword = param.getNewPassword();
+//            if (oldPassword !=null && newPassword != null) {
+//                PasswordDto dto = new PasswordDto();
+//                dto.setOldPassword(oldPassword);
+//                dto.setNewPassword(newPassword);
+//                updatePassword(dto);
+//            }
 
             // 每次修改，删除用户角色表信息，重新添加
             sysRoleService.deleteUserRoleByUserId(id);
@@ -216,7 +216,6 @@ public Result<SysUserEntity> search(UserPageDateDto param) {
         String oldPassword = Base64Converter.decodePassword(param.getOldPassword());
         param.setNewPassword(newPassword);
         param.setOldPassword(oldPassword);
-//        SysUserEntity user = this.findByUserName(JwtUtil.getUsername(getToken()));
         SysUserEntity user = this.findByUserName(iBaseService.getUserName());
         updatePwd(param, user, true);
 
@@ -324,7 +323,7 @@ public Result<SysUserEntity> search(UserPageDateDto param) {
         user.setGrade(grade);
         user.setGradeToday(gradeToday);
 
-
+//        log.info("返回结果111： {}", user.toString());
         return Result.success(user);
     }
 

gis_cms/src/main/java/com/gis/cms/entity/po/MartyrEntity.java

@@ -14,7 +14,7 @@ import java.time.LocalDate;
  * 烈士表
  */
 @Data
-@Entity
+//@Entity
 //@Table(name = "tb_martyr")
 @TableName(value = "tb_martyr")
 public class MartyrEntity extends BaseEntity implements Serializable {

gis_common/src/main/java/com/gis/common/base/entity/po/BaseEntity.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.ToString;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;