fix:新增defaultPassword配置项,创建用户接口改为默认配置密码

This commit is contained in:
orgin 2023-05-12 15:43:51 +08:00
parent 4db2a9df4b
commit c65e9b72a7
2 changed files with 18 additions and 12 deletions

View File

@ -89,6 +89,9 @@ public class SysUserController {
@Value("${jeecg.path.upload}")
private String upLoadPath;
@Value("${system.auth.defaultPassword}")
private String defaultPassword;
@Autowired
private BaseCommonService baseCommonService;
@ -159,7 +162,7 @@ public class SysUserController {
user.setCreateTime(new Date());//设置创建时间
String salt = oConvertUtils.randomGen(8);
user.setSalt(salt);
String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), salt);
String passwordEncode = PasswordUtil.encrypt(user.getUsername(), defaultPassword, salt);
user.setPassword(passwordEncode);
user.setStatus(1);
user.setDelFlag(CommonConstant.DEL_FLAG_0);
@ -908,7 +911,7 @@ public class SysUserController {
}
return result;
}
/**
* 查询当前用户的所有部门/当前部门编码
* @return
@ -931,12 +934,12 @@ public class SysUserController {
return result;
}
/**
* 用户注册接口
*
*
* @param jsonObject
* @param user
* @return
@ -999,7 +1002,7 @@ public class SysUserController {
if(oConvertUtils.isEmpty(realname)){
realname = username;
}
try {
user.setCreateTime(new Date());// 设置创建时间
String salt = oConvertUtils.randomGen(8);
@ -1094,7 +1097,7 @@ public class SysUserController {
result.setSuccess(true);
return result;
}
/**
* 用户更改密码
*/
@ -1144,11 +1147,11 @@ public class SysUserController {
return result;
}
}
/**
* 根据TOKEN获取用户的部分信息返回的数据是可供表单设计器使用的数据
*
*
* @return
*/
@GetMapping("/getUserSectionInfoByToken")
@ -1159,7 +1162,7 @@ public class SysUserController {
if (oConvertUtils.isEmpty(token)) {
username = JwtUtil.getUserNameByToken(request);
} else {
username = JwtUtil.getUsername(token);
username = JwtUtil.getUsername(token);
}
log.debug(" ------ 通过令牌获取部分用户信息,当前用户: " + username);
@ -1180,7 +1183,7 @@ public class SysUserController {
return Result.error(500, "查询失败:" + e.getMessage());
}
}
/**
* APP端接口获取用户列表 根据用户名和真实名 模糊匹配
* @param keyword
@ -1217,7 +1220,7 @@ public class SysUserController {
log.error(e.getMessage(), e);
return Result.error(500, "查询失败:" + e.getMessage());
}
}
/**
@ -1491,7 +1494,7 @@ public class SysUserController {
}
return ls;
}
/**
* 聊天 创建聊天组件专用 根据用户账号用户姓名部门id分页查询
* @param departId 部门id

View File

@ -292,3 +292,6 @@ third-app:
# appSecret
client-secret: ??
agent-id: ??
system:
auth:
defaultPassword: 123456