Authored by qinchao

迁移docker

... ... @@ -6,6 +6,8 @@ import com.monitor.common.config.SendsmsConfig;
import com.monitor.common.service.AlarmMsgService;
import com.monitor.common.service.DingDingService;
import com.monitor.common.service.HttpRestClientService;
import com.monitor.common.sms.service.SmsLogService;
import com.monitor.common.sms.service.impl.SmsLogServiceImpl;
import com.monitor.common.util.MD5Util;
import com.monitor.common.util.OpsZkClientUtil;
import com.monitor.influxdb.contants.InfluxDBContants;
... ... @@ -46,6 +48,9 @@ public class AlarmMsgServiceImpl implements AlarmMsgService {
@Autowired
private DingDingService dingDingService;
@Autowired
private SmsLogService smsLogService;
private Logger logger = LoggerFactory.getLogger(AlarmMsgServiceImpl.class);
... ... @@ -53,9 +58,6 @@ public class AlarmMsgServiceImpl implements AlarmMsgService {
private Map<String, Long> msgSentLogMap = new HashMap<>();
private String ZK_PATH = "/yh/config/";
private String smsSendSwitch="ops.sendsms.open";
private final String SYSTEM_IDC="yohops_aws";
/**
... ... @@ -95,8 +97,9 @@ public class AlarmMsgServiceImpl implements AlarmMsgService {
//根据zk的开关判断是否需要发送数据
String open="";
try{
//zkClient.getCuratorFramework().setData().forPath(ZK_PATH + smsSendSwitch,"true".getBytes("UTF-8"));
open = new String(zkClient.getCuratorFramework().getData().forPath(ZK_PATH + smsSendSwitch));
if(smsLogService.checkExistPath(SmsLogServiceImpl.smsSendSwitch)){
open = new String(zkClient.getCuratorFramework().getData().forPath(SmsLogServiceImpl.ZK_PATH + SmsLogServiceImpl.smsSendSwitch));
}
} catch (Exception e) {
logger.error("Send msg type get ZK_PATH smsSendSwitch error",e);
}
... ...
... ... @@ -5,6 +5,8 @@ import com.monitor.common.config.SendsmsConfig;
import com.monitor.common.service.DingDingService;
import com.monitor.common.service.HttpRestClientService;
import com.monitor.common.service.VoiceMsgService;
import com.monitor.common.sms.service.SmsLogService;
import com.monitor.common.sms.service.impl.SmsLogServiceImpl;
import com.monitor.common.util.MD5Util;
import com.monitor.common.util.OpsZkClientUtil;
import com.monitor.influxdb.contants.InfluxDBContants;
... ... @@ -39,36 +41,10 @@ public class VoiceMsgServiceImpl implements VoiceMsgService {
@Autowired
private DingDingService dingDingService;
public final Logger DEBUG = LoggerFactory.getLogger(getClass());
private String ZK_PATH = "/yh/config/";
private String smsSendVoiceSwitch="ops.sendvoicesms.open";
/* @Override
public void sendVoice(String mobile) throws UnsupportedEncodingException {
try {
VoiceSms voiceSms = new VoiceSms();
voiceSms.setMsg("YOHO");
voiceSms.setExt("nothing");
String[] mobiles = mobile.split(",");
for (String str : mobiles) {
VoiceSms.Tel tel = new VoiceSms.Tel();
tel.setNationcode("86");
tel.setPhone(str);
voiceSms.setSig(MD5Util.encryption(sendsmsConfig.getQcloudSmsKey() + str));
voiceSms.setTel(tel);
DEBUG.info("send voice msg,content:{}", JSON.toJSONString(voiceSms));
String result = httpRestClientService.doPostStringJson(sendsmsConfig.getQcloudVoiceUrl(), JSON.toJSONString(voiceSms));
DEBUG.info("send voice msg,result:{}", result);
}
} catch (Exception e) {
DEBUG.error("sendVoide error ", e);
}
@Autowired
private SmsLogService smsLogService;
}*/
public final Logger DEBUG = LoggerFactory.getLogger(getClass());
@Override
... ... @@ -81,8 +57,9 @@ public class VoiceMsgServiceImpl implements VoiceMsgService {
//根据zk的开关判断是否需要发送数据
String open="";
try{
//zkClient.getCuratorFramework().setData().forPath(ZK_PATH + smsSendSwitch,"true".getBytes("UTF-8"));
open = new String(zkClient.getCuratorFramework().getData().forPath(ZK_PATH + smsSendVoiceSwitch));
if(smsLogService.checkExistPath(SmsLogServiceImpl.smsSendVoiceSwitch)){
open = new String(zkClient.getCuratorFramework().getData().forPath(SmsLogServiceImpl.ZK_PATH + SmsLogServiceImpl.smsSendVoiceSwitch));
}
} catch (Exception e) {
DEBUG.error("Send msg type get ZK_PATH smsVoiceSendSwitch error",e);
}
... ...
package com.monitor.other.sms.ctrl;
package com.monitor.common.sms.ctrl;
import com.monitor.common.sms.service.SmsLogService;
import com.monitor.model.response.BaseResponse;
import com.monitor.other.sms.service.SmsLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
... ...
package com.monitor.other.sms.ctrl;
package com.monitor.common.sms.ctrl;
import com.model.SMSLogs;
import com.monitor.common.sms.service.SmsLogService;
import com.monitor.model.page.PageResponse;
import com.monitor.model.request.SmsLogReq;
import com.monitor.model.response.BaseResponse;
import com.monitor.model.page.PageResponse;
import com.monitor.other.sms.service.SmsLogService;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
... ...
package com.monitor.other.sms.service;
package com.monitor.common.sms.service;
import com.model.SMSLogs;
import com.monitor.model.page.PageRequest;
... ... @@ -21,4 +21,6 @@ public interface SmsLogService {
BaseResponse setDevSmsTurnOnOff(String key);
BaseResponse getDevSmsSwitchValue();
boolean checkExistPath(String pathCode);
}
... ...
package com.monitor.other.sms.service.impl;
package com.monitor.common.sms.service.impl;
import com.contants.AlarmGroupContants;
import com.model.SMSLogs;
import com.monitor.common.service.AlarmMsgService;
import com.monitor.common.sms.service.SmsLogService;
import com.monitor.common.util.ApplicationUtil;
import com.monitor.common.util.OpsZkClientUtil;
import com.monitor.model.domain.PageBean;
import com.monitor.model.page.PageRequest;
import com.monitor.model.response.BaseResponse;
import com.monitor.model.page.PageResponse;
import com.monitor.model.response.BaseResponse;
import com.monitor.mysql.mapper.SMSLogsMapper;
import com.monitor.other.sms.service.SmsLogService;
import com.util.GetUsersInfoUtil;
import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
... ... @@ -37,10 +37,10 @@ public class SmsLogServiceImpl implements SmsLogService {
@Autowired
private AlarmMsgService alarmMsgService;
private String ZK_PATH = "/yh/config/";
private String smsSendSwitch="ops.sendsms.open";
private String smsSendVoiceSwitch="ops.sendvoicesms.open";
private String dev_smsSendSwitch="devops.sendsms.open";
public static final String ZK_PATH = "/yh/config/";
public static final String smsSendSwitch="ops.sendsms.open";
public static final String smsSendVoiceSwitch="ops.sendvoicesms.open";
public static final String dev_smsSendSwitch="devops.sendsms.open";
@Override
public BaseResponse setSmsTurnOnOff(String key){
return setTurnOnOff(smsSendSwitch,key);
... ... @@ -106,6 +106,21 @@ public class SmsLogServiceImpl implements SmsLogService {
return res;
}
@Override
public boolean checkExistPath(String pathCode){
try{
Stat stat=zkClient.getCuratorFramework().checkExists().forPath(ZK_PATH + pathCode);
// Stat 就是对zonde所有属性的一个映射, stat=null表示节点不存在!
if(stat!=null){
return true;
}
return false;
} catch (Exception e) {
logger.error("checkExistPath ZK_PATH "+pathCode+" error",e);
}
return false;
}
private BaseResponse getSwitchValue(String pathCode){
... ...