purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化管理员登录的逻辑，增加提醒功能

Browse Source
This commit is contained in:
jishenghua
2025-09-03 22:37:18 +08:00
parent 541f8c3fb5
commit d49f584b72
5 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
jshERP-boot/src/main/java/com/jsh/erp/service/UserService.java
View File

@@ -377,16 +377,8 @@ public class UserService {
}
user.setPassword(null);
if(BusinessConstants.DEFAULT_MANAGER.equals(user.getLoginName())) {
//如果是管理员，则发送订阅消息
//1-获取token
String accessToken = platformConfigService.getAccessToken();
//2-发送订阅消息
String templateId = platformConfigService.getPlatformConfigByKey("login_temp_id").getPlatformValue();
String weixinUrl = platformConfigService.getPlatformConfigByKey("weixinUrl").getPlatformValue();
String platformName = platformConfigService.getPlatformConfigByKey("platform_name").getPlatformValue();
if(StringUtil.isNotEmpty(accessToken) && StringUtil.isNotEmpty(user.getWeixinOpenId()) && StringUtil.isNotEmpty(templateId)) {
platformConfigService.sendSubscribeMessage(accessToken, weixinUrl, platformName, templateId, null, user.getWeixinOpenId());
}
//如果是管理员，则发送登录邮件
sendEmailToCurrentUser(request, user);
}
redisService.storageObjectBySession(token,"clientIp", Tools.getLocalIp(request));
logService.insertLogWithUserId(user.getId(), user.getTenantId(), "用户",
@@ -459,6 +451,26 @@ public class UserService {
return user;
}
/**
* 发送邮件给当前用户
* @param request
* @param user
* @throws Exception
*/
private void sendEmailToCurrentUser(HttpServletRequest request, User user) throws Exception {
String platformName = platformConfigService.getPlatformConfigByKey("platform_name").getPlatformValue();
String emailFrom = platformConfigService.getPlatformConfigByKey("email_from").getPlatformValue();
String emailAuthCode = platformConfigService.getPlatformConfigByKey("email_auth_code").getPlatformValue();
String emailSmtpHost = platformConfigService.getPlatformConfigByKey("email_smtp_host").getPlatformValue();
if(StringUtil.isNotEmpty(emailFrom) && StringUtil.isNotEmpty(emailAuthCode) && StringUtil.isNotEmpty(emailSmtpHost)
&& StringUtil.isNotEmpty(user.getEmail())) {
String emailSubject = "用户" + user.getLoginName() + "成功登录" + platformName;
String emailBody = "用户" + user.getLoginName() + "成功登录" + platformName + "，登录时间：" + Tools.getCenternTime(new Date())
+ "，登录IP：" + Tools.getLocalIp(request);
platformConfigService.sendEmail(emailFrom, emailAuthCode, emailSmtpHost, user.getEmail(), emailSubject, emailBody);
}
}
public int checkIsNameExist(Long id, String name)throws Exception {
UserExample example = new UserExample();
List<Byte> userStatus = new ArrayList<>();