feat: 增加新版登入

haikang
huangfeng 1 year ago
parent e2754bfe21
commit e056034fce

@ -60,12 +60,20 @@ public class UserController extends BasicController {
return Response.success("OK"); return Response.success("OK");
} }
@ApiOperation(value = "旧版登录")
@PostMapping(value = "loginold")
public Response<Admin> loginold(String username, String password) throws Exception {
Admin admin = service.loginold(username, password);
admin.setPassword("");
return Response.success(admin);
}
@ApiOperation(value = "登录") @ApiOperation(value = "登录")
@PostMapping(value = "login") @PostMapping(value = "login")
public Response<Admin> login(String username, String password) throws Exception { public Response<Admin> login(@RequestBody Admin user) throws Exception {
Admin user = service.login(username, password); Admin admin = service.login(user);
user.setPassword(""); admin.setPassword("");
return Response.success(user); return Response.success(admin);
} }
@ApiOperation(value = "退出") @ApiOperation(value = "退出")

@ -14,5 +14,7 @@ public interface AdminService {
void delete(Integer id); void delete(Integer id);
Admin login(String name, String password) throws Exception; Admin loginold(String name, String password) throws Exception;
Admin login(Admin user) throws Exception;
} }

@ -59,14 +59,28 @@ public class AdminServiceImpl implements AdminService {
} }
@Override @Override
public Admin login(String name, String password) throws Exception { public Admin loginold(String name, String password) throws Exception {
List<Admin> list = repository.findByName(name); List<Admin> list = repository.findByName(name);
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
throw new BusinessException("用户或密码不正确"); throw new BusinessException("用户或密码不正确");
} }
Admin admin = list.get(0); Admin admin = list.get(0);
String newPwd = RsaUtils.decryptByPrivateKey(bizConfig.getRsakey(), password); String newPwd = RsaUtils.decryptByPrivateKey(bizConfig.getRsakey(), password);
String userPassword = DigestUtils.md5DigestAsHex(newPwd.getBytes()); String userPassword = DigestUtils.md5DigestAsHex(password.getBytes());
if (!admin.getPassword().equals(userPassword)) {
throw new BusinessException("用户或密码不正确");
}
return admin;
}
@Override
public Admin login(Admin user) throws Exception {
List<Admin> list = repository.findByName(user.getName());
if (CollectionUtils.isEmpty(list)) {
throw new BusinessException("用户或密码不正确");
}
Admin admin = list.get(0);
String userPassword = DigestUtils.md5DigestAsHex(user.getPassword().getBytes());
if (!admin.getPassword().equals(userPassword)) { if (!admin.getPassword().equals(userPassword)) {
throw new BusinessException("用户或密码不正确"); throw new BusinessException("用户或密码不正确");
} }

Loading…
Cancel
Save