1:删除37与149对14:APP_SUBSCRIBE_ID表的支持

2:为日志查询的url字段做左匹配处理
3:修改测试程序打印表达式
4:加配置同步到集群库的定时任务

src/main/java/com/nis/util/JedisClusterFactory.java

@@ -0,0 +1,103 @@
+package com.nis.util;
+
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.io.Resource;
+
+import redis.clients.jedis.HostAndPort;
+import redis.clients.jedis.JedisCluster;
+
+public class JedisClusterFactory implements FactoryBean<JedisCluster>, InitializingBean {
+
+	private Resource addressConfig;
+	private String addressKeyPrefix;
+
+	private JedisCluster jedisCluster;
+	private Integer timeout;
+	private Integer maxRedirections;
+	private GenericObjectPoolConfig genericObjectPoolConfig;
+
+	private Pattern p = Pattern.compile("^.+[:]\\d{1,5}\\s*$");
+
+	@Override
+	public JedisCluster getObject() throws Exception {
+		return jedisCluster;
+	}
+
+	@Override
+	public Class<? extends JedisCluster> getObjectType() {
+		return (this.jedisCluster != null ? this.jedisCluster.getClass() : JedisCluster.class);
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
+
+	private Set<HostAndPort> parseHostAndPort() throws Exception {
+		try {
+			Properties prop = new Properties();
+			prop.load(this.addressConfig.getInputStream());
+
+			Set<HostAndPort> haps = new HashSet<HostAndPort>();
+			for (Object key : prop.keySet()) {
+
+				if (!((String) key).startsWith(addressKeyPrefix)) {
+					continue;
+				}
+
+				String val = (String) prop.get(key);
+
+				boolean isIpPort = p.matcher(val).matches();
+
+				if (!isIpPort) {
+					throw new IllegalArgumentException("ip 或 port 不合法");
+				}
+				String[] ipAndPort = val.split(":");
+
+				HostAndPort hap = new HostAndPort(ipAndPort[0], Integer.parseInt(ipAndPort[1]));
+				haps.add(hap);
+			}
+
+			return haps;
+		} catch (IllegalArgumentException ex) {
+			throw ex;
+		} catch (Exception ex) {
+			throw new Exception("解析 jedis 配置文件失败", ex);
+		}
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		Set<HostAndPort> haps = this.parseHostAndPort();
+
+		jedisCluster = new JedisCluster(haps, timeout, maxRedirections, genericObjectPoolConfig);
+
+	}
+
+	public void setAddressConfig(Resource addressConfig) {
+		this.addressConfig = addressConfig;
+	}
+
+	public void setTimeout(int timeout) {
+		this.timeout = timeout;
+	}
+
+	public void setMaxRedirections(int maxRedirections) {
+		this.maxRedirections = maxRedirections;
+	}
+
+	public void setAddressKeyPrefix(String addressKeyPrefix) {
+		this.addressKeyPrefix = addressKeyPrefix;
+	}
+
+	public void setGenericObjectPoolConfig(GenericObjectPoolConfig genericObjectPoolConfig) {
+		this.genericObjectPoolConfig = genericObjectPoolConfig;
+	}
+}