zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复存款失败用户不能正常发送消息的问题

Browse Source
This commit is contained in:
zayac 2024-06-08 16:12:29 +08:00
parent 616d55d1a7
commit 8326e316fb
4 changed files with 173 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zayac-admin-agent/src/main/java/com/zayac/admin/schedule/DailyReport.java
View File

@ -62,7 +62,7 @@ import java.util.stream.Collectors;
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j @Slf4j
@Profile("prod") @Profile("dev")
public class DailyReport { public class DailyReport {
private final TeamService teamService; private final TeamService teamService;
private final DeptService deptService; private final DeptService deptService;
@ -142,7 +142,6 @@ public class DailyReport {
// 一小时发送一次 // 一小时发送一次
@Scheduled(cron = "0 0 * * * ?") @Scheduled(cron = "0 0 * * * ?")
//@Scheduled(fixedDelay = 6000L)
public void generateTeamReportTask() { public void generateTeamReportTask() {
LocalDateTime nowDateTime = LocalDateTime.now(); LocalDateTime nowDateTime = LocalDateTime.now();
LocalDate nowDate = LocalDate.now(); LocalDate nowDate = LocalDate.now();
@ -235,7 +234,7 @@ public class DailyReport {
String notification = telegramMessageService String notification = telegramMessageService
.buildFailedPayMessage(accountName, accountMembers); .buildFailedPayMessage(accountName, accountMembers);
UserWithRolesAndAccountsResp currUser = accountUsernameToUserMap.get(accountName); UserWithRolesAndAccountsResp currUser = accountUsernameToUserMap.get(accountName);
if (DisEnableStatusEnum.ENABLE.equals(currUser.getNeedNotify())) { if (currUser != null && DisEnableStatusEnum.ENABLE.equals(currUser.getNeedNotify())) {
String botToken = StrUtil.isEmpty(currUser.getBotToken()) String botToken = StrUtil.isEmpty(currUser.getBotToken())
? ministerUser.getBotToken() ? ministerUser.getBotToken()
: currUser.getBotToken(); : currUser.getBotToken();
@ -331,7 +330,7 @@ public class DailyReport {
} }
String percent = getPercent(totalNewFirstDeposit, totalNewMember); String percent = getPercent(totalNewFirstDeposit, totalNewMember);
synchronized (rows) { synchronized (rows) {
rows.add(new String[] {accountResp.getPlatformName(), String.valueOf(totalNewMember), String rows.add(new String[]{accountResp.getPlatformName(), String.valueOf(totalNewMember), String
.valueOf(totalNewFirstDeposit), percent}); .valueOf(totalNewFirstDeposit), percent});
} }
}, asyncTaskExecutor)) }, asyncTaskExecutor))
@ -342,7 +341,7 @@ public class DailyReport {
// 对 rows 列表进行排序 // 对 rows 列表进行排序
rows.sort(Comparator.comparing((String[] row) -> row[0].length()).thenComparing(row -> row[0])); rows.sort(Comparator.comparing((String[] row) -> row[0].length()).thenComparing(row -> row[0]));
rows.add(new String[] {"总计", String.valueOf(totals[0]), String.valueOf(totals[1]), rows.add(new String[]{"总计", String.valueOf(totals[0]), String.valueOf(totals[1]),
getPercent(totals[1], totals[0])}); getPercent(totals[1], totals[0])});
String message = TableFormatter.formatTableAsHtml(rows); String message = TableFormatter.formatTableAsHtml(rows);
if (ministerUser.getNeedNotify() == DisEnableStatusEnum.ENABLE) { if (ministerUser.getNeedNotify() == DisEnableStatusEnum.ENABLE) {

1
zayac-admin-system/src/main/java/com/zayac/admin/auth/service/impl/LoginServiceImpl.java
View File

@ -80,7 +80,6 @@ public class LoginServiceImpl implements LoginService {
private final PasswordEncoder passwordEncoder; private final PasswordEncoder passwordEncoder;
private final OptionService optionService; private final OptionService optionService;
@Override
public String accountLogin(String username, String password) { public String accountLogin(String username, String password) {
UserDO user = userService.getByUsername(username); UserDO user = userService.getByUsername(username);
boolean isError = ObjectUtil.isNull(user) || !passwordEncoder.matches(password, user.getPassword()); boolean isError = ObjectUtil.isNull(user) || !passwordEncoder.matches(password, user.getPassword());

1
zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/OptionServiceImpl.java
View File

@ -90,5 +90,4 @@ public class OptionServiceImpl implements OptionService {
RedisUtils.set(CacheConstants.OPTION_KEY_PREFIX + code.getValue(), value); RedisUtils.set(CacheConstants.OPTION_KEY_PREFIX + code.getValue(), value);
return mapper.apply(value); return mapper.apply(value);
} }
} }

2
zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/UserCenterController.java
View File

@ -95,8 +95,6 @@ public class UserCenterController {
String rawNewPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updateReq String rawNewPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(updateReq
.getNewPassword())); .getNewPassword()));
ValidationUtils.throwIfNull(rawNewPassword, "新密码解密失败"); ValidationUtils.throwIfNull(rawNewPassword, "新密码解密失败");
ValidationUtils.throwIf(!ReUtil
.isMatch(RegexConstants.PASSWORD, rawNewPassword), "密码长度为 6 到 32 位，可以包含字母、数字、下划线，特殊字符，同时包含字母和数字");
userService.updatePassword(rawOldPassword, rawNewPassword, LoginHelper.getUserId()); userService.updatePassword(rawOldPassword, rawNewPassword, LoginHelper.getUserId());
return R.ok("修改成功，请牢记你的新密码"); return R.ok("修改成功，请牢记你的新密码");
} }