xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
View File

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

3
jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
View File

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