glj-代码提交
This commit is contained in:
commit
ced2f4184d
|
@ -29,8 +29,9 @@ import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
|
|||
public class AdministratorController {
|
||||
|
||||
private AdministratorService service;
|
||||
|
||||
//引入BladeRedis
|
||||
private BladeRedis bladeRedis;
|
||||
|
||||
/**
|
||||
* 管理员用户分页列表
|
||||
* @param query
|
||||
|
@ -64,6 +65,7 @@ public class AdministratorController {
|
|||
@PutMapping("/update")
|
||||
public R<Boolean> update(@RequestBody Administrator administrator){
|
||||
CacheUtil.clear(USER_CACHE);
|
||||
bladeRedis.del("blade:user::user:account:595035-"+administrator.getEmail());
|
||||
return R.status(service.updateById(administrator));
|
||||
}
|
||||
|
||||
|
@ -96,7 +98,7 @@ public class AdministratorController {
|
|||
*/
|
||||
@PutMapping("/updatePassword")
|
||||
public R<Boolean> updatePassword(@RequestParam String email,@RequestParam String newPassword,@RequestParam String tenantId,@RequestParam String code){
|
||||
CacheUtil.clear(USER_CACHE);
|
||||
bladeRedis.del("blade:user::user:account:595035-"+email);
|
||||
return R.data(service.updatePassword(email,newPassword,tenantId,code));
|
||||
}
|
||||
/**
|
||||
|
@ -115,7 +117,7 @@ public class AdministratorController {
|
|||
*/
|
||||
@PutMapping("/updatePasswordByOldPassword")
|
||||
public R<Boolean> updatePasswordByOldPassword(@RequestParam String account,@RequestParam String tenantId,@RequestParam String oldPassword,@RequestParam String newPassword){
|
||||
CacheUtil.clear(USER_CACHE);
|
||||
bladeRedis.del("blade:user::user:account:595035-"+account);
|
||||
Administrator administrator = service.getOne(Wrappers.<Administrator>query().lambda().eq(Administrator::getAccount,account).eq(Administrator::getTenantId,tenantId));
|
||||
if(administrator == null){
|
||||
return R.data(false);
|
||||
|
|
|
@ -356,14 +356,14 @@ public class DisasterInfoController {
|
|||
email.setSubject(disasterInfo.getRefuseTitle());
|
||||
email.setText(disasterInfo.getRefuseReason());
|
||||
}
|
||||
// Boolean flag = disasterInfoService.updateById(disasterInfo);
|
||||
Boolean flag = disasterInfoService.updateById(disasterInfo);
|
||||
//保证数据在更新完后发送邮件。防止数据更新失败,邮件发送成功
|
||||
try {
|
||||
emailService.sendMimeMessage(email);
|
||||
} catch (Exception e) {
|
||||
return R.fail("发送失败");
|
||||
}
|
||||
return R.data(true);
|
||||
return R.data(flag);
|
||||
}
|
||||
|
||||
private final EmailService emailService;
|
||||
|
|
Loading…
Reference in New Issue