ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2024-11-18 10:23:50 +08:00
parent f4109275d7
commit 8206a51c6c
10 changed files with 82 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
user/src/main/java/com/njcn/gather/user/pojo/constant/UserValidMessage.java
View File

@@ -20,7 +20,7 @@ public interface UserValidMessage {
String LOGIN_NAME_NOT_BLANK = "登录名不能为空，请检查loginName参数";
String LOGIN_NAME_FORMAT_ERROR = "登录名格式错误，需3-16位的英文字母或数字，请检查loginName参数";
String LOGIN_NAME_FORMAT_ERROR = "登录名格式错误，需以字母开头，长度为3-16位的字母或数字";
String PASSWORD_NOT_BLANK = "密码不能为空，请检查password参数";

11
user/src/main/java/com/njcn/gather/user/user/controller/SysFunctionController.java
View File

@@ -38,7 +38,7 @@ public class SysFunctionController extends BaseController {
private final ISysRoleFunctionService sysRoleFunctionService;
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/likeName")
@GetMapping("/getTree")
@ApiOperation("按照名称模糊查询菜单树")
@ApiImplicitParam(name = "keyword", value = "查询参数", required = true)
public HttpResult<List<SysFunction>> getFunctionTreeByKeyword(@RequestParam @Validated String keyword) {
@@ -48,15 +48,6 @@ public class SysFunctionController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/functionTree")
@ApiOperation("菜单树")
public HttpResult<List<SysFunction>> getFunctionTree() {
String methodDescribe = getMethodDescribe("getFunctionTree");
List<SysFunction> list = sysFunctionService.getFunctionTree(true);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/functionTreeNoButton")
@ApiOperation("菜单树-不包括按钮")

26
user/src/main/java/com/njcn/gather/user/user/controller/SysUserController.java
View File

@@ -43,32 +43,6 @@ public class SysUserController extends BaseController {
private final ISysUserService sysUserService;
@OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.AUTHENTICATE)
@PostMapping("/login")
@ApiOperation("登录")
public HttpResult<Object> login(@RequestBody SysUserParam.LoginParam param) {
String methodDescribe = getMethodDescribe("login");
LogUtil.njcnDebug(log, "{}，登录参数为：{}", methodDescribe, param);
SysUser user = sysUserService.getUserByLoginNameAndPassword(param.getLoginName(), param.getPassword());
if (user == null) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, UserValidMessage.LOGIN_FAILED, methodDescribe);
} else {
String token = JwtUtil.generateToken(user.getId());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, token, methodDescribe);
}
}
@OperateInfo(info = LogEnum.SYSTEM_SERIOUS, operateType = OperateType.LOGOUT)
@ApiOperation("注销登录")
@PostMapping("/logout")
public HttpResult<Object> logout(HttpServletRequest request) {
String methodDescribe = getMethodDescribe("logout");
LogUtil.njcnDebug(log, "{}，注销登录", methodDescribe);
String token = request.getHeader("Authorization").replace(SecurityConstants.AUTHORIZATION_PREFIX, Strings.EMPTY);
JwtUtil.invalidateToken(token);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/list")
@ApiOperation("分页查询用户列表")

2
user/src/main/java/com/njcn/gather/user/user/pojo/param/SysUserParam.java
View File

@@ -107,7 +107,7 @@ public class SysUserParam {
@ApiModelProperty("登录名")
@NotBlank(message = UserValidMessage.LOGIN_NAME_NOT_BLANK)
@Pattern(regexp = PatternRegex.LOGIN_NAME_REGEX, message = UserValidMessage.LOGIN_NAME_FORMAT_ERROR)
private String loginName;
private String username;
@ApiModelProperty("密码")
@NotBlank(message = UserValidMessage.PASSWORD_NOT_BLANK)

4
user/src/main/java/com/njcn/gather/user/user/service/impl/SysUserServiceImpl.java
View File

@@ -176,9 +176,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public SysUser getUserByLoginNameAndPassword(String loginName, String password) {
String secretkey = Sm4Utils.globalSecretKey;
Sm4Utils sm4 = new Sm4Utils(secretkey);
return this.lambdaQuery().ne(SysUser::getState, UserState.DELETE)
.eq(SysUser::getLoginName, loginName)
.eq(SysUser::getPassword, password).one();
.eq(SysUser::getPassword, sm4.encryptData_ECB(password)).one();
}
@Override