1.合服后从服务器状态跟着主服务器一起变化

2.合服后邮件发布出去,取消限制
jieling
xuexinpeng 2023-12-26 14:47:41 +08:00
parent 32087eb6b5
commit 0805fca7af
2 changed files with 12 additions and 5 deletions

View File

@ -266,7 +266,7 @@ public class MailController {
String[] split = mail.getUserId().split("#"); String[] split = mail.getUserId().split("#");
for (int i = 0; i < split.length; i++) { for (int i = 0; i < split.length; i++) {
CUserInfo cUserInfo = userInfoDao.findUserInfoById(split[i]); CUserInfo cUserInfo = userInfoDao.findUserInfoById(split[i]);
if (cUserInfo == null || cUserInfo.getServerid() != Integer.parseInt(mail.getServerId())){ if (cUserInfo == null ){ //|| cUserInfo.getServerid() != Integer.parseInt(mail.getServerId()) TODO 合服后发邮件发不出去
return 3; return 3;
} }
} }

View File

@ -1,14 +1,12 @@
package com.jmfy.controller; package com.jmfy.controller;
import com.jmfy.dao.CHefuDao;
import com.jmfy.dao.CUserDao; import com.jmfy.dao.CUserDao;
import com.jmfy.dao.ServerInfoDao; import com.jmfy.dao.ServerInfoDao;
import com.jmfy.handler.GMHandler; import com.jmfy.handler.GMHandler;
import com.jmfy.handler.HeFuManager; import com.jmfy.handler.HeFuManager;
import com.jmfy.handler.RedisLogic; import com.jmfy.handler.RedisLogic;
import com.jmfy.model.AssSetting; import com.jmfy.model.*;
import com.jmfy.model.CAdmin;
import com.jmfy.model.CServerOpenTime;
import com.jmfy.model.ServerInfo;
import com.jmfy.model.vo.IdentityEnum; import com.jmfy.model.vo.IdentityEnum;
import com.jmfy.model.vo.PowersEnum; import com.jmfy.model.vo.PowersEnum;
import com.jmfy.model.vo.ServerInfoVo; import com.jmfy.model.vo.ServerInfoVo;
@ -45,6 +43,8 @@ public class ServerInfoController {
private ServerInfoDao serverInfoDao; private ServerInfoDao serverInfoDao;
@Resource @Resource
private CUserDao cUserDao; private CUserDao cUserDao;
@Resource
private CHefuDao hefuDao;
// private static int state = 0; // private static int state = 0;
@ -257,6 +257,13 @@ public class ServerInfoController {
return 2; return 2;
} }
} }
//更改主服状态信息时,也更新从服状态信息
CHefuInfo hefuInfo = hefuDao.findHefuByServerID(vo.getServerId());
for(int slaveId:hefuInfo.getSlaveServerIds()){
ServerInfo slaveInfo = serverInfoDao.getServerInfo(String.valueOf(slaveId));
slaveInfo.setStatus(vo.getStatus());
serverInfoDao.updateServerInfo(slaveInfo);
}
// 1. 修改服务器信息 // 1. 修改服务器信息
serverInfoDao.updateServerInfo(vo); serverInfoDao.updateServerInfo(vo);