去除短信服务依赖

pom.xml

@@ -60,7 +60,6 @@
 		<druid.version>1.0.24</druid.version>
 		<oracle.jdbc.version>11.2.0</oracle.jdbc.version>
 		<jms.version>1.1</jms.version>
-		<message.sms.version>0.0.1</message.sms.version>
 	</properties>
 
 	<dependencyManagement>

search-console-b2b/pom.xml

@@ -154,13 +154,6 @@
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- 短信服务 -->
-		<dependency>
-			<groupId>com.uas.message</groupId>
-			<artifactId>message-sms-api</artifactId>
-			<version>${message.sms.version}</version>
-		</dependency>
-
 		<!-- 文件上传 -->
 		<dependency>
 			<groupId>commons-fileupload</groupId>

search-console-b2b/src/main/java/com/uas/search/console/b2b/SystemProperties.java

@@ -1,7 +1,5 @@
 package com.uas.search.console.b2b;
 
-import java.util.Set;
-
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -38,18 +36,6 @@ public class SystemProperties {
 	@Value("${schedule.auto-start}")
 	private boolean taskAutoStart;
 
-	/**
-	 * 短信模板id
-	 */
-	@Value("${service.message.sms.templateId}")
-	private String smsTemplateId;
-
-	/**
-	 * 短信接收者号码
-	 */
-	@Value("${service.message.sms.receivers}")
-	private Set<String> smsReceivers;
-
 	public int getDailyTaskHour() {
 		return dailyTaskHour;
 	}
@@ -82,20 +68,4 @@ public class SystemProperties {
 		this.taskAutoStart = taskAutoStart;
 	}
 
-	public String getSmsTemplateId() {
-		return smsTemplateId;
-	}
-
-	public void setSmsTemplateId(String smsTemplateId) {
-		this.smsTemplateId = smsTemplateId;
-	}
-
-	public Set<String> getSmsReceivers() {
-		return smsReceivers;
-	}
-
-	public void setSmsReceivers(Set<String> smsReceivers) {
-		this.smsReceivers = smsReceivers;
-	}
-
 }

search-console-b2b/src/main/java/com/uas/search/console/b2b/support/RealTimeUpdateMonitor.java

@@ -1,7 +1,5 @@
 package com.uas.search.console.b2b.support;
 
-import java.net.Inet4Address;
-import java.net.UnknownHostException;
 import java.sql.SQLRecoverableException;
 import java.util.HashSet;
 
@@ -10,10 +8,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.util.CollectionUtils;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import com.uas.message.sms.service.SmsService;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.console.b2b.DruidDBConfiguration;
-import com.uas.search.console.b2b.SystemProperties;
 import com.uas.search.console.b2b.core.util.ContextUtils;
 import com.uas.search.console.b2b.jms.AQListener;
 import com.uas.search.console.b2b.jms.LuceneQueueMessage;
@@ -33,10 +29,6 @@ public class RealTimeUpdateMonitor {
 
 	private TaskService taskService = ContextUtils.getBean(TaskService.class);
 
-	private SmsService smsService = ContextUtils.getBean(SmsService.class);
-
-	private SystemProperties systemProperties = ContextUtils.getBean(SystemProperties.class);
-
 	private AQListener aqListener = ContextUtils.getBean(AQListener.class);
 
 	private DataSourceQualifier dataSourceQualifier;
@@ -74,7 +66,6 @@ public class RealTimeUpdateMonitor {
 						dataSourceQualifiers.add(dataSourceQualifier);
 						logger.error("实时更新未正常运行：" + dataSourceQualifier.getQualifier());
 						logger.info("发送警告短信...");
-						sendWarnSms();
 						logger.info("重启实时更新服务：" + dataSourceQualifier.getQualifier());
 						if (aqListener.isRunning(dataSourceQualifier)) {
 							aqListener.stop(dataSourceQualifiers);
@@ -118,18 +109,4 @@ public class RealTimeUpdateMonitor {
 		}
 	}
 
-	/**
-	 * 发送警告短信
-	 */
-	private void sendWarnSms() {
-		String message = "B2B实时更新服务出现问题：" + dataSourceQualifier.getQualifier() + "，正在自动重启实时更新服务";
-		try {
-			message += "，来自" + Inet4Address.getLocalHost().toString();
-		} catch (UnknownHostException e) {
-			logger.error("", e);
-		}
-		smsService.sendAll(systemProperties.getSmsTemplateId(), systemProperties.getSmsReceivers(),
-				new Object[] { message });
-	}
-
 }

search-console-b2b/src/main/resources/bootstrap.yml

@@ -34,9 +34,3 @@ schedule:
    
 zk:
  url: zookeeper://10.10.100.11:2181
- 
-service:
- message:
-  sms:
-   templateId: 186c7219-fe33-4b64-b50e-d351c6846583
-   receivers: 18782417445

search-console-b2b/src/main/resources/spring/dubbo.xml

@@ -16,8 +16,4 @@
 	<!-- 提供搜索服务 -->
 	<dubbo:service interface="com.uas.search.b2b.service.SearchService"
 		ref="searchService" group="${dubbo.group}" />
-
-	<!-- 消费短信服务 -->
-	<dubbo:reference id="smsService"
-		interface="com.uas.message.sms.service.SmsService" timeout="30000" />
 </beans>

search-console/pom.xml

@@ -153,13 +153,6 @@
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- 短信服务 -->
-		<dependency>
-			<groupId>com.uas.message</groupId>
-			<artifactId>message-sms-api</artifactId>
-			<version>${message.sms.version}</version>
-		</dependency>
-
 		<!-- 文件上传 -->
 		<dependency>
 			<groupId>commons-fileupload</groupId>

search-console/src/main/java/com/uas/search/console/SystemProperties.java

@@ -1,7 +1,5 @@
 package com.uas.search.console;
 
-import java.util.Set;
-
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -20,18 +18,6 @@ public class SystemProperties {
 	@Value("${schedule.auto-start}")
 	private boolean taskAutoStart;
 
-	/**
-	 * 短信模板id
-	 */
-	@Value("${service.message.sms.templateId}")
-	private String smsTemplateId;
-
-	/**
-	 * 短信接收者号码
-	 */
-	@Value("${service.message.sms.receivers}")
-	private Set<String> smsReceivers;
-
 	public boolean isTaskAutoStart() {
 		return taskAutoStart;
 	}
@@ -40,20 +26,4 @@ public class SystemProperties {
 		this.taskAutoStart = taskAutoStart;
 	}
 
-	public String getSmsTemplateId() {
-		return smsTemplateId;
-	}
-
-	public void setSmsTemplateId(String smsTemplateId) {
-		this.smsTemplateId = smsTemplateId;
-	}
-
-	public Set<String> getSmsReceivers() {
-		return smsReceivers;
-	}
-
-	public void setSmsReceivers(Set<String> smsReceivers) {
-		this.smsReceivers = smsReceivers;
-	}
-
 }

search-console/src/main/java/com/uas/search/console/service/impl/RealTimeUpdateMonitorServiceImpl.java

@@ -1,7 +1,5 @@
 package com.uas.search.console.service.impl;
 
-import java.net.Inet4Address;
-import java.net.UnknownHostException;
 import java.sql.SQLRecoverableException;
 
 import org.slf4j.Logger;
@@ -10,8 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import com.uas.message.sms.service.SmsService;
-import com.uas.search.console.SystemProperties;
 import com.uas.search.console.dao.LuceneQueueMessageDao;
 import com.uas.search.console.jms.AQListener;
 import com.uas.search.console.model.LuceneQueueMessage;
@@ -36,12 +32,6 @@ public class RealTimeUpdateMonitorServiceImpl implements RealTimeUpdateMonitorSe
 	@Autowired
 	private LuceneQueueMessageDao luceneQueueMessageDao;
 
-	@Autowired
-	private SmsService smsService;
-
-	@Autowired
-	private SystemProperties systemProperties;
-
 	/**
 	 * 上次查询时最旧的消息
 	 */
@@ -73,7 +63,6 @@ public class RealTimeUpdateMonitorServiceImpl implements RealTimeUpdateMonitorSe
 					if (!workWell()) {
 						logger.error("实时更新未正常运行");
 						logger.info("发送警告短信...");
-						sendWarnSms();
 						if (aqListener.isRunning()) {
 							aqListener.stop();
 						}
@@ -113,18 +102,4 @@ public class RealTimeUpdateMonitorServiceImpl implements RealTimeUpdateMonitorSe
 		}
 	}
 
-	/**
-	 * 发送警告短信
-	 */
-	private void sendWarnSms() {
-		String message = "B2C实时更新服务出现问题，正在自动重启实时更新服务";
-		try {
-			message += "，来自" + Inet4Address.getLocalHost().toString();
-		} catch (UnknownHostException e) {
-			logger.error("", e);
-		}
-		smsService.sendAll(systemProperties.getSmsTemplateId(), systemProperties.getSmsReceivers(),
-				new Object[] { message });
-	}
-
 }

search-console/src/main/resources/bootstrap.yml

@@ -30,9 +30,3 @@ schedule:
    
 zk:
  url: zookeeper://10.10.100.11:2181
- 
-service:
- message:
-  sms:
-   templateId: 186c7219-fe33-4b64-b50e-d351c6846583
-   receivers: 18782417445

search-console/src/main/resources/spring/dubbo.xml

@@ -21,8 +21,4 @@
 
 	<dubbo:service interface="com.uas.search.service.OrderSearchService"
 		ref="orderSearchService" group="${dubbo.group}" />
-
-	<!-- 消费短信服务 -->
-	<dubbo:reference id="smsService"
-		interface="com.uas.message.sms.service.SmsService" timeout="30000" />
 </beans>