diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e25dc67 --- /dev/null +++ b/.gitignore @@ -0,0 +1,96 @@ +# .gitignore for intellij,java,maven,windows,osx + +### Intellij ### +.idea +.idea_modules/ +/out/ +output/ + +####eclipse####### +.project +.classpath +.settings + +### log ### +logs/ +log/ +*.log + +*.iws +*.iml + +### Java ### +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties + +### Windows ### +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +### OSX ### +*~ +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Commitizen ### +node_modules/ +package.json diff --git a/IndexSearchService/IndexSearchService.iml b/IndexSearchService/IndexSearchService.iml deleted file mode 100644 index f9a6df4..0000000 --- a/IndexSearchService/IndexSearchService.iml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/IndexSearchService/README.md b/IndexSearchService/README.md deleted file mode 100644 index 25686cb..0000000 --- a/IndexSearchService/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# IndexSearchService -1. How to use Elasticsearch. -2. How to use Solr or Lucene to index and query data. - -中文详情（Chinese Details）： -* [Elasticsearch index and query data](http://www.cnblogs.com/luxiaoxun/p/4869509.html) -* [SQL to Elasticsearch Java Code](http://www.cnblogs.com/luxiaoxun/p/6826211.html) -* [Lucene index and query POI data](http://www.cnblogs.com/luxiaoxun/p/5020247.html) -* [Solr index and query MYSQL data](http://www.cnblogs.com/luxiaoxun/p/4442770.html) -* [Solr index and query GEO data](http://www.cnblogs.com/luxiaoxun/p/4477591.html) diff --git a/IndexSearchService/lib/lucene-analyzers-ik.jar b/IndexSearchService/lib/lucene-analyzers-ik.jar deleted file mode 100644 index d4ff268..0000000 Binary files a/IndexSearchService/lib/lucene-analyzers-ik.jar and /dev/null differ diff --git a/IndexSearchService/pom.xml b/IndexSearchService/pom.xml deleted file mode 100644 index 4ea429e..0000000 --- a/IndexSearchService/pom.xml +++ /dev/null @@ -1,213 +0,0 @@ - - 4.0.0 - - com.es.jdbc - ElasticsearchService - 0.0.1-SNAPSHOT - jar - - - - redshift - http://redshift-maven-repository.s3-website-us-east-1.amazonaws.com/release - - - - - UTF-8 - 5.3.1 - 5.2.1 - 2.8.6 - 2.7 - - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - - - mysql - mysql-connector-java - 6.0.5 - - - - com.zaxxer - HikariCP - 2.6.0 - - - - org.elasticsearch.client - transport - ${es.version} - - - - - org.apache.logging.log4j - log4j-api - ${log4j2.version} - - - org.apache.logging.log4j - log4j-core - ${log4j2.version} - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j2.version} - - - - junit - junit - 4.12 - test - - - - com.amazon.redshift - redshift-jdbc42 - 1.2.1.1001 - - - - - org.apache.lucene - lucene-core - ${lucene.version} - - - org.apache.lucene - lucene-queries - ${lucene.version} - - - org.apache.lucene - lucene-queryparser - ${lucene.version} - - - org.apache.lucene - lucene-analyzers-common - ${lucene.version} - - - org.apache.lucene - lucene-analyzers-smartcn - ${lucene.version} - - - org.apache.lucene - lucene-spatial - ${lucene.version} - - - - - org.locationtech.spatial4j - spatial4j - 0.6 - - - - - com.chenlb.mmseg4j - mmseg4j-core - 1.10.0 - - - com.chenlb.mmseg4j - mmseg4j-solr - 2.3.0 - - - - - org.apache.solr - solr-solrj - 5.2.1 - - - - - org.apache.httpcomponents - httpclient - 4.4.1 - - - org.apache.httpcomponents - httpcore - 4.4.1 - - - org.apache.httpcomponents - httpmime - 4.4.1 - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.1 - - - package - - shade - - - - - - com.luxx.main.DataTransferService - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.7 - 1.7 - - - - - - diff --git a/IndexSearchService/src/main/java/com/luxx/main/DataTransferService.java b/IndexSearchService/src/main/java/com/luxx/main/DataTransferService.java deleted file mode 100644 index 0ae1ed0..0000000 --- a/IndexSearchService/src/main/java/com/luxx/main/DataTransferService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.luxx.main; - -import com.luxx.service.RedshiftDataTransferEexcutor; - -public class DataTransferService { - - public static void main(String[] args) { - // MysqlDataTransferEexcutor exeEexcutor = new MysqlDataTransferEexcutor(); - // exeEexcutor.start(); - - RedshiftDataTransferEexcutor exeEexcutor = new RedshiftDataTransferEexcutor(); - exeEexcutor.start(); - } -} diff --git a/IndexSearchService/src/main/java/com/luxx/model/HotspotData.java b/IndexSearchService/src/main/java/com/luxx/model/HotspotData.java deleted file mode 100644 index 4d49bad..0000000 --- a/IndexSearchService/src/main/java/com/luxx/model/HotspotData.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.luxx.model; - -import java.io.Serializable; -import java.util.Date; - -public class HotspotData implements Serializable { - - private static final long serialVersionUID = -2132799122365334550L; - - private Long id; - private int seqNum; - private Date collectTime; - - private String imsi; - private String imei; - private String tmsi; - - private String srcLac; - private String deviceID; - private String teleOper; - private String ownArea; - private String teleSevenNum; - private String teleBrand; - - public Long getId() { - return id; - } - - public void setId(Long newId) { - id = newId; - } - - public int getSeqNum() { - return seqNum; - } - - public void setSeqNum(int newSeqNum) { - seqNum = newSeqNum; - } - - public Date getCollectTime() { - return collectTime; - } - - public void setCollectTime(Date newCollectTime) { - collectTime = newCollectTime; - } - - public String getImsi() { - return imsi; - } - - public void setImsi(String newImsi) { - imsi = newImsi; - } - - public String getImei() { - return imei; - } - - public void setImei(String newImei) { - imei = newImei; - } - - public String getTmsi() { - return tmsi; - } - - public void setTmsi(String newTmsi) { - tmsi = newTmsi; - } - - public String getSrcLac() { - return srcLac; - } - - public void setSrcLac(String newSrcLac) { - srcLac = newSrcLac; - } - - public String getDeviceID() { - return deviceID; - } - - public void setDeviceID(String newDeviceID) { - deviceID = newDeviceID; - } - - public String getTeleOper() { - return teleOper; - } - - public void setTeleOper(String newTeleOper) { - teleOper = newTeleOper; - } - - public String getOwnArea() { - return ownArea; - } - - public void setOwnArea(String newOwnArea) { - ownArea = newOwnArea; - } - - public String getTeleSevenNum() { - return teleSevenNum; - } - - public void setTeleSevenNum(String newTeleSevenNum) { - teleSevenNum = newTeleSevenNum; - } - - public String getTeleBrand() { - return teleBrand; - } - - public void setTeleBrand(String newTeleBrand) { - teleBrand = newTeleBrand; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (null == obj || !(obj instanceof HotspotData)) { - return false; - } - HotspotData hot = (HotspotData) obj; - - if (!imei.equals(hot.getImei())) - return false; - if (!imsi.equals(hot.getImsi())) - return false; - if (collectTime.getTime() != hot.getCollectTime().getTime()) - return false; - if (!deviceID.equals(hot.getDeviceID())) - return false; - return true; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((collectTime == null) ? 0 : collectTime.hashCode()); - result = prime * result + ((deviceID == null) ? 0 : deviceID.hashCode()); - result = prime * result + ((imei == null) ? 0 : imei.hashCode()); - result = prime * result + ((imsi == null) ? 0 : imsi.hashCode()); - return result; - } -} diff --git a/IndexSearchService/src/main/java/com/luxx/model/PoiData.java b/IndexSearchService/src/main/java/com/luxx/model/PoiData.java deleted file mode 100644 index 45cf4bd..0000000 --- a/IndexSearchService/src/main/java/com/luxx/model/PoiData.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.luxx.model; - -import java.io.Serializable; - -public class PoiData implements Serializable{ - - private static final long serialVersionUID = -3978597686509612192L; - - private long id; - - private String address; - - private double lat; - private double lng; - - public PoiData(){ - - } - - public PoiData(int id, String address, double lat, double lng){ - this.id= id; - this.address = address; - this.lat = lat; - this.lng = lng; - } - - public long getId() { - return id; - } - public void setId(long id) { - this.id = id; - } - - public String getAddress() { - return address; - } - public void setAddress(String address) { - this.address = address; - } - - public double getLat() { - return lat; - } - public void setLat(double lat) { - this.lat = lat; - } - - public double getLng() { - return lng; - } - public void setLng(double lng) { - this.lng = lng; - } - - - -} diff --git a/IndexSearchService/src/main/java/com/luxx/service/ElasticSearchClient.java b/IndexSearchService/src/main/java/com/luxx/service/ElasticSearchClient.java deleted file mode 100644 index 91e2803..0000000 --- a/IndexSearchService/src/main/java/com/luxx/service/ElasticSearchClient.java +++ /dev/null @@ -1,271 +0,0 @@ -package com.luxx.service; - -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.luxx.util.HostAndPort; -import com.luxx.util.PropertiesReader; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; -import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; -import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest; -import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse; -import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest; -import org.elasticsearch.action.bulk.BulkRequestBuilder; -import org.elasticsearch.action.index.IndexRequestBuilder; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.client.Requests; -import org.elasticsearch.client.transport.TransportClient; -import org.elasticsearch.cluster.ClusterState; -import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.cluster.metadata.MappingMetaData; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.transport.InetSocketTransportAddress; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.SearchHits; -import org.elasticsearch.search.aggregations.AggregationBuilder; -import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.search.aggregations.metrics.max.Max; -import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.transport.client.PreBuiltTransportClient; - -public class ElasticSearchClient { - - private static Logger log = LogManager.getLogger(ElasticSearchClient.class); - - // ES Client - private TransportClient client; - - private static class ElasticSearchClientHolder { - static final ElasticSearchClient instance = new ElasticSearchClient(); - } - - public static ElasticSearchClient getInstance() { - return ElasticSearchClientHolder.instance; - } - - private ElasticSearchClient() { - PropertiesReader reader = new PropertiesReader("/config.properties"); - String address = reader.getProperty("es.server.address"); - List hostAndPortList = parseHosts(address); - try { - if (hostAndPortList != null) { - for (HostAndPort hostAndPort : hostAndPortList) { - client = new PreBuiltTransportClient(Settings.EMPTY).addTransportAddress( - new InetSocketTransportAddress(InetAddress.getByName(hostAndPort.getHost()), - hostAndPort.getPort())); - } - } else { - log.error("No elasticsearch address found in config file."); - } - } catch (UnknownHostException e) { - log.error(e.getMessage()); - } - } - - private List parseHosts(String envHosts) { - if (envHosts != null && envHosts.length() > 0) { - String[] hostDefs = envHosts.split(","); - if (hostDefs != null && hostDefs.length >= 1) { - List envHostsAndPorts = new ArrayList(hostDefs.length); - for (String hostDef : hostDefs) { - String[] hostAndPortParts = HostAndPort.extractParts(hostDef); - if (hostAndPortParts != null && hostAndPortParts.length == 2) { - String host = hostAndPortParts[0]; - int port = 9300; - try { - port = Integer.parseInt(hostAndPortParts[1]); - } catch (final NumberFormatException nfe) { - log.warn("Parse elasticsearch port error. Using default 9300."); - } - envHostsAndPorts.add(new HostAndPort(host, port)); - } - } - return envHostsAndPorts; - } - } - return null; - } - - @SuppressWarnings("resource") - public ElasticSearchClient(String ipAddress, int port) { - try { - client = new PreBuiltTransportClient(Settings.EMPTY) - .addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(ipAddress), port)); - } catch (UnknownHostException e) { - log.error(e.getMessage()); - } - } - - public void close() { - if (client != null) { - client.close(); - } - } - - // Create Index - public void createIndex(String index) { - IndicesExistsResponse indicesExistsResponse = client.admin().indices() - .exists(new IndicesExistsRequest(new String[] { index })).actionGet(); - if (!indicesExistsResponse.isExists()) { - client.admin().indices().create(new CreateIndexRequest(index)).actionGet(); - } - } - - // Delete Index - public void deleteIndex(String index) { - IndicesExistsResponse indicesExistsResponse = client.admin().indices() - .exists(new IndicesExistsRequest(new String[] { index })).actionGet(); - if (indicesExistsResponse.isExists()) { - client.admin().indices().delete(new DeleteIndexRequest(index)).actionGet(); - } - } - - // Delete Type - public void deleteType(String index, String type) { - client.prepareDelete().setIndex(index).setType(type).execute().actionGet(); - } - - private boolean isMappingExist(String index, String type) { - ClusterState cs = client.admin().cluster().prepareState().setIndices(index).execute().actionGet().getState(); - // Check index metadata existence. - IndexMetaData imd = cs.getMetaData().index(index); - if (imd == null) { - return false; - } - // Check mapping metadata existence. - MappingMetaData mdd = imd.mapping(type); - if (mdd != null) { - return true; - } - return false; - } - - // Define type mapping - public void defineIndexTypeMapping(String index, String type, XContentBuilder mapBuilder) { - if (!isMappingExist(index, type)) { - PutMappingRequest putMappingRequest = Requests.putMappingRequest(index).type(type).source(mapBuilder); - client.admin().indices().putMapping(putMappingRequest).actionGet(); - } - } - - public BulkRequestBuilder getBulkRequest() { - return client.prepareBulk(); - } - - public IndexRequestBuilder getIndexRequest(String index, String type, String jsonSource) { - return client.prepareIndex(index, type).setSource(jsonSource); - } - - // Index data - public boolean indexData(String index, String type, String jsonSource) { - if (jsonSource != null) { - IndexRequestBuilder requestBuilder = client.prepareIndex(index, type); - requestBuilder.setSource(jsonSource).execute().actionGet(); - return true; - } - return false; - } - - // Get data - public List getSearchData(String index, String type, QueryBuilder queryBuilder, int size) { - List ids = new ArrayList<>(); - SearchResponse searchResponse = client.prepareSearch(index).setTypes(type).setQuery(queryBuilder).setSize(size) - .execute().actionGet(); - SearchHits searchHits = searchResponse.getHits(); - for (SearchHit searchHit : searchHits) { - Integer id = (Integer) searchHit.getSource().get("id"); - ids.add(id); - } - return ids; - } - - // Get data by scroll - public List getSearchDataByScrolls(String index, String type, QueryBuilder queryBuilder, int size) { - List ids = new ArrayList<>(); - SearchResponse scrollResp = client.prepareSearch(index).setTypes(type).setScroll(new TimeValue(60000)) - .setQuery(queryBuilder).setSize(size).execute().actionGet(); - while (true) { - for (SearchHit searchHit : scrollResp.getHits().getHits()) { - Integer id = (Integer) searchHit.getSource().get("id"); - ids.add(id); - } - scrollResp = client.prepareSearchScroll(scrollResp.getScrollId()).setScroll(new TimeValue(600000)).execute() - .actionGet(); - if (scrollResp.getHits().getHits().length == 0) { - break; - } - } - - return ids; - } - - // Get results of aggregation - public Map getAggSearchResult(String index, QueryBuilder queryBuilder, - AggregationBuilder aggregationBuilder, String aggName) { - Map resultsMap = new HashMap<>(); - SearchResponse searchResponse = client.prepareSearch(index).setQuery(queryBuilder) - .addAggregation(aggregationBuilder).execute().actionGet(); - Terms terms = searchResponse.getAggregations().get(aggName); - if (terms != null) { - for (Terms.Bucket entry : terms.getBuckets()) { - resultsMap.put(entry.getKey().toString(), String.valueOf(entry.getDocCount())); - } - } - - return resultsMap; - } - - public Map getSumAggSearchOrderResult(String index, QueryBuilder queryBuilder, - AggregationBuilder aggregationBuilder, String aggName, String subAggName) { - Map resultsMap = new HashMap<>(); - SearchResponse searchResponse = client.prepareSearch(index).setQuery(queryBuilder) - .addAggregation(aggregationBuilder).execute().actionGet(); - Terms terms = searchResponse.getAggregations().get(aggName); - if (terms != null) { - for (Terms.Bucket entry : terms.getBuckets()) { - String fieldName = entry.getKey().toString(); - // long fieldCount = entry.getDocCount(); - - Sum maxagg = entry.getAggregations().get(subAggName); - double fieldValue = maxagg.getValue(); - - // System.out.println(String.format("%s %s %s", fieldName, fieldCount, fieldValue)); - resultsMap.put(fieldName, String.valueOf(fieldValue)); - } - } - - return resultsMap; - } - - public Map getMaxAggSearchOrderResult(String index, QueryBuilder queryBuilder, - AggregationBuilder aggregationBuilder, String aggName, String subAggName) { - Map resultsMap = new HashMap<>(); - SearchResponse searchResponse = client.prepareSearch(index).setQuery(queryBuilder) - .addAggregation(aggregationBuilder).execute().actionGet(); - Terms terms = searchResponse.getAggregations().get(aggName); - if (terms != null) { - for (Terms.Bucket entry : terms.getBuckets()) { - String fieldName = entry.getKey().toString(); - // long fieldCount = entry.getDocCount(); - - Max maxagg = entry.getAggregations().get(subAggName); - double fieldValue = maxagg.getValue(); - - // System.out.println(String.format("%s %s %s", fieldName, fieldCount, fieldValue)); - resultsMap.put(fieldName, String.valueOf(fieldValue)); - } - } - - return resultsMap; - } - -} diff --git a/IndexSearchService/src/main/java/com/luxx/service/MysqlIndexService.java b/IndexSearchService/src/main/java/com/luxx/service/MysqlIndexService.java deleted file mode 100644 index 9b24e88..0000000 --- a/IndexSearchService/src/main/java/com/luxx/service/MysqlIndexService.java +++ /dev/null @@ -1,261 +0,0 @@ -package com.luxx.service; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.elasticsearch.action.bulk.BulkItemResponse; -import org.elasticsearch.action.bulk.BulkRequestBuilder; -import org.elasticsearch.action.bulk.BulkResponse; -import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.aggregations.AggregationBuilders; -import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; -import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; -import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; - -import com.luxx.model.HotspotData; - -public class MysqlIndexService { - private static Logger log = LogManager.getLogger(MysqlIndexService.class); - - private ElasticSearchClient client = ElasticSearchClient.getInstance(); - - // Index Name - private static final String Index = "hotspot"; - // Type Name - private static final String Type = "hotspotdata"; - - // Field Name - private static final String TimeFieldName = "CollectTime"; - private static final String IDFieldName = "id"; - private static final String IMSIFieldName = "IMSI"; - private static final String IMEIFieldName = "IMEI"; - private static final String DeviceIDFieldName = "DeviceID"; - private static final String OwnAreaFieldName = "OwnArea"; - private static final String TeleOperFieldName = "TeleOper"; - private static final String SeqNumFieldName = "SeqNum"; - - private static final String DateFormat = "yyyy-MM-dd HH:mm:ss"; - - public void close() { - client.close(); - } - - public void deleteIndex() { - client.deleteIndex(Index); - } - - public void createIndex() { - client.createIndex(Index); - } - - public void defineIndexTypeMapping() { - XContentBuilder mapBuilder = prepareMappingBuilder(); - client.defineIndexTypeMapping(Index, Type, mapBuilder); - } - - public XContentBuilder prepareMappingBuilder() { - XContentBuilder mapBuilder = null; - try { - mapBuilder = XContentFactory.jsonBuilder(); - mapBuilder.startObject().startObject(Type).startObject("properties").startObject(IDFieldName) - .field("type", "long").field("include_in_all", "false").endObject().startObject(SeqNumFieldName) - .field("type", "long").field("include_in_all", "false").endObject().startObject(IMSIFieldName) - .field("type", "text").field("index", "not_analyzed").field("include_in_all", "false").endObject() - .startObject(IMEIFieldName).field("type", "text").field("index", "not_analyzed") - .field("include_in_all", "false").endObject().startObject(DeviceIDFieldName).field("type", "text") - .field("index", "not_analyzed").field("include_in_all", "false").endObject() - .startObject(OwnAreaFieldName).field("type", "text").field("index", "not_analyzed") - .field("include_in_all", "false").endObject().startObject(TeleOperFieldName).field("type", "text") - .field("index", "not_analyzed").field("include_in_all", "false").endObject() - .startObject(TimeFieldName).field("type", "date").field("format", DateFormat) - .field("include_in_all", "false").endObject().endObject().endObject().endObject(); - } catch (IOException e) { - log.error(e); - } - - return mapBuilder; - } - - //https://stackoverflow.com/questions/27427613/elasticsearch-java-api-putmapping-from-json-file-error - public static XContentBuilder builderFromJson(String json) throws JsonParseException, JsonMappingException, IOException{ - Map map = new ObjectMapper().readValue(json, new TypeReference>(){}); - return XContentFactory.jsonBuilder().map(map); - } - - // 得到索引字符串 - public String getIndexDataFromHotspotData(HotspotData data) { - String jsonString = null; - if (data != null) { - try { - XContentBuilder jsonBuilder = XContentFactory.jsonBuilder(); - jsonBuilder.startObject().field(IDFieldName, data.getId()).field(SeqNumFieldName, data.getSeqNum()) - .field(IMSIFieldName, data.getImsi()).field(IMEIFieldName, data.getImei()) - .field(DeviceIDFieldName, data.getDeviceID()).field(OwnAreaFieldName, data.getOwnArea()) - .field(TeleOperFieldName, data.getTeleOper()).field(TimeFieldName, data.getCollectTime()) - .endObject(); - jsonString = jsonBuilder.string(); - } catch (IOException e) { - log.error(e); - } - } - - return jsonString; - } - - // Index data in bulk - public void indexHotSpotDataList(List dataList) { - if (dataList != null) { - int size = dataList.size(); - if (size > 0) { - BulkRequestBuilder bulkRequest = client.getBulkRequest(); - for (int i = 0; i < size; ++i) { - HotspotData data = dataList.get(i); - String jsonSource = getIndexDataFromHotspotData(data); - if (jsonSource != null) { - bulkRequest.add(client.getIndexRequest(Index, Type, jsonSource)); - } - } - - BulkResponse bulkResponse = bulkRequest.execute().actionGet(); - if (bulkResponse.hasFailures()) { - Iterator iter = bulkResponse.iterator(); - while (iter.hasNext()) { - BulkItemResponse itemResponse = iter.next(); - if (itemResponse.isFailed()) { - log.error(itemResponse.getFailureMessage()); - } - } - } - } - } - } - - // Build query based on device List - private QueryBuilder getDeviceQueryBuilder(List deviceList) { - QueryBuilder deviceQueryBuilder = QueryBuilders.matchAllQuery(); - if (deviceList != null && deviceList.size() > 0) { - deviceQueryBuilder = QueryBuilders.termsQuery(DeviceIDFieldName, deviceList); - } - return deviceQueryBuilder; - } - - // Build date time range query - private QueryBuilder getDateRangeQueryBuilder(String startTime, String endTime) { - QueryBuilder rangeBuilder = QueryBuilders.matchAllQuery(); - if (startTime != null && endTime != null) { - rangeBuilder = QueryBuilders.rangeQuery(TimeFieldName).from(startTime).to(endTime).format(DateFormat); - } - - return rangeBuilder; - } - - // Get result from startTime to endTime - public List getSearchResultBetweenTime(String startTime, String endTime) { - QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); - return client.getSearchDataByScrolls(Index, Type, rangeBuilder, 1000000); - } - - // Get count histogram based on date from startTime to endTime - public Map getDeviceDateFacetDistributeInfo(String startTime, String endTime, - List deviceList, final String gap) { - - Map resultsMap = new HashMap<>(); - QueryBuilder deviceQueryBuilder = getDeviceQueryBuilder(deviceList); - QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); - QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(deviceQueryBuilder).must(rangeBuilder); - - DateHistogramAggregationBuilder aggregation = AggregationBuilders.dateHistogram("dateagg").field(TimeFieldName) - .dateHistogramInterval(DateHistogramInterval.YEAR); - switch (gap) { - case "Quarter": - aggregation = AggregationBuilders.dateHistogram("dateagg").field(TimeFieldName) - .dateHistogramInterval(DateHistogramInterval.QUARTER); - break; - case "Month": - aggregation = AggregationBuilders.dateHistogram("dateagg").field(TimeFieldName) - .dateHistogramInterval(DateHistogramInterval.MONTH); - break; - case "Week": - aggregation = AggregationBuilders.dateHistogram("dateagg").field(TimeFieldName) - .dateHistogramInterval(DateHistogramInterval.WEEK); - break; - case "Day": - aggregation = AggregationBuilders.dateHistogram("dateagg").field(TimeFieldName) - .dateHistogramInterval(DateHistogramInterval.DAY); - break; - } - - resultsMap = client.getAggSearchResult(Index, queryBuilder, aggregation, "dateagg"); - return resultsMap; - } - - // Get count aggregation based on device from startTime to endTime - public Map getDeviceDistributedInfo(String startTime, String endTime, List deviceList) { - - Map resultsMap = new HashMap<>(); - - QueryBuilder deviceQueryBuilder = getDeviceQueryBuilder(deviceList); - QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); - QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(deviceQueryBuilder).must(rangeBuilder); - - TermsAggregationBuilder termsBuilder = AggregationBuilders.terms("DeviceIDAgg").size(Integer.MAX_VALUE) - .field(DeviceIDFieldName); - resultsMap = client.getAggSearchResult(Index, queryBuilder, termsBuilder, "DeviceIDAgg"); - return resultsMap; - } - - // Get count aggregation based on OwnArea from startTime to endTime - public Map getOwnAreaDistributeInfo(String startTime, String endTime, List deviceList, - String provinceName, String cityName) { - Map resultsMap = new HashMap<>(); - - QueryBuilder deviceQueryBuilder = getDeviceQueryBuilder(deviceList); - QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); - - QueryBuilder areaFieldQueryBuilder = QueryBuilders.matchAllQuery(); - if (provinceName != null && !provinceName.isEmpty()) { - if (cityName != null && !cityName.isEmpty()) { - areaFieldQueryBuilder = QueryBuilders.termQuery(OwnAreaFieldName, provinceName + " " + cityName); - } else { - areaFieldQueryBuilder = QueryBuilders.prefixQuery(OwnAreaFieldName, provinceName); - } - } - - QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(deviceQueryBuilder).must(rangeBuilder) - .must(areaFieldQueryBuilder); - - TermsAggregationBuilder termsBuilder = AggregationBuilders.terms("OwnFieldAgg").size(Integer.MAX_VALUE) - .field(OwnAreaFieldName); - - resultsMap = client.getAggSearchResult(Index, queryBuilder, termsBuilder, "OwnFieldAgg"); - return resultsMap; - } - - // Get count aggregation based on TeleOper from startTime to endTime - public Map getTeleOperDistributeInfo(String startTime, String endTime, List deviceList) { - Map resultsMap = new HashMap<>(); - - QueryBuilder deviceQueryBuilder = getDeviceQueryBuilder(deviceList); - QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); - - QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(deviceQueryBuilder).must(rangeBuilder); - - TermsAggregationBuilder termsBuilder = AggregationBuilders.terms("TelOperFieldAgg").size(Integer.MAX_VALUE) - .field(TeleOperFieldName); - - resultsMap = client.getAggSearchResult(Index, queryBuilder, termsBuilder, "TelOperFieldAgg"); - return resultsMap; - } -} diff --git a/IndexSearchService/src/main/java/com/luxx/service/PoiIndexExecutor.java b/IndexSearchService/src/main/java/com/luxx/service/PoiIndexExecutor.java deleted file mode 100644 index 166ff10..0000000 --- a/IndexSearchService/src/main/java/com/luxx/service/PoiIndexExecutor.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.luxx.service; - -import com.luxx.model.PoiData; -import com.luxx.util.DataSourceUtil; -import com.luxx.util.PropertiesUtil; -import org.slf4j.Logger; - -import java.io.IOException; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.List; - - -public class PoiIndexExecutor { - - private static Logger log = org.slf4j.LoggerFactory - .getLogger(PoiIndexExecutor.class); - - private PoiIndexService indexService; - - // 读取数据分页 - private long pageNum = 0; - private int pageCount = 30000; - - private String dataTableName; - - public PoiIndexExecutor() { - this.dataTableName = PropertiesUtil.getInstance().getProperty( - "mysql.database.data"); - } - - public void start() throws IOException { - log.info("开始数据迁移服务......"); - - indexService = new PoiIndexService(); - indexService.clear(); - - Thread exportThread = new Thread(new Runnable() { - public void run() { - boolean isRunning = true; - while (isRunning) { - List dataList = getDataFromOldDataBase(); - if (dataList == null || dataList.isEmpty()) { - isRunning = false; // 读取完毕 - log.info("数据迁移服务完成......"); - break; - } - int len = dataList.size(); - indexService.indexPoiDataList(dataList); - System.out.println("索引热点数据最大ID："+dataList.get(len - 1).getId()); - } - } - }); - exportThread.start(); - } - - private List getDataFromOldDataBase() { - List dataList = new ArrayList(pageCount); - Connection dbConnection = null; - Statement stm = null; - ResultSet res = null; - try { - dbConnection = DataSourceUtil.getConnection(); - if (dbConnection != null) { - stm = dbConnection.createStatement(); - ++pageNum; - long startNum = (pageNum - 1) * pageCount; - res = stm.executeQuery(String.format( - "SELECT * FROM %s LIMIT %s,%s ", dataTableName, - startNum, pageCount)); - if (res != null) { - while (res.next()) { - PoiData data = new PoiData(); - data.setId(res.getInt("BaseStationId")); - data.setAddress(res.getString("Address")); - data.setLat(res.getDouble("Latitude")); - data.setLng(res.getDouble("Longitude")); - dataList.add(data); - } - } - } else { - log.error("获取数据库连接失败！"); - return null; - } - } catch (SQLException e) { - e.printStackTrace(); - log.error(e.toString()); - } finally { - attemptClose(res); - attemptClose(stm); - attemptClose(dbConnection); - } - - return dataList; - } - - private void attemptClose(ResultSet o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } - } - - private void attemptClose(Statement o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } - } - - private void attemptClose(Connection o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } - } - -} diff --git a/IndexSearchService/src/main/java/com/luxx/service/PoiIndexService.java b/IndexSearchService/src/main/java/com/luxx/service/PoiIndexService.java deleted file mode 100644 index 1fcc2db..0000000 --- a/IndexSearchService/src/main/java/com/luxx/service/PoiIndexService.java +++ /dev/null @@ -1,355 +0,0 @@ -package com.luxx.service; - -import com.luxx.model.PoiData; -import org.apache.lucene.analysis.cn.smart.SmartChineseAnalyzer; -import org.apache.lucene.document.*; -import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.queries.function.ValueSource; -import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.search.*; -import org.apache.lucene.spatial.SpatialStrategy; -import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy; -import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree; -import org.apache.lucene.spatial.prefix.tree.SpatialPrefixTree; -import org.apache.lucene.spatial.query.SpatialArgs; -import org.apache.lucene.spatial.query.SpatialOperation; -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.SimpleFSDirectory; -import org.apache.lucene.util.QueryBuilder; -import org.locationtech.spatial4j.context.SpatialContext; -import org.locationtech.spatial4j.distance.DistanceUtils; -import org.locationtech.spatial4j.shape.Point; -import org.locationtech.spatial4j.shape.Shape; -import org.slf4j.Logger; - -import java.io.IOException; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.List; - -public class PoiIndexService { - - private static Logger log = org.slf4j.LoggerFactory - .getLogger(PoiIndexService.class); - - private String indexPath = "D:/IndexPoiData"; - private IndexWriter indexWriter = null; - -// private IKAnalyzer analyzer = new IKAnalyzer(true); - private SmartChineseAnalyzer analyzer = new SmartChineseAnalyzer(true); - - private DirectoryReader ireader = null; - private Directory directory = null; - - // Spatial index and search - private SpatialContext ctx; - private SpatialStrategy strategy; - - // Field Name - private static final String IDFieldName = "id"; - private static final String AddressFieldName = "address"; - private static final String LatFieldName = "lat"; - private static final String LngFieldName = "lng"; - private static final String GeoFieldName = "geoField"; - - private final int maxResultCount = 100; - - public PoiIndexService() throws IOException { - init(); - } - - public PoiIndexService(String indexPath) throws IOException { - this.indexPath = indexPath; - init(); - } - - protected void init() throws IOException { - directory = new SimpleFSDirectory(Paths.get(indexPath)); - IndexWriterConfig config = new IndexWriterConfig(analyzer); - config.setOpenMode(OpenMode.CREATE_OR_APPEND); - indexWriter = new IndexWriter(directory, config); - - // Typical geospatial context - // These can also be constructed from SpatialContextFactory - ctx = SpatialContext.GEO; - int maxLevels = 11; // results in sub-meter precision for geohash - // This can also be constructed from SpatialPrefixTreeFactory - SpatialPrefixTree grid = new GeohashPrefixTree(ctx, maxLevels); - strategy = new RecursivePrefixTreeStrategy(grid, GeoFieldName); - } - - private IndexSearcher getIndexSearcher() { - try { - if (ireader == null) { - ireader = DirectoryReader.open(directory); - } else { - // if the index was changed since the provided reader was - // opened, open and return a new reader; - // else return null - DirectoryReader directoryReader = DirectoryReader - .openIfChanged(ireader); - if (directoryReader != null) { - ireader.close(); // 关闭原reader - ireader = directoryReader; // 赋予新reader - } - } - return new IndexSearcher(ireader); - } - catch (Exception e) { - log.error(e.toString()); - } - return null; // 发生异常则返回null - } - - public boolean indexPoiData(PoiData data) { - try { - if(data!=null){ - Document doc = new Document(); - doc.add(new LongField(IDFieldName, data.getId(), Field.Store.YES)); - doc.add(new DoubleField(LatFieldName, data.getLat(), Field.Store.YES)); - doc.add(new DoubleField(LngFieldName, data.getLng(), Field.Store.YES)); - doc.add(new TextField(AddressFieldName, data.getAddress(), Field.Store.YES)); - Point point = ctx.makePoint(data.getLng(),data.getLat()); - for (Field f : strategy.createIndexableFields(point)) { - doc.add(f); - } - //doc.add(new StoredField(strategy.getFieldName(), point.getX()+" "+point.getY())); - indexWriter.addDocument(doc); - } - return false; - } catch (Exception e) { - log.error(e.toString()); - return false; - } - } - - public boolean indexPoiDataList(List dataList) { - try { - if (dataList != null && dataList.size() > 0) { - List docs = new ArrayList<>(); - for (PoiData data : dataList) { - Document doc = new Document(); - doc.add(new LongField(IDFieldName, data.getId(), Field.Store.YES)); - doc.add(new DoubleField(LatFieldName, data.getLat(), Field.Store.YES)); - doc.add(new DoubleField(LngFieldName, data.getLng(), Field.Store.YES)); - doc.add(new TextField(AddressFieldName, data.getAddress(), Field.Store.YES)); - Point point = ctx.makePoint(data.getLng(),data.getLat()); - for (Field f : strategy.createIndexableFields(point)) { - doc.add(f); - } - docs.add(doc); - } - indexWriter.addDocuments(docs); - indexWriter.commit(); - return true; - } - return false; - } catch (Exception e) { - log.error(e.toString()); - return false; - } - } - - private void printDocs(ScoreDoc[] scoreDocs, IndexSearcher indexSearcher) { - if (scoreDocs != null) { - System.out.println("总数：" + scoreDocs.length); - for (int i = 0; i < scoreDocs.length; i++) { - try { - Document hitDoc = indexSearcher.doc(scoreDocs[i].doc); - System.out.print(hitDoc.get(IDFieldName)); - System.out.print(" " + hitDoc.get(LngFieldName)); - System.out.print(" " + hitDoc.get(LatFieldName)); - System.out.println(" " + hitDoc.get(AddressFieldName)); - } catch (IOException e) { - log.error(e.toString()); - } - } - } - } - - private List getPoiDatasFromDoc(ScoreDoc[] scoreDocs, IndexSearcher indexSearcher){ - List datas = new ArrayList<>(); - if (scoreDocs != null) { - //System.out.println("总数：" + scoreDocs.length); - for (int i = 0; i < scoreDocs.length; i++) { - try { - Document hitDoc = indexSearcher.doc(scoreDocs[i].doc); - PoiData data = new PoiData(); - data.setId(Long.parseLong((hitDoc.get(IDFieldName)))); - data.setLng(Double.parseDouble(hitDoc.get(LngFieldName))); - data.setLat(Double.parseDouble(hitDoc.get(LatFieldName))); - data.setAddress(hitDoc.get(AddressFieldName)); - datas.add(data); - } catch (IOException e) { - log.error(e.toString()); - } - } - } - - return datas; - } - - private int doQuery(Query query, IndexSearcher indexSearcher){ - TopDocs hits = null; - try { - hits = indexSearcher.search(query, maxResultCount); - } catch (IOException e) { - log.error(e.toString()); - } - if (hits != null) { - ScoreDoc[] scoreDocs = hits.scoreDocs; - printDocs(scoreDocs,indexSearcher); - return scoreDocs.length; - } - return 0; - } - - public int searchPoiData(String queryText) { - IndexSearcher indexSearcher = getIndexSearcher(); - if(indexSearcher != null){ - QueryBuilder builder = new QueryBuilder(analyzer); - Query query = builder.createPhraseQuery(AddressFieldName, queryText); - return doQuery(query,indexSearcher); - } - - return -1; - } - - public int searchPoiDataById(long id) { - IndexSearcher indexSearcher = getIndexSearcher(); - if(indexSearcher != null){ - Query query = NumericRangeQuery.newLongRange(IDFieldName, id, id, true, true); - return doQuery(query,indexSearcher); - } - - return -1; - } - - public List searchPoiInRectangle(double minLng, double minLat, - double maxLng, double maxLat) { - List results = new ArrayList<>(); - IndexSearcher indexSearcher = getIndexSearcher(); - if (indexSearcher != null) { - Point lowerLeftPoint = ctx.makePoint(minLng, minLat); - Point upperRightPoint = ctx.makePoint(maxLng, maxLat); - Shape rect = ctx.makeRectangle(lowerLeftPoint, upperRightPoint); - SpatialArgs args = new SpatialArgs(SpatialOperation.Intersects, rect); - Query query = strategy.makeQuery(args); - TopDocs docs = null; - try { - docs = indexSearcher.search(query, maxResultCount); - } catch (IOException e) { - log.error(e.toString()); - } - - if (docs != null) { - ScoreDoc[] scoreDocs = docs.scoreDocs; - //printDocs(scoreDocs, indexSearcher); - results = getPoiDatasFromDoc(scoreDocs, indexSearcher); - } - } - - return results; - } - - public List searchPoiInCircle(double lng, double lat, double radius) { - List results = new ArrayList<>(); - IndexSearcher indexSearcher = getIndexSearcher(); - if (indexSearcher != null) { - Shape circle = ctx.makeCircle(lng, lat, DistanceUtils.dist2Degrees( - radius, DistanceUtils.EARTH_MEAN_RADIUS_KM)); - SpatialArgs args = new SpatialArgs(SpatialOperation.Intersects, - circle); - Query query = strategy.makeQuery(args); - Point pt = ctx.makePoint(lng, lat); - ValueSource valueSource = strategy.makeDistanceValueSource(pt, - DistanceUtils.DEG_TO_KM);// the distance (in km) - Sort distSort = null; - TopDocs docs = null; - try { - // false = asc dist - distSort = new Sort(valueSource.getSortField(false)) - .rewrite(indexSearcher); - docs = indexSearcher.search(query, maxResultCount, distSort); - } catch (IOException e) { - log.error(e.toString()); - } - - if (docs != null) { - ScoreDoc[] scoreDocs = docs.scoreDocs; - //printDocs(scoreDocs, indexSearcher); - results = getPoiDatasFromDoc(scoreDocs, indexSearcher); - } - } - - return results; - } - - public List searchPoiByRangeAndAddress(double lng, double lat, - double range, String address) { - List results = new ArrayList<>(); - IndexSearcher indexSearcher = getIndexSearcher(); - if (indexSearcher != null) { - SpatialArgs args = new SpatialArgs(SpatialOperation.Intersects, - ctx.makeCircle(lng, lat, DistanceUtils.dist2Degrees(range, - DistanceUtils.EARTH_MEAN_RADIUS_KM))); - Query geoQuery = strategy.makeQuery(args); - - QueryBuilder builder = new QueryBuilder(analyzer); - Query addQuery = builder.createPhraseQuery(AddressFieldName, - address); - - BooleanQuery.Builder boolBuilder = new BooleanQuery.Builder(); - boolBuilder.add(addQuery, Occur.SHOULD); - boolBuilder.add(geoQuery, Occur.MUST); - - Query query = boolBuilder.build(); - - TopDocs docs = null; - try { - docs = indexSearcher.search(query, maxResultCount); - } catch (IOException e) { - log.error(e.toString()); - } - - if (docs != null) { - ScoreDoc[] scoreDocs = docs.scoreDocs; - //printDocs(scoreDocs, indexSearcher); - results = getPoiDatasFromDoc(scoreDocs, indexSearcher); - } - } - return results; - } - - public void stop() { - if (indexWriter != null) { - try { - indexWriter.close(); - } catch (IOException e) { - log.error(e.toString()); - } - } - - if(ireader!=null){ - try { - ireader.close(); - } catch (IOException e) { - log.error(e.toString()); - } - } - } - - public void clear(){ - if (indexWriter != null) { - try { - indexWriter.deleteAll(); - } catch (IOException e) { - log.error(e.toString()); - } - } - } - -} diff --git a/IndexSearchService/src/main/java/com/luxx/service/RedshiftIndexService.java b/IndexSearchService/src/main/java/com/luxx/service/RedshiftIndexService.java deleted file mode 100644 index e5c5704..0000000 --- a/IndexSearchService/src/main/java/com/luxx/service/RedshiftIndexService.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.luxx.service; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.elasticsearch.action.bulk.BulkItemResponse; -import org.elasticsearch.action.bulk.BulkRequestBuilder; -import org.elasticsearch.action.bulk.BulkResponse; -import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.aggregations.AggregationBuilders; -import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; -import org.elasticsearch.search.aggregations.bucket.terms.Terms.Order; - -import com.luxx.model.EndpointData; - -public class RedshiftIndexService { - - private static Logger log = LogManager.getLogger(RedshiftIndexService.class); - - private ElasticSearchClient client = ElasticSearchClient.getInstance(); - - // Index Name - private static final String Index = "endpoint"; - // Type Name - private static final String Type = "endpointdata"; - - private static final String DateFormat = "yyyy-MM-dd HH:mm:ss"; - - public void close() { - client.close(); - } - - public void deleteIndex() { - client.deleteIndex(Index); - } - - public void createIndex() { - client.createIndex(Index); - } - - public void defineIndexTypeMapping() { - XContentBuilder mapBuilder = prepareMappingBuilder(); - client.defineIndexTypeMapping(Index, Type, mapBuilder); - } - - public XContentBuilder prepareMappingBuilder() { - XContentBuilder mapBuilder = null; - try { - mapBuilder = XContentFactory.jsonBuilder(); - mapBuilder.startObject().startObject(Type).startObject("properties").startObject("org_id") - .field("type", "integer").field("include_in_all", "false").endObject().startObject("endpoint_id") - .field("type", "long").field("include_in_all", "false").endObject().startObject("ds_bytes") - .field("type", "long").field("include_in_all", "false").endObject().startObject("ds_max_bps") - .field("type", "double").field("include_in_all", "false").endObject().startObject("ds_avg_bps") - .field("type", "double").field("include_in_all", "false").endObject().startObject("ds_mwt") - .field("type", "integer").field("include_in_all", "false").endObject().startObject("us_bytes") - .field("type", "long").field("include_in_all", "false").endObject().startObject("us_max_bps") - .field("type", "double").field("include_in_all", "false").endObject().startObject("us_avg_bps") - .field("type", "double").field("include_in_all", "false").endObject().startObject("us_mwt") - .field("type", "integer").field("include_in_all", "false").endObject().startObject("date_time") - .field("type", "date").field("include_in_all", "false").field("format", DateFormat).endObject().endObject() - .endObject().endObject(); - } catch (IOException e) { - log.error(e); - } - - return mapBuilder; - } - - public String getIndexDataFromHotspotDataForRedshift(EndpointData data) { - String jsonString = null; - if (data != null) { - try { - XContentBuilder jsonBuilder = XContentFactory.jsonBuilder(); - jsonBuilder.startObject().field("org_id", data.getOrg_id()).field("endpoint_id", data.getEndpoint_id()) - .field("ds_bytes", data.getDs_bytes()).field("ds_max_bps", data.getDs_max_bytes()) - .field("ds_avg_bps", data.getDs_avg_bytes()).field("ds_mwt", data.getDs_mwt()) - .field("us_bytes", data.getUs_bytes()).field("us_max_bps", data.getUs_max_bytes()) - .field("us_avg_bps", data.getUs_avg_bytes()).field("us_mwt", data.getUs_mwt()) - .field("date_time", data.getDate_time()).endObject(); - jsonString = jsonBuilder.string(); - } catch (IOException e) { - log.error(e); - } - } - - return jsonString; - } - - // Index data in bulk - public void indexHotSpotDataListForRedshift(List dataList) { - if (dataList != null) { - int size = dataList.size(); - if (size > 0) { - BulkRequestBuilder bulkRequest = client.getBulkRequest(); - for (int i = 0; i < size; ++i) { - EndpointData data = dataList.get(i); - String jsonSource = getIndexDataFromHotspotDataForRedshift(data); - if (jsonSource != null) { - bulkRequest.add(client.getIndexRequest(Index, Type, jsonSource)); - } - } - - BulkResponse bulkResponse = bulkRequest.execute().actionGet(); - if (bulkResponse.hasFailures()) { - Iterator iter = bulkResponse.iterator(); - while (iter.hasNext()) { - BulkItemResponse itemResponse = iter.next(); - if (itemResponse.isFailed()) { - log.error(itemResponse.getFailureMessage()); - } - } - } - } - } - } - - private QueryBuilder getDateRangeQueryBuilder(String startTime, String endTime) { - QueryBuilder rangeBuilder = QueryBuilders.matchAllQuery(); - - if (startTime != null && endTime != null) { - rangeBuilder = QueryBuilders.rangeQuery("date_time").from(startTime).to(endTime).format(DateFormat); - } - - return rangeBuilder; - } - - // Get top N endpoint_id based on sum of usage(ds_bytes) from startTime to endTime - public Map getTopNEndpointUsage(String startTime, String endTime, int orgId, int topN) { - Map resultsMap = new HashMap<>(); - - QueryBuilder orgIdQueryBuilder = QueryBuilders.termQuery("org_id", orgId); - QueryBuilder endpointIdFilterBuilder = QueryBuilders.termQuery("endpoint_id", 0); - QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); - QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(orgIdQueryBuilder).must(rangeBuilder) - .mustNot(endpointIdFilterBuilder); - TermsAggregationBuilder termsBuilder = AggregationBuilders.terms("endpointUsageAgg").field("endpoint_id") - .size(topN); - termsBuilder.subAggregation(AggregationBuilders.sum("sum_usage").field("ds_bytes")); - termsBuilder.order(Order.aggregation("sum_usage", false)); - - resultsMap = client.getSumAggSearchOrderResult(Index, queryBuilder, termsBuilder, "endpointUsageAgg", "sum_usage"); - - return resultsMap; - } - - // Get endpoint_id and max_bps based on query from startTime to endTime - public Map getEndpointMaxbps(String startTime, String endTime, int orgId) { - Map resultsMap = new HashMap<>(); - - QueryBuilder orgIdQueryBuilder = QueryBuilders.termQuery("org_id", orgId); - QueryBuilder endpointIdFilterBuilder = QueryBuilders.termQuery("endpoint_id", 0); - QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); - QueryBuilder maxBpsRangeBuilder = QueryBuilders.rangeQuery("ds_max_bps").from(4000000); - QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(orgIdQueryBuilder).must(rangeBuilder) - .mustNot(endpointIdFilterBuilder).must(maxBpsRangeBuilder); - TermsAggregationBuilder termsBuilder = AggregationBuilders.terms("endpointMaxAgg").field("endpoint_id").size(Integer.MAX_VALUE); - termsBuilder.subAggregation(AggregationBuilders.max("max_bps").field("ds_max_bps")); - - resultsMap = client.getMaxAggSearchOrderResult(Index, queryBuilder, termsBuilder, "endpointMaxAgg", "max_bps"); - - return resultsMap; - } - -} diff --git a/IndexSearchService/src/main/java/com/luxx/service/SolrIndexService.java b/IndexSearchService/src/main/java/com/luxx/service/SolrIndexService.java deleted file mode 100644 index 72a44e9..0000000 --- a/IndexSearchService/src/main/java/com/luxx/service/SolrIndexService.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.luxx.service; - -import com.luxx.model.PoiData; -import org.apache.solr.client.solrj.SolrClient; -import org.apache.solr.client.solrj.SolrQuery; -import org.apache.solr.client.solrj.SolrServerException; -import org.apache.solr.client.solrj.impl.HttpSolrClient; -import org.apache.solr.client.solrj.response.QueryResponse; -import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.SolrDocumentList; -import org.apache.solr.common.SolrInputDocument; -import org.slf4j.Logger; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -public class SolrIndexService { - private static Logger log = org.slf4j.LoggerFactory - .getLogger(SolrIndexService.class); - - private SolrClient solrClient = null; - - private final String DEFAULT_URL = "http://localhost:8983/solr/geo_core"; - - public SolrIndexService() { - solrClient = new HttpSolrClient(DEFAULT_URL); - } - - // Field Name - private static final String IDFieldName = "id"; - private static final String AddressFieldName = "address"; - private static final String LatFieldName = "lat"; - private static final String LngFieldName = "lng"; - private static final String GeoFieldName = "geoField"; - - // 添加POI数据到Solr索引中 - public void indexPoiDataList(List dataList) { - Collection docList = new ArrayList(); - for (PoiData data : dataList) { - SolrInputDocument doc = new SolrInputDocument(); - doc.addField(IDFieldName, data.getId()); - doc.addField(AddressFieldName, data.getAddress()); - doc.addField(LatFieldName, data.getLat()); - doc.addField(LngFieldName, data.getLng()); - String posString = data.getLng() + " " + data.getLat(); - doc.addField(GeoFieldName, posString); - docList.add(doc); - } - try { - solrClient.add(docList); - solrClient.commit(); - } catch (SolrServerException e) { - log.error(e.toString()); - } catch (IOException e) { - log.error(e.toString()); - } - } - - public List getDataInCircle(double lng, double lat, double radius){ - List results = new ArrayList<>();; - SolrQuery params = new SolrQuery(); - params.set("q", "*:*"); - params.set("fq", "{!geofilt}"); //距离过滤函数 - String centerStr = String.valueOf(lng)+" "+String.valueOf(lat); - params.set("pt", centerStr); - params.set("sfield", GeoFieldName); //经纬度的字段 - params.set("d", String.valueOf(radius)); //就近 d km 的所有数据 - params.set("sort", "geodist() asc"); //根据距离排序：由近到远 - params.set("start", "0"); //记录开始位置 - params.set("rows", "100"); //查询的行数 - params.set("fl", "*,_dist_:geodist(),score"); - - results = getQueryResult(params); - - return results; - } - - public List getDataInCircleByAddress(double lng, double lat, double radius, String address){ - List results = new ArrayList<>(); - SolrQuery params = new SolrQuery(); - params.set("q", AddressFieldName+":"+address); - params.set("fq", "{!geofilt}"); //距离过滤函数 - String centerStr = String.valueOf(lng)+" "+String.valueOf(lat); - params.set("pt", centerStr); - params.set("sfield", GeoFieldName); //经纬度的字段 - params.set("d", String.valueOf(radius)); //就近 d km 的所有数据 - params.set("sort", "geodist() asc"); //根据距离排序：由近到远 - params.set("start", "0"); //记录开始位置 - params.set("rows", "100"); //查询的行数 - params.set("fl", "*,_dist_:geodist(),score"); - - results = getQueryResult(params); - - return results; - } - - public List getQueryResult(SolrQuery query) { - List results = new ArrayList<>(); - try { - QueryResponse response = null; - response = solrClient.query(query); - SolrDocumentList list = response.getResults(); - for (SolrDocument solrDocument : list) { - PoiData data = new PoiData(); - data.setId((long) solrDocument.getFieldValue(IDFieldName)); - data.setAddress((String) solrDocument.getFieldValue(AddressFieldName)); - data.setLat((double) solrDocument.getFieldValue(LatFieldName)); - data.setLng((double) solrDocument.getFieldValue(LngFieldName)); - } - } catch (IOException e) { - log.error(e.toString()); - } catch (SolrServerException e) { - log.error(e.toString()); - } - return results; - } - -} - - - diff --git a/IndexSearchService/src/main/java/com/luxx/util/HostAndPort.java b/IndexSearchService/src/main/java/com/luxx/util/HostAndPort.java deleted file mode 100644 index eb51555..0000000 --- a/IndexSearchService/src/main/java/com/luxx/util/HostAndPort.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.luxx.util; - -import java.io.Serializable; -import java.net.InetAddress; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class HostAndPort implements Serializable { - private static final long serialVersionUID = -519876229978427751L; - - private static Logger log = LogManager.getLogger(PropertiesUtil.class); - public static final String LOCALHOST_STR = getLocalHostQuietly(); - - private String host; - private int port; - - public HostAndPort(String host, int port) { - this.host = host; - this.port = port; - } - - public String getHost() { - return host; - } - - public int getPort() { - return port; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof HostAndPort) { - HostAndPort hp = (HostAndPort) obj; - - String thisHost = convertHost(host); - String hpHost = convertHost(hp.host); - return port == hp.port && thisHost.equals(hpHost); - - } - - return false; - } - - @Override - public int hashCode() { - return 31 * convertHost(host).hashCode() + port; - } - - @Override - public String toString() { - return host + ":" + port; - } - - /** - * Splits String into host and port parts. - * String must be in ( host + ":" + port ) format. - * Port is optional - * @param from String to parse - * @return array of host and port strings - */ - public static String[] extractParts(String from){ - int idx = from.lastIndexOf(":"); - String host = idx != -1 ? from.substring(0, idx) : from; - String port = idx != -1 ? from.substring(idx + 1) : ""; - return new String[] { host, port }; - } - - /** - * Creates HostAndPort instance from string. - * String must be in ( host + ":" + port ) format. - * Port is mandatory. Can convert host part. - * @see #convertHost(String) - * @param from String to parse - * @return HostAndPort instance - */ - public static HostAndPort parseString(String from){ - // NOTE: redis answers with - // '99aa9999aa9a99aa099aaa990aa99a09aa9a9999 9a09:9a9:a090:9a::99a slave 8c88888888cc08088cc8c8c888c88c8888c88cc8 0 1468251272993 37 connected' - // for CLUSTER NODES, ASK and MOVED scenarios. That's why there is no possibility to parse address in 'correct' way. - // Redis should switch to 'bracketized' (RFC 3986) IPv6 address. - try { - String[] parts = extractParts(from); - String host = parts[0]; - int port = Integer.valueOf(parts[1]); - return new HostAndPort(convertHost(host), port); - } catch (NumberFormatException ex) { - throw new IllegalArgumentException(ex); - } - } - - public static String convertHost(String host) { - if (host.equals("127.0.0.1") || host.startsWith("localhost") || host.equals("0.0.0.0") || - host.startsWith("169.254") || - host.startsWith("::1") || host.startsWith("0:0:0:0:0:0:0:1")) { - return LOCALHOST_STR; - } else { - return host; - } - } - - public static String getLocalHostQuietly() { - String localAddress; - try { - localAddress = InetAddress.getLocalHost().getHostAddress(); - } catch (Exception ex) { - log.error("getLocalHostQuietly", "cant resolve localhost address", ex); - localAddress = "localhost"; - } - return localAddress; - } - } \ No newline at end of file diff --git a/IndexSearchService/src/main/java/com/luxx/util/PropertiesReader.java b/IndexSearchService/src/main/java/com/luxx/util/PropertiesReader.java deleted file mode 100644 index 322dcb5..0000000 --- a/IndexSearchService/src/main/java/com/luxx/util/PropertiesReader.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.luxx.util; - -import java.io.InputStream; -import java.util.Properties; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class PropertiesReader { - - private static Logger log = LogManager.getLogger(PropertiesReader.class); - - private Properties prop = null; - - public PropertiesReader(String propertiesName) { - prop = new Properties(System.getProperties()); - try { - InputStream propFile = PropertiesUtil.class.getResourceAsStream(propertiesName); - prop.load(propFile); - } catch (Exception e) { - log.error("Load properties file " + propertiesName + " failed. " + e.getMessage()); - } - } - - public String getProperty(String key) { - String value = prop.getProperty(key); - return value; - } - -} diff --git a/IndexSearchService/src/main/resources/config.properties b/IndexSearchService/src/main/resources/config.properties deleted file mode 100644 index c797039..0000000 --- a/IndexSearchService/src/main/resources/config.properties +++ /dev/null @@ -1,16 +0,0 @@ -es.server.address=127.0.0.1:9300 -db.url=jdbc:redshift://xxxxx:5439/dev -db.username=user -db.password=password -db.table=endpoint_hours -db.type=redshift - -mysql.url = jdbc:mysql://127.0.0.1:3306/gmapcache -mysql.database = gmapcache -mysql.database.data = base_station -mysql.username = root -mysql.password = luxx -new.mysql.url = jdbc:mysql://192.104.103.62:3306/hotplatform -new.mysql.username = root -new.mysql.password = 123456 -new.mysql.newdatatable = tf_hotspotdata \ No newline at end of file diff --git a/IndexSearchService/src/main/resources/log4j2.xml b/IndexSearchService/src/main/resources/log4j2.xml deleted file mode 100644 index 6c4e7a9..0000000 --- a/IndexSearchService/src/main/resources/log4j2.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - %d %p %c [%t] %m%n - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/IndexSearchService/src/test/java/com/luxx/test/MysqlIndexServiceTest.java b/IndexSearchService/src/test/java/com/luxx/test/MysqlIndexServiceTest.java deleted file mode 100644 index dea9368..0000000 --- a/IndexSearchService/src/test/java/com/luxx/test/MysqlIndexServiceTest.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.luxx.test; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.luxx.service.MysqlIndexService; - -public class MysqlIndexServiceTest { - - public void TestGetDataBetweenTime() { - MysqlIndexService indexService = new MysqlIndexService(); - // CollectTime:[2014-12-06T00:00:00Z TO 2014-12-10T21:31:55Z] - // "2014-12-16T07:37:21.000Z" - String startTime = "2014-12-06 00:00:00"; - // String endTime = "2014-12-11 21:31:55"; - String endTime = "2014-12-13 00:00:00"; - long s = System.currentTimeMillis(); - List results = indexService.getSearchResultBetweenTime(startTime, endTime); - if (results != null) { - System.out.println("Size: " + results.size()); - } - long e = System.currentTimeMillis(); - System.out.println("Time: " + (e - s)); - - indexService.close(); - } - - public void TestDateFacet() { - MysqlIndexService indexService = new MysqlIndexService(); - long s = System.currentTimeMillis(); - String startTime = "2015-01-01 00:00:00"; - String endTime = "2015-12-30 21:31:55"; - List deviceList = new ArrayList(); - deviceList.add("1011"); - deviceList.add("1001"); - deviceList.add("1007"); - Map response = new HashMap<>(); - response = indexService.getDeviceDateFacetDistributeInfo(startTime, endTime, null, "Month"); - if (response != null) { - for (String key : response.keySet()) { - System.out.println(key + " : " + response.get(key)); - } - } - long e = System.currentTimeMillis(); - System.out.println("Time: " + (e - s)); - indexService.close(); - } - - public void TestDeviceFacet() { - MysqlIndexService indexService = new MysqlIndexService(); - long s = System.currentTimeMillis(); - String startTime = "2014-12-06 00:00:00"; - String endTime = "2014-12-10 21:31:55"; - List deviceList = new ArrayList(); - deviceList.add("1011"); - deviceList.add("1001"); - deviceList.add("1007"); - Map response = new HashMap<>(); - response = indexService.getDeviceDistributedInfo(startTime, endTime, null); - if (response != null) { - // System.out.println("Search Results: "+response.size()); - for (String key : response.keySet()) { - System.out.println(key + " : " + response.get(key)); - } - } - long e = System.currentTimeMillis(); - System.out.println("Time: " + (e - s)); - indexService.close(); - } - - public void TestOwnAreaFacet() { - MysqlIndexService indexService = new MysqlIndexService(); - long s = System.currentTimeMillis(); - String startTime = "2014-12-06 00:00:00"; - String endTime = "2014-12-10 21:31:55"; - List deviceList = new ArrayList(); - deviceList.add("1011"); - deviceList.add("1001"); - deviceList.add("1007"); - Map response = new HashMap<>(); - // response = indexService.getOwnAreaDistributeInfo(startTime, endTime, null,"上海",null); - // response = indexService.getOwnAreaDistributeInfo(startTime, endTime, null,"河北","唐山"); - response = indexService.getOwnAreaDistributeInfo(startTime, endTime, null, null, null); - if (response != null) { - // System.out.println("Search Results: "+response.size()); - int sum = 0; - int count = 0; - for (String key : response.keySet()) { - System.out.println(key + " : " + response.get(key)); - sum += Integer.parseInt(response.get(key)); - ++count; - } - System.out.println("Count: " + count); - System.out.println("Sum: " + sum); - } - - long e = System.currentTimeMillis(); - System.out.println("Time: " + (e - s)); - indexService.close(); - } - - public void TestTelOperFieldFacet() { - MysqlIndexService indexService = new MysqlIndexService(); - long s = System.currentTimeMillis(); - String startTime = "2014-12-06 00:00:00"; - String endTime = "2014-12-10 21:31:55"; - List deviceList = new ArrayList(); - deviceList.add("1011"); - deviceList.add("1001"); - deviceList.add("1007"); - Map response = new HashMap<>(); - response = indexService.getTeleOperDistributeInfo(startTime, endTime, null); - if (response != null) { - // System.out.println("Search Results: "+response.size()); - int sum = 0; - for (String key : response.keySet()) { - System.out.println(key + " : " + response.get(key)); - sum += Integer.parseInt(response.get(key)); - } - System.out.println("Sum: " + sum); - } - - long e = System.currentTimeMillis(); - System.out.println("Time: " + (e - s)); - indexService.close(); - } - -} diff --git a/IndexSearchService/src/test/java/com/luxx/test/RedshiftIndexServiceTest.java b/IndexSearchService/src/test/java/com/luxx/test/RedshiftIndexServiceTest.java deleted file mode 100644 index 5042622..0000000 --- a/IndexSearchService/src/test/java/com/luxx/test/RedshiftIndexServiceTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.luxx.test; - -import java.util.Map; - -import com.luxx.service.RedshiftIndexService; - -public class RedshiftIndexServiceTest { - - public static void test1(RedshiftIndexService indexService) { - long s = System.currentTimeMillis(); - Map resultsMap = indexService.getTopNEndpointUsage("2017-1-1 00:00:00", "2017-3-1 00:00:00", - 7564, 5); - System.out.println("Endpoint id : sum of usage"); - for (String key : resultsMap.keySet()) { - System.out.println(key + " : " + resultsMap.get(key)); - } - long e = System.currentTimeMillis(); - System.out.println("Time: " + (e - s)); - } - - public static void test2(RedshiftIndexService indexService) { - long s = System.currentTimeMillis(); - Map resultsMap = indexService.getEndpointMaxbps("2017-1-1 00:00:00", "2017-3-1 00:00:00", 7564); - System.out.println("Endpoint id : max bps"); - for (String key : resultsMap.keySet()) { - System.out.println(key + " : " + resultsMap.get(key)); - } - long e = System.currentTimeMillis(); - System.out.println("Time: " + (e - s)); - } - - public static void main(String[] args) { - RedshiftIndexService indexService = new RedshiftIndexService(); - - test1(indexService); - test2(indexService); - - } - -} diff --git a/LogCollector/.gitignore b/LogCollector/.gitignore new file mode 100644 index 0000000..fa7d65f --- /dev/null +++ b/LogCollector/.gitignore @@ -0,0 +1,35 @@ +logs/ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ + +### MAC OS ### +.DS_Store diff --git a/LogCollector/Dockerfile b/LogCollector/Dockerfile new file mode 100644 index 0000000..4dfc094 --- /dev/null +++ b/LogCollector/Dockerfile @@ -0,0 +1,8 @@ +FROM adoptopenjdk/openjdk8:alpine +WORKDIR /service +COPY target/log-collector-1.0.jar /service/log-collector.jar +COPY entrypoint.sh /service/entrypoint.sh +RUN chmod +x entrypoint.sh +ENV LANG zh_CN.UTF-8 +ENTRYPOINT [ "./entrypoint.sh" ] +#CMD ["java", "-jar", "log-collector.jar","--spring.profiles.active=${ENV}"] \ No newline at end of file diff --git a/LogCollector/README.md b/LogCollector/README.md new file mode 100644 index 0000000..11fcb07 --- /dev/null +++ b/LogCollector/README.md @@ -0,0 +1,6 @@ +# 环境变量 +| 变量名 | 描述 | 是否必须 | 示例 | +| ---- | ---- | ---- | ---- | +| JAVA_OPTS | java 启动参数 | 否 | "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8899" | +| KAFKA_URL | 审计日志发送到 kafka 服务的地址。不配置时，审计日志输出到标准输出流 | 否 | 10.10.10.10:9092 | +| KAFKA_TOPIC | 审计日志发送到 kafka 服务的 topic。如果 KAFKA_URL 没有配置，该项不生效，也可以不配置 | 否 | topic_test | diff --git a/LogCollector/build.sh b/LogCollector/build.sh new file mode 100644 index 0000000..0d3ae9e --- /dev/null +++ b/LogCollector/build.sh @@ -0,0 +1,4 @@ +#!/bin/bash +mvn clean +mvn package -Dmaven.test.skip=true +docker build . -t log-collector diff --git a/LogCollector/docker-compose.yml b/LogCollector/docker-compose.yml new file mode 100644 index 0000000..7dd6224 --- /dev/null +++ b/LogCollector/docker-compose.yml @@ -0,0 +1,20 @@ +version: '3' +services: + log-collector: + container_name: log-collector + image: log-collector + build: ./ + environment: + - JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8899 + - _JAVA_OPTIONS=-Xms1024m -Xmx2048m + - LOG_LEVEL=info + - ENV=dev + - ES_ADDRESS=10.10.10.10:9200 + - ES_USERNAME=username + - ES_PASSWORD=password + - ES_INDEX=my_index + - KAFKA_URL=10.10.10.20:9092 + - KAFKA_TOPIC=my_topic + ports: + - "9899:8899" + - "9090:8080" \ No newline at end of file diff --git a/LogCollector/entrypoint.sh b/LogCollector/entrypoint.sh new file mode 100644 index 0000000..35c2ddb --- /dev/null +++ b/LogCollector/entrypoint.sh @@ -0,0 +1,2 @@ +#!/bin/bash +java $JAVA_OPTS -jar log-collector.jar --spring.profiles.active=${ENV} \ No newline at end of file diff --git a/LogCollector/pom.xml b/LogCollector/pom.xml new file mode 100644 index 0000000..2cd3ab3 --- /dev/null +++ b/LogCollector/pom.xml @@ -0,0 +1,120 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.12 + + + + com.luxx + LogCollector + 1.0 + log-collector + + + true + 1.8 + 2.5.12 + 1.18.16 + 7.17.14 + 2.14.0 + 32.0.0-jre + 2.8.9 + 4.13.1 + + + + + junit + junit + ${junit.version} + + + + + org.springframework.boot + spring-boot-starter + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-logging + + + + + org.springframework.boot + spring-boot-starter-log4j2 + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + test + + + + org.elasticsearch + elasticsearch + ${es.version} + + + org.elasticsearch.client + elasticsearch-rest-client + ${es.version} + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + ${es.version} + + + + org.projectlombok + lombok + ${lombok.version} + true + + + + org.apache.kafka + kafka-clients + 1.1.1 + + + + com.google.guava + guava + ${guava.version} + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + + com.google.code.gson + gson + ${gson.version} + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + + diff --git a/LogCollector/src/main/java/com/luxx/log/LogApp.java b/LogCollector/src/main/java/com/luxx/log/LogApp.java new file mode 100644 index 0000000..7d8776e --- /dev/null +++ b/LogCollector/src/main/java/com/luxx/log/LogApp.java @@ -0,0 +1,20 @@ +package com.luxx.log; + +import org.springframework.boot.Banner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.SpringBootConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; + + +import java.util.TimeZone; + +@SpringBootApplication +@SpringBootConfiguration +public class LogApp { + public static void main(String[] args) { + TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); + SpringApplication springApplication = new SpringApplication(LogApp.class); + springApplication.setBannerMode(Banner.Mode.LOG); + springApplication.run(args); + } +} diff --git a/LogCollector/src/main/java/com/luxx/log/client/ElasticSearchClient.java b/LogCollector/src/main/java/com/luxx/log/client/ElasticSearchClient.java new file mode 100644 index 0000000..7f94067 --- /dev/null +++ b/LogCollector/src/main/java/com/luxx/log/client/ElasticSearchClient.java @@ -0,0 +1,101 @@ +package com.luxx.log.client; + +import com.luxx.log.util.DateTimeUtil; +import org.apache.http.HttpHost; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.apache.http.impl.nio.client.HttpAsyncClientBuilder; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.elasticsearch.action.bulk.BulkRequest; +import org.elasticsearch.action.bulk.BulkResponse; +import org.elasticsearch.action.index.IndexRequest; +import org.elasticsearch.client.RequestOptions; +import org.elasticsearch.client.RestClient; +import org.elasticsearch.client.RestClientBuilder; +import org.elasticsearch.client.RestHighLevelClient; +import org.elasticsearch.common.xcontent.XContentType; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.io.IOException; +import java.net.UnknownHostException; +import java.util.List; + +@Component +@Lazy +public class ElasticSearchClient { + private static Logger logger = LogManager.getLogger(ElasticSearchClient.class); + + @Value("${es.address}") + private String esAddress; + + @Value("${es.username}") + private String username; + + @Value("${es.password}") + private String password; + + @Value("${es.index}") + private String indexName; + + // ES Client + private RestHighLevelClient client; + + @PostConstruct + public void init() throws UnknownHostException { + logger.info("es.address: " + esAddress); + logger.info("es.index: " + indexName); + + String[] hostPort = esAddress.split(":"); + client = new RestHighLevelClient(RestClient.builder(new HttpHost(hostPort[0], Integer.parseInt(hostPort[1]))) + .setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() { + @Override + public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) { + CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); + credentialsProvider.setCredentials(AuthScope.ANY, + new UsernamePasswordCredentials(username, password)); + return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider); + } + })); + } + + @PreDestroy + public void close() { + if (client != null) { + try { + client.close(); + } catch (IOException e) { + logger.error(e.toString()); + } + } + } + + public void indexLog(List logList) { + if (logList != null && logList.size() > 0) { + BulkRequest request = new BulkRequest(); + for (String data : logList) { + String month = DateTimeUtil.currentYM(); + String index = this.indexName + "_" + month; + request.add(new IndexRequest(index).source(data, XContentType.JSON).type("_doc")); + } + BulkResponse bulkResponse; + try { + bulkResponse = client.bulk(request, RequestOptions.DEFAULT); + if (bulkResponse.hasFailures()) { + logger.error(bulkResponse.buildFailureMessage()); + } + } catch (IOException e) { + logger.error(e.toString()); + } + logger.info("Index {} log to ES", logList.size()); + } + } + + +} diff --git a/LogCollector/src/main/java/com/luxx/log/executor/DataIndexExecutor.java b/LogCollector/src/main/java/com/luxx/log/executor/DataIndexExecutor.java new file mode 100644 index 0000000..e361f99 --- /dev/null +++ b/LogCollector/src/main/java/com/luxx/log/executor/DataIndexExecutor.java @@ -0,0 +1,7 @@ +package com.luxx.log.executor; + +public abstract class DataIndexExecutor { + public abstract void start(); + + public abstract void stop(); +} diff --git a/LogCollector/src/main/java/com/luxx/log/executor/LogIndexExecutor.java b/LogCollector/src/main/java/com/luxx/log/executor/LogIndexExecutor.java new file mode 100644 index 0000000..7830934 --- /dev/null +++ b/LogCollector/src/main/java/com/luxx/log/executor/LogIndexExecutor.java @@ -0,0 +1,116 @@ +package com.luxx.log.executor; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.luxx.log.client.ElasticSearchClient; +import com.luxx.log.util.JsonUtil; +import com.luxx.log.util.DateTimeUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.clients.consumer.ConsumerRecords; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.common.serialization.StringDeserializer; +import org.joda.time.DateTime; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Properties; + +@Component +@Slf4j +public class LogIndexExecutor extends DataIndexExecutor { + + @Autowired + private ElasticSearchClient elasticSearchClient; + + @Value("${kafka.url}") + private String kafkaUrl; + + @Value("${kafka.topic}") + private String kafkaTopic; + + private String groupId = "log-collector"; + + private volatile boolean isRunning = true; + private Thread worker; + private KafkaConsumer kafkaConsumer; + + + @PostConstruct + public void init() { + log.info("kafka.url: " + kafkaUrl); + log.info("kafka.topic: " + kafkaTopic); + + Properties p = new Properties(); + p.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaUrl); + p.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + p.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class); + p.put(ConsumerConfig.GROUP_ID_CONFIG, groupId); + + kafkaConsumer = new KafkaConsumer<>(p); + kafkaConsumer.subscribe(Collections.singletonList(kafkaTopic)); + } + + @Override + public void start() { + log.info("Start index log service"); + try { + worker = new Thread(new Runnable() { + public void run() { + while (isRunning) { + try { + ConsumerRecords records = kafkaConsumer.poll(1000); + List logList = new ArrayList<>(1000); + for (ConsumerRecord record : records) { + log.debug("topic: {}, offset: {}, log: {}", record.topic(), record.offset(), record.value()); + try { + String data = record.value(); + if (JsonUtil.isValidJson(data)) { + JsonNode json = JsonUtil.decode(data, JsonNode.class); + if (json.has("message")) { + String msg = json.get("message").asText(); + JsonNode msgNode = JsonUtil.decode(msg, JsonNode.class); + ObjectNode objectNode = (ObjectNode) json; + objectNode.replace("message", msgNode); + String timestamp = DateTimeUtil.getEsString(DateTime.now().getMillis()); + objectNode.put("@timestamp", timestamp); + logList.add(objectNode.toString()); + } + } else { + ObjectNode objectNode = JsonUtil.createObjectNode(); + String timestamp = DateTimeUtil.getEsString(DateTime.now().getMillis()); + objectNode.put("@timestamp", timestamp); + objectNode.put("message", data); + logList.add(objectNode.toString()); + } + } catch (Exception ex) { + log.error("Process log error: " + ex.toString()); + } + } + elasticSearchClient.indexLog(logList); + } catch (Exception ex) { + log.error("Log index exception：" + ex.toString()); + } + } + } + }); + worker.start(); + } catch (Exception ex) { + log.error("Start index service exception：" + ex.toString()); + } + } + + + @Override + public void stop() { + if (worker != null) { + isRunning = false; + } + } +} diff --git a/LogCollector/src/main/java/com/luxx/log/executor/MainExecutor.java b/LogCollector/src/main/java/com/luxx/log/executor/MainExecutor.java new file mode 100644 index 0000000..a41c58d --- /dev/null +++ b/LogCollector/src/main/java/com/luxx/log/executor/MainExecutor.java @@ -0,0 +1,22 @@ +package com.luxx.log.executor; + +import org.springframework.beans.factory.DisposableBean; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class MainExecutor implements InitializingBean, DisposableBean { + @Autowired + private DataIndexExecutor dataIndexExecutor; + + @Override + public void afterPropertiesSet() throws Exception { + dataIndexExecutor.start(); + } + + @Override + public void destroy() throws Exception { + dataIndexExecutor.stop(); + } +} diff --git a/LogCollector/src/main/java/com/luxx/log/model/AuditLog.java b/LogCollector/src/main/java/com/luxx/log/model/AuditLog.java new file mode 100644 index 0000000..80c993c --- /dev/null +++ b/LogCollector/src/main/java/com/luxx/log/model/AuditLog.java @@ -0,0 +1,43 @@ +package com.luxx.log.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +@Data +public class AuditLog { + @JsonProperty("log_type") + private String logType = "audit_log"; + + @JsonProperty("request_type") + private String requestType = "service-backend"; + + @JsonProperty("user_name") + private String userName; + + @JsonProperty("source_ip") + private String sourceIp; + + @JsonProperty("request_uri") + private String requestUri; + + @JsonProperty("request_params") + private String requestParams; + + @JsonProperty("request_method") + private String requestMethod; + + @JsonProperty("request_body") + private String requestBody; + + @JsonProperty("request_time") + private String requestTime; + + @JsonProperty("response_http_code") + private int responseHttpCode; + + @JsonProperty("response_body_code") + private int responseBodyCode; + + @JsonProperty("response_body_msg") + private String responseBodyMsg; +} diff --git a/LogCollector/src/main/java/com/luxx/log/util/DateTimeUtil.java b/LogCollector/src/main/java/com/luxx/log/util/DateTimeUtil.java new file mode 100644 index 0000000..5cd1205 --- /dev/null +++ b/LogCollector/src/main/java/com/luxx/log/util/DateTimeUtil.java @@ -0,0 +1,28 @@ +package com.luxx.log.util; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.joda.time.DateTime; +import org.joda.time.format.DateTimeFormat; +import org.joda.time.format.DateTimeFormatter; + +public class DateTimeUtil { + + private static Logger logger = LogManager.getLogger(DateTimeUtil.class); + + private static final DateTimeFormatter YYYY_MM = DateTimeFormat.forPattern("yyyy_MM"); + private static final DateTimeFormatter YMD_HMS_SSS = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss.SSS"); + private static final DateTimeFormatter YMD_HMS_Z = DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); + + public static String currentYM() { + return YYYY_MM.print(DateTime.now()); + } + + public static String getEsString(long timestamp) { + return YMD_HMS_Z.print(timestamp); + } + + public static DateTime convertToDateTime(String timestamp) { + return YMD_HMS_SSS.parseDateTime(timestamp); + } +} diff --git a/LogCollector/src/main/java/com/luxx/log/util/JsonUtil.java b/LogCollector/src/main/java/com/luxx/log/util/JsonUtil.java new file mode 100644 index 0000000..4547cd8 --- /dev/null +++ b/LogCollector/src/main/java/com/luxx/log/util/JsonUtil.java @@ -0,0 +1,164 @@ +package com.luxx.log.util; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.common.base.Strings; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.HashMap; + +public class JsonUtil { + private static Logger logger = LoggerFactory.getLogger(JsonUtil.class); + + private static final ObjectMapper mapper = new ObjectMapper(); + + static { + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); + } + + public static Boolean isValidJson(String jsonStr) { + if (Strings.isNullOrEmpty(jsonStr)) { + return false; + } + if (Strings.isNullOrEmpty(jsonStr.replace(" ", ""))) { + return false; + } + + JsonElement jsonElement; + try { + jsonElement = JsonParser.parseString(jsonStr); + } catch (Exception e) { + return false; + } + if (jsonElement == null) { + return false; + } + + if (jsonElement.isJsonObject()) { + return true; + } + if (jsonElement.isJsonArray()) { + for (JsonElement j : jsonElement.getAsJsonArray()) { + if (!j.isJsonArray() && !j.isJsonObject()) { + return false; + } + } + return true; + } + return false; + } + + + public static ObjectNode createObjectNode() { + return mapper.createObjectNode(); + } + + public static T convertValue(Object o, Class valueType) { + return mapper.convertValue(o, valueType); + } + + public static T decode(String jsonStr, Class valueType) { + try { + return mapper.readValue(jsonStr, valueType); + } catch (Exception e) { + logger.error("jsonStr={}||valueType={}||error=", jsonStr, valueType, e); + return null; + } + } + + public static T decode(String jsonStr, TypeReference valueTypeRef) { + try { + return (T) mapper.readValue(jsonStr, valueTypeRef); + } catch (Exception e) { + logger.error("jsonStr={}||valueTypeRef={}||error=", jsonStr, valueTypeRef, e); + return null; + } + } + + public static String encode(Object o) { + try { + return mapper.writeValueAsString(o); + } catch (Exception e) { + logger.error("object={}||error=", o, e); + return null; + } + } + + public static byte[] serialize(T obj) { + byte[] bytes = new byte[0]; + try { + bytes = mapper.writeValueAsBytes(obj); + } catch (JsonProcessingException e) { + throw new IllegalStateException(e.getMessage(), e); + } + return bytes; + } + + public static T deserialize(byte[] data, Class cls) { + T obj = null; + try { + obj = mapper.readValue(data, cls); + } catch (IOException e) { + throw new IllegalStateException(e.getMessage(), e); + } + return obj; + } + + public static String objectToJson(Object o) { + String json = ""; + try { + json = mapper.writeValueAsString(o); + } catch (IOException e) { + throw new IllegalStateException(e.getMessage(), e); + } + return json; + } + + public static T jsonToObject(String json, Class cls) { + T obj = null; + JavaType javaType = mapper.getTypeFactory().constructType(cls); + try { + obj = mapper.readValue(json, javaType); + } catch (IOException e) { + throw new IllegalStateException(e.getMessage(), e); + } + return obj; + } + + public static T jsonToObjectList(String json, + Class collectionClass, + Class... elementClass) { + T obj = null; + JavaType javaType = mapper.getTypeFactory().constructParametricType(collectionClass, elementClass); + try { + obj = mapper.readValue(json, javaType); + } catch (IOException e) { + throw new IllegalStateException(e.getMessage(), e); + } + return obj; + } + + public static T jsonToObjectHashMap(String json, + Class keyClass, + Class valueClass) { + T obj = null; + JavaType javaType = mapper.getTypeFactory().constructParametricType(HashMap.class, keyClass, valueClass); + try { + obj = mapper.readValue(json, javaType); + } catch (IOException e) { + throw new IllegalStateException(e.getMessage(), e); + } + return obj; + } + +} diff --git a/LogCollector/src/main/resources/application-dev.properties b/LogCollector/src/main/resources/application-dev.properties new file mode 100644 index 0000000..79ec6a2 --- /dev/null +++ b/LogCollector/src/main/resources/application-dev.properties @@ -0,0 +1,8 @@ +logging.config=classpath:log4j2-dev.xml +logging.level.root=info +es.address=10.10.10.10:9200 +es.username=username +es.password=password +es.index=my_index +kafka.url=10.10.10.20:9092 +kafka.topic=my_topic \ No newline at end of file diff --git a/LogCollector/src/main/resources/application-prod.properties b/LogCollector/src/main/resources/application-prod.properties new file mode 100644 index 0000000..6e0eba3 --- /dev/null +++ b/LogCollector/src/main/resources/application-prod.properties @@ -0,0 +1 @@ +logging.config=classpath:log4j2-prod.xml diff --git a/LogCollector/src/main/resources/application-staging.properties b/LogCollector/src/main/resources/application-staging.properties new file mode 100644 index 0000000..6e0eba3 --- /dev/null +++ b/LogCollector/src/main/resources/application-staging.properties @@ -0,0 +1 @@ +logging.config=classpath:log4j2-prod.xml diff --git a/LogCollector/src/main/resources/application.properties b/LogCollector/src/main/resources/application.properties new file mode 100644 index 0000000..8f86368 --- /dev/null +++ b/LogCollector/src/main/resources/application.properties @@ -0,0 +1,9 @@ +logging.config=classpath:log4j2-prod.xml +logging.level.root=${LOG_LEVEL} +spring.profiles.active=dev +es.address=${ES_ADDRESS} +es.username=${ES_USERNAME} +es.password=${ES_PASSWORD} +es.index=${ES_INDEX} +kafka.url=${KAFKA_URL} +kafka.topic=${KAFKA_TOPIC} diff --git a/LogCollector/src/main/resources/log4j2-dev.xml b/LogCollector/src/main/resources/log4j2-dev.xml new file mode 100644 index 0000000..071d947 --- /dev/null +++ b/LogCollector/src/main/resources/log4j2-dev.xml @@ -0,0 +1,36 @@ + + + + ${sys:user.dir}/logs/ + log-collector + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/LogCollector/src/main/resources/log4j2-prod.xml b/LogCollector/src/main/resources/log4j2-prod.xml new file mode 100644 index 0000000..be0d90e --- /dev/null +++ b/LogCollector/src/main/resources/log4j2-prod.xml @@ -0,0 +1,37 @@ + + + + ${sys:user.dir}/logs/ + log-collector + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MapHttpService/MapHttpService.iml b/MapHttpService/MapHttpService.iml deleted file mode 100644 index 87833e1..0000000 --- a/MapHttpService/MapHttpService.iml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/MapHttpService/README.md b/MapHttpService/README.md index c2818cd..6b6e596 100644 --- a/MapHttpService/README.md +++ b/MapHttpService/README.md @@ -1,2 +1,2 @@ # MapHttpService -A simple Http Map Service providing tile image. \ No newline at end of file +A simple Http Map Service providing tile image for Map. \ No newline at end of file diff --git a/MapHttpService/dependency-reduced-pom.xml b/MapHttpService/dependency-reduced-pom.xml deleted file mode 100644 index a1b0d42..0000000 --- a/MapHttpService/dependency-reduced-pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - com.service.map - MapHttpService - 1.0-SNAPSHOT - - - - maven-shade-plugin - 2.4.1 - - - package - - shade - - - - - com.service.map.MapHttpServer - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - maven-compiler-plugin - - 1.8 - 1.8 - - - - - - - junit - junit - 4.11 - test - - - hamcrest-core - org.hamcrest - - - - - - UTF-8 - UTF-8 - UTF-8 - - - diff --git a/MapHttpService/pom.xml b/MapHttpService/pom.xml index 0227f97..ded10d5 100644 --- a/MapHttpService/pom.xml +++ b/MapHttpService/pom.xml @@ -2,16 +2,25 @@ + + Code4Java + com.luxx + 1.0.0 + 4.0.0 - com.service.map MapHttpService - 1.0-SNAPSHOT + jar UTF-8 UTF-8 UTF-8 + 1.7.31 + 4.1.42.Final + 32.0.0-jre + 3.4.5 + 8.0.28 @@ -19,60 +28,75 @@ junit junit - 4.11 + 4.13.1 test + + org.slf4j + slf4j-api + ${slf4j.version} + org.slf4j slf4j-log4j12 - 1.7.7 + ${slf4j.version} - + io.netty netty-all - 4.0.23.Final + ${netty.version} com.google.guava guava - 18.0 + ${guava.version} org.xerial sqlite-jdbc - 3.7.2 + 3.41.2.2 com.zaxxer HikariCP - 2.6.0 + ${hikaricp.version} mysql mysql-connector-java - 6.0.5 + ${mysql.version} + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 8 + 8 + + + org.apache.maven.plugins maven-shade-plugin - 2.4.1 + 3.2.1 package @@ -83,7 +107,7 @@ - com.service.map.MapHttpServer + com.luxx.map.MapHttpServer @@ -100,16 +124,7 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - - \ No newline at end of file + diff --git a/MapHttpService/src/main/java/com/luxx/map/MapHttpServer.java b/MapHttpService/src/main/java/com/luxx/map/MapHttpServer.java new file mode 100644 index 0000000..94b4426 --- /dev/null +++ b/MapHttpService/src/main/java/com/luxx/map/MapHttpServer.java @@ -0,0 +1,102 @@ +package com.luxx.map; + +import com.luxx.map.service.HttpServerInboundHandler; +import com.luxx.map.service.MapDbOperation; +import com.luxx.map.util.PropertiesUtil; +import io.netty.bootstrap.ServerBootstrap; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.socket.SocketChannel; +import io.netty.channel.socket.nio.NioServerSocketChannel; +import io.netty.handler.codec.http.HttpObjectAggregator; +import io.netty.handler.codec.http.HttpRequestDecoder; +import io.netty.handler.codec.http.HttpResponseEncoder; +import io.netty.util.concurrent.DefaultEventExecutorGroup; +import io.netty.util.concurrent.EventExecutorGroup; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Map服务，主程序 + * + * @author luxiaoxun + * @version 1.0 + * @since 2015.06.1 + */ +public class MapHttpServer { + private static Logger log = LoggerFactory.getLogger(MapHttpServer.class); + + private EventLoopGroup bossGroup; + private EventLoopGroup workerGroup; + private EventExecutorGroup eventExecutorGroup; + + public void start(int port) throws Exception { + bossGroup = new NioEventLoopGroup(); + workerGroup = new NioEventLoopGroup(); + eventExecutorGroup = new DefaultEventExecutorGroup(32); + try { + ServerBootstrap b = new ServerBootstrap(); + b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class) + .childHandler(new ChannelInitializer() { + @Override + public void initChannel(SocketChannel ch) throws Exception { + ch.pipeline().addLast(new HttpResponseEncoder()); + ch.pipeline().addLast(new HttpRequestDecoder()); + //aggregates an HttpMessage and its following HttpContents into a single FullHttpRequest or FullHttpResponse + //with no following HttpContents. + ch.pipeline().addLast(new HttpObjectAggregator(65536)); + ch.pipeline().addLast(eventExecutorGroup, new HttpServerInboundHandler()); + } + }).option(ChannelOption.SO_BACKLOG, 128) + .childOption(ChannelOption.SO_KEEPALIVE, false) + .childOption(ChannelOption.TCP_NODELAY, true); + + ChannelFuture f = b.bind(port).sync(); + + f.channel().closeFuture().sync(); + } finally { + destroy(); + } + } + + public void destroy() { + if (eventExecutorGroup != null) { + eventExecutorGroup.shutdownGracefully(); + } + if (workerGroup != null) { + workerGroup.shutdownGracefully(); + } + if (bossGroup != null) { + bossGroup.shutdownGracefully(); + } + + log.info("Map Http Server is shut down"); + } + + public static void main(String[] args) { + final String portString = PropertiesUtil.getInstance().GetListenPort(); + final int port = Integer.parseInt(portString); + boolean isOK = MapDbOperation.init(); + if (isOK) { + final MapHttpServer server = new MapHttpServer(); + try { + log.info("Listening for connections on port " + port); + server.start(port); + Runtime.getRuntime().addShutdownHook(new Thread() { + @Override + public void run() { + server.destroy(); + } + }); + } catch (Exception e) { + log.error("Map Http Service failed! " + e.getMessage()); + } + } else { + log.error("Connect database failed!"); + } + } + +} diff --git a/MapHttpService/src/main/java/com/luxx/map/config/DbTypeEnum.java b/MapHttpService/src/main/java/com/luxx/map/config/DbTypeEnum.java new file mode 100644 index 0000000..41281d9 --- /dev/null +++ b/MapHttpService/src/main/java/com/luxx/map/config/DbTypeEnum.java @@ -0,0 +1,14 @@ +package com.luxx.map.config; + +public enum DbTypeEnum { + sqlite(0), mysql(1); + private int type; + + DbTypeEnum(int type) { + this.type = type; + } + + public int getType() { + return type; + } +} diff --git a/MapHttpService/src/main/java/com/luxx/map/service/HttpServerInboundHandler.java b/MapHttpService/src/main/java/com/luxx/map/service/HttpServerInboundHandler.java new file mode 100644 index 0000000..396cd6a --- /dev/null +++ b/MapHttpService/src/main/java/com/luxx/map/service/HttpServerInboundHandler.java @@ -0,0 +1,131 @@ +package com.luxx.map.service; + +import java.util.List; +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.netty.handler.codec.http.HttpVersion; +import io.netty.buffer.Unpooled; +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.handler.codec.http.DefaultFullHttpResponse; +import io.netty.handler.codec.http.FullHttpRequest; +import io.netty.handler.codec.http.FullHttpResponse; +import io.netty.handler.codec.http.HttpHeaders; +import io.netty.handler.codec.http.HttpResponseStatus; +import io.netty.handler.codec.http.QueryStringDecoder; + +/** + * Map服务，Netty的Http请求处理 + * + * @author luxiaoxun + * @version 1.0 + * @since 2015.06.1 + */ +public class HttpServerInboundHandler extends ChannelInboundHandlerAdapter { + private static Logger log = LoggerFactory.getLogger(HttpServerInboundHandler.class); + + @Override + public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { + if (msg instanceof FullHttpRequest) { + FullHttpRequest request = (FullHttpRequest) msg; + final String uri = request.getUri(); + byte[] responseContent = null; + try { + FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.NO_CONTENT); + boolean isKeepAlive = HttpHeaders.isKeepAlive(request); + MapRequestParam mapRequestParam = getMapRequestParam(uri); + if (!mapRequestParam.isOk()) { + if (!isKeepAlive) { + ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); + } else { + response.headers().set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.KEEP_ALIVE); + ctx.writeAndFlush(response); + } + } else { + responseContent = MapCache.getInstance().getMapCacheTile(mapRequestParam); + if (responseContent != null) { + response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK, + Unpooled.wrappedBuffer(responseContent)); + response.headers().set(HttpHeaders.Names.CONTENT_TYPE, "image/jpeg"); + response.headers().set(HttpHeaders.Names.CONTENT_LENGTH, response.content().readableBytes()); + } + + if (!isKeepAlive) { + ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE); + } else { + response.headers().set(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.KEEP_ALIVE); + ctx.writeAndFlush(response); + } + } + } catch (Exception e) { + log.error(e.getMessage()); + } finally { + request.release(); + } + } + } + + //检测请求Url是否合法，以下两种情况合法： + //1: http://192.1.114.11:8899/788865972/{z}/{x}/{y} (http://192.1.114.11:8899/788865972/6/50/25) + //2: http://192.1.114.11:8899/FileService/image?map=quanguo&type=web&x=5&y=3&z=3 + private MapRequestParam getMapRequestParam(String url) { + MapRequestParam mapRequestParam = new MapRequestParam(); + QueryStringDecoder queryStringDecoder = new QueryStringDecoder(url); + Map> paramsMap = queryStringDecoder.parameters(); + if (paramsMap.isEmpty()) { + String[] params = url.split("/"); + if (params != null && params.length == 5) { + String dbId = params[1]; + mapRequestParam.setDbType(dbId); + try { + int zoom = Integer.parseInt(params[2]); + mapRequestParam.setZoom(zoom); + int x = Integer.parseInt(params[3]); + mapRequestParam.setX(x); + int y = Integer.parseInt(params[4]); + mapRequestParam.setY(y); + mapRequestParam.setOk(true); + } catch (NumberFormatException e) { + log.warn("请求Url:" + url + "不合法，异常：" + e.toString()); + mapRequestParam.setOk(false); + } + } + } else { + if (paramsMap.containsKey("z") && paramsMap.containsKey("x") + && paramsMap.containsKey("y")) { + try { + List zoomList = paramsMap.get("z"); + if (zoomList.size() > 0) { + mapRequestParam.setZoom(Integer.parseInt(zoomList.get(0))); + } + List xList = paramsMap.get("x"); + if (xList.size() > 0) { + mapRequestParam.setX(Integer.parseInt(xList.get(0))); + } + List yList = paramsMap.get("y"); + if (yList.size() > 0) { + mapRequestParam.setY(Integer.parseInt(yList.get(0))); + } + mapRequestParam.setDbType("788865972"); + mapRequestParam.setOk(true); + } catch (NumberFormatException e) { + log.warn("请求Url:" + url + "不合法.异常:" + e.toString()); + mapRequestParam.setOk(false); + } + } + } + + return mapRequestParam; + } + + @Override + public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { + log.debug(cause.getMessage()); + ctx.close(); + } + +} diff --git a/MapHttpService/src/main/java/com/luxx/map/service/MapCache.java b/MapHttpService/src/main/java/com/luxx/map/service/MapCache.java new file mode 100644 index 0000000..6755f08 --- /dev/null +++ b/MapHttpService/src/main/java/com/luxx/map/service/MapCache.java @@ -0,0 +1,64 @@ +package com.luxx.map.service; + +import java.sql.SQLException; +import java.util.concurrent.Callable; + +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Map服务，地图缓存 + * + * @author luxiaoxun + * @version 1.0 + * @since 2015.06.1 + */ +public class MapCache { + private static Logger log = LoggerFactory.getLogger(MapCache.class); + + private Cache mapCacheLoader = null; + + private static class MapCacheHolder { + private static final MapCache instance = new MapCache(); + } + + public static MapCache getInstance() { + return MapCacheHolder.instance; + } + + private MapCache() { + // mapCacheLoader = + // CacheBuilder.newBuilder().maximumSize(1000).expireAfterAccess(5, + // TimeUnit.MINUTES).build(); + mapCacheLoader = CacheBuilder.newBuilder().maximumSize(5000).build(); + } + + public byte[] getMapCacheTile(final MapRequestParam mapRequestParam) { + byte[] tileBytes = null; + try { + tileBytes = mapCacheLoader.get(mapRequestParam, new Callable() { + public byte[] call() throws SQLException { + return getMapTile(mapRequestParam); + } + }); + } catch (Exception e) { + log.error(e.getMessage()); + } + return tileBytes; + } + + private byte[] getMapTile(final MapRequestParam mapRequestParam) throws SQLException { + byte[] allBytesInBlob = null; + if (mapRequestParam.isOk()) { + String dbId = mapRequestParam.getDbType(); + int zoom = mapRequestParam.getZoom(); + int x = mapRequestParam.getX(); + int y = mapRequestParam.getY(); + allBytesInBlob = MapDbOperation.getTile(x, y, zoom, dbId); + } + return allBytesInBlob; + } + +} diff --git a/MapHttpService/src/main/java/com/luxx/map/service/MapDbOperation.java b/MapHttpService/src/main/java/com/luxx/map/service/MapDbOperation.java new file mode 100644 index 0000000..082ac93 --- /dev/null +++ b/MapHttpService/src/main/java/com/luxx/map/service/MapDbOperation.java @@ -0,0 +1,148 @@ +package com.luxx.map.service; + +import com.luxx.map.config.DbTypeEnum; +import com.luxx.map.util.PropertiesUtil; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; + +import java.sql.*; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Map服务，数据库操作 + * + * @author luxiaoxun + * @version 1.0 + * @since 2015.06.1 + */ +public class MapDbOperation { + private static Logger log = LoggerFactory.getLogger(MapDbOperation.class); + + private static int dbType; + private static String sqliteDbPath; + private static HikariDataSource dataSource; + + private static final String querySqlite = "select Tile from TilesData where id = " + + "(select id from Tiles where X = %s and Y = %s and Zoom = %s and Type = %s)"; + private static final String queryMysql = "select Tile from gmapnetcache where " + + "X = %s and Y = %s and Zoom = %s and Type = %s"; + + public static boolean init() { + try { + dbType = PropertiesUtil.getInstance().GetDbType(); + if (dbType == DbTypeEnum.sqlite.getType()) { + sqliteDbPath = PropertiesUtil.getInstance().GetSqliteDbPath(); + Class.forName("org.sqlite.JDBC"); + return true; + } else if (dbType == DbTypeEnum.mysql.getType()) { + String url = PropertiesUtil.getInstance().GetMysqlUrl(); + String user = PropertiesUtil.getInstance().GetMysqlUser(); + String pswd = PropertiesUtil.getInstance().GetMysqlPassword(); + HikariConfig config = new HikariConfig(); + config.setJdbcUrl(url); + config.setUsername(user); + config.setPassword(pswd); + config.addDataSourceProperty("cachePrepStmts", "true"); + config.addDataSourceProperty("prepStmtCacheSize", "250"); + config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048"); + config.setMaximumPoolSize(32); + dataSource = new HikariDataSource(config); + return true; + } + return false; + } catch (Exception e) { + log.error(e.toString()); + return false; + } + } + + public static byte[] getTile(int x, int y, int zoom, String dbId) { + try { + if (dbType == DbTypeEnum.sqlite.getType()) { + return getTileFromSqlite(x, y, zoom, dbId); + } + if (dbType == DbTypeEnum.mysql.getType()) { + return getTileFromMySql(x, y, zoom, dbId); + } else { + return null; + } + } catch (Exception ex) { + log.error(ex.getMessage()); + return null; + } + } + + public static byte[] getTileFromSqlite(int x, int y, int zoom, String dbId) throws SQLException { + byte[] allBytesInBlob = null; + Connection dbConnection = null; + Statement stm = null; + ResultSet res = null; + try { + dbConnection = DriverManager.getConnection("jdbc:sqlite:" + sqliteDbPath); + stm = dbConnection.createStatement(); + res = stm.executeQuery(String.format(querySqlite, x, y, zoom, dbId)); + if (res != null) { + if (res.next()) { + allBytesInBlob = res.getBytes("Tile"); + } + } + } finally { + attemptClose(res); + attemptClose(stm); + attemptClose(dbConnection); + } + return allBytesInBlob; + } + + public static byte[] getTileFromMySql(int x, int y, int zoom, String dbId) throws SQLException { + byte[] allBytesInBlob = null; + Connection dbConnection = null; + Statement stm = null; + ResultSet res = null; + try { + dbConnection = dataSource.getConnection(); + stm = dbConnection.createStatement(); + res = stm.executeQuery(String.format(queryMysql, x, y, zoom, dbId)); + if (res != null) { + if (res.next()) { + allBytesInBlob = res.getBytes("Tile"); + } + } + } finally { + attemptClose(res); + attemptClose(stm); + attemptClose(dbConnection); + } + + return allBytesInBlob; + } + + private static void attemptClose(ResultSet o) { + try { + if (o != null) { + o.close(); + } + } catch (Exception e) { + } + } + + private static void attemptClose(Statement o) { + try { + if (o != null) { + o.close(); + } + } catch (Exception e) { + } + } + + private static void attemptClose(Connection o) { + try { + if (o != null) { + o.close(); + } + } catch (Exception e) { + } + } +} diff --git a/MapHttpService/src/main/java/com/luxx/map/service/MapRequestParam.java b/MapHttpService/src/main/java/com/luxx/map/service/MapRequestParam.java new file mode 100644 index 0000000..22ba3c9 --- /dev/null +++ b/MapHttpService/src/main/java/com/luxx/map/service/MapRequestParam.java @@ -0,0 +1,73 @@ +package com.luxx.map.service; + +public class MapRequestParam { + private boolean isOk; + private String dbType; + private int zoom; + private int x; + private int y; + + public boolean isOk() { + return isOk; + } + + public void setOk(boolean isOk) { + this.isOk = isOk; + } + + public String getDbType() { + return dbType; + } + + public void setDbType(String dbType) { + this.dbType = dbType; + } + + public int getZoom() { + return zoom; + } + + public void setZoom(int zoom) { + this.zoom = zoom; + } + + public int getX() { + return x; + } + + public void setX(int x) { + this.x = x; + } + + public int getY() { + return y; + } + + public void setY(int y) { + this.y = y; + } + + @Override + public int hashCode() { + return this.dbType.hashCode() ^ this.x ^ this.y ^ this.zoom; + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof MapRequestParam)) { + return false; + } + MapRequestParam that = (MapRequestParam) obj; + return this.isOk == that.isOk() + && this.dbType == that.getDbType() + && this.zoom == that.getZoom() + && this.x == that.getX() + && this.y == that.getY(); + } + + @Override + public String toString() { + return "IsOk:" + this.isOk + " DbType:" + this.dbType + " Zoom:" + this.zoom + " X:" + this.x + " Y:" + this.y; + } + +} diff --git a/MapHttpService/src/main/java/com/service/map/PropertiesUtil.java b/MapHttpService/src/main/java/com/luxx/map/util/PropertiesUtil.java similarity index 63% rename from MapHttpService/src/main/java/com/service/map/PropertiesUtil.java rename to MapHttpService/src/main/java/com/luxx/map/util/PropertiesUtil.java index 0207e73..ce4f60a 100644 --- a/MapHttpService/src/main/java/com/service/map/PropertiesUtil.java +++ b/MapHttpService/src/main/java/com/luxx/map/util/PropertiesUtil.java @@ -1,17 +1,13 @@ -package com.service.map; +package com.luxx.map.util; -import java.io.FileInputStream; import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import java.util.Properties; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PropertiesUtil { - - private static Logger log = org.slf4j.LoggerFactory - .getLogger(PropertiesUtil.class); + private static Logger log = LoggerFactory.getLogger(PropertiesUtil.class); private Properties prop = null; private static String propertiesFile = "/mapConfig.properties"; @@ -35,33 +31,33 @@ public static PropertiesUtil getInstance() { } public String GetListenPort() { - String port = prop.getProperty("listenPort"); + String port = prop.getProperty("port"); return port; } - public String GetDbType() { - String dbType = prop.getProperty("database.dbType"); - return dbType; + public int GetDbType() { + String dbType = prop.getProperty("database.type"); + return Integer.valueOf(dbType); } public String GetSqliteDbPath() { - String dbPath = prop.getProperty("database.Sqlite.SqliteDbPath"); + String dbPath = prop.getProperty("database.sqlite.path"); return dbPath; } public String GetMysqlUrl() { - String url = prop.getProperty("database.Mysql.Url"); + String url = prop.getProperty("database.mysql.url"); return url; } public String GetMysqlUser() { - String user = prop.getProperty("database.Mysql.User"); + String user = prop.getProperty("database.mysql.username"); return user; } public String GetMysqlPassword() { - String pswd = prop.getProperty("database.Mysql.Password"); + String pswd = prop.getProperty("database.mysql.password"); return pswd; } diff --git a/MapHttpService/src/main/java/com/service/map/HttpServerInboundHandler.java b/MapHttpService/src/main/java/com/service/map/HttpServerInboundHandler.java deleted file mode 100644 index f53b77a..0000000 --- a/MapHttpService/src/main/java/com/service/map/HttpServerInboundHandler.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.service.map; - -import java.util.List; -import java.util.Map; - -import org.slf4j.Logger; - -import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelFutureListener; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.handler.codec.http.DefaultFullHttpResponse; -import io.netty.handler.codec.http.FullHttpRequest; -import io.netty.handler.codec.http.FullHttpResponse; -import io.netty.handler.codec.http.HttpHeaders; -import io.netty.handler.codec.http.HttpResponseStatus; -import io.netty.handler.codec.http.QueryStringDecoder; - -/** - * Map服务，Netty的Http请求处理 - * - * @author luxiaoxun - * @version 1.0 - * @since 2015.06.1 - */ - -public class HttpServerInboundHandler extends ChannelInboundHandlerAdapter { - - private static Logger log = org.slf4j.LoggerFactory - .getLogger(HttpServerInboundHandler.class); - - @Override - public void channelRead(ChannelHandlerContext ctx, Object msg) - throws Exception { - if (msg instanceof FullHttpRequest) { - FullHttpRequest request = (FullHttpRequest) msg; - final String uri = request.getUri(); - byte[] responseContent = null; - try { - FullHttpResponse response = new DefaultFullHttpResponse( - HTTP_1_1, HttpResponseStatus.NO_CONTENT); - boolean isKeepAlive = HttpHeaders.isKeepAlive(request); - MapRequestParam mapRequestParam = getMapRequestParam(uri); - if (!mapRequestParam.isOk()) { - if (!isKeepAlive) { - ctx.writeAndFlush(response).addListener( - ChannelFutureListener.CLOSE); - } else { - response.headers().set(HttpHeaders.Names.CONNECTION, - HttpHeaders.Values.KEEP_ALIVE); - ctx.writeAndFlush(response); - } - } else { - responseContent = MapCache.getInstance().getMapCacheTile( - mapRequestParam); - if (responseContent != null) { - response = new DefaultFullHttpResponse(HTTP_1_1, - HttpResponseStatus.OK, - Unpooled.wrappedBuffer(responseContent)); - response.headers().set(HttpHeaders.Names.CONTENT_TYPE, - "image/jpeg"); - response.headers().set( - HttpHeaders.Names.CONTENT_LENGTH, - response.content().readableBytes()); - } - - if (!isKeepAlive) { - ctx.writeAndFlush(response).addListener( - ChannelFutureListener.CLOSE); - } else { - response.headers().set(HttpHeaders.Names.CONNECTION, - HttpHeaders.Values.KEEP_ALIVE); - ctx.writeAndFlush(response); - } - } - } catch (Exception e) { - log.error(e.getMessage()); - } finally { - request.release(); - } - } - } - - //检测请求Url是否合法，以下两种情况合法： - //1: http://192.1.114.11:8899/788865972/{z}/{x}/{y} (http://192.1.114.11:8899/788865972/6/50/25) - //2: http://192.1.114.11:8899/FileService/image?map=quanguo&type=web&x=5&y=3&z=3 - private MapRequestParam getMapRequestParam(String url) { - MapRequestParam mapRequestParam = new MapRequestParam(); - QueryStringDecoder queryStringDecoder = new QueryStringDecoder(url); - Map> paramsMap = queryStringDecoder.parameters(); - if (paramsMap.isEmpty()) { - String[] params = url.split("/"); - if (params != null && params.length == 5) { - String dbId = params[1]; - mapRequestParam.setDbType(dbId); - try { - int zoom = Integer.parseInt(params[2]); - mapRequestParam.setZoom(zoom); - int x = Integer.parseInt(params[3]); - mapRequestParam.setX(x); - int y = Integer.parseInt(params[4]); - mapRequestParam.setY(y); - mapRequestParam.setOk(true); - } catch (NumberFormatException e) { - log.warn("请求Url:" + url + "不合法，异常：" + e.toString()); - mapRequestParam.setOk(false); - } - } - } else { - if (paramsMap.containsKey("z") && paramsMap.containsKey("x") - && paramsMap.containsKey("y")) { - try { - List zoomList = paramsMap.get("z"); - if (zoomList.size() > 0) { - mapRequestParam.setZoom(Integer.parseInt(zoomList - .get(0))); - } - List xList = paramsMap.get("x"); - if (xList.size() > 0) { - mapRequestParam.setX(Integer.parseInt(xList.get(0))); - } - List yList = paramsMap.get("y"); - if (yList.size() > 0) { - mapRequestParam.setY(Integer.parseInt(yList.get(0))); - } - mapRequestParam.setDbType("788865972"); - mapRequestParam.setOk(true); - } catch (NumberFormatException e) { - log.warn("请求Url:" + url + "不合法.异常:" + e.toString()); - mapRequestParam.setOk(false); - } - - } - } - - return mapRequestParam; - } - - @Override - public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - log.debug(cause.getMessage()); - ctx.close(); - } - -} diff --git a/MapHttpService/src/main/java/com/service/map/MapCache.java b/MapHttpService/src/main/java/com/service/map/MapCache.java deleted file mode 100644 index 743396b..0000000 --- a/MapHttpService/src/main/java/com/service/map/MapCache.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.service.map; - -import java.sql.SQLException; -import java.util.concurrent.Callable; - -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; - -/** - * Map服务，地图缓存 - * - * @author luxiaoxun - * @version 1.0 - * @since 2015.06.1 - */ - -public class MapCache { - - //private static Log log = LogFactory.getLog(MapCache.class); - - private Cache mapCacheLoader = null; - - private static class MapCacheHolder { - private static final MapCache instance = new MapCache(); - } - - public static MapCache getInstance() { - return MapCacheHolder.instance; - } - - private MapCache() { - // mapCacheLoader = - // CacheBuilder.newBuilder().maximumSize(1000).expireAfterAccess(5, - // TimeUnit.MINUTES).build(); - mapCacheLoader = CacheBuilder.newBuilder().maximumSize(5000).build(); - } - - public byte[] getMapCacheTile(final MapRequestParam mapRequestParam) { - byte[] tileBytes = null; - try { - tileBytes = mapCacheLoader.get(mapRequestParam, new Callable() { - public byte[] call() throws SQLException { - return getMapTile(mapRequestParam); - } - }); - } catch (Exception e) { - //log.error(e.getMessage()); - } - return tileBytes; - } - - private byte[] getMapTile(final MapRequestParam mapRequestParam) throws SQLException { - byte[] allBytesInBlob = null; - if (mapRequestParam.isOk()) { - String dbId = mapRequestParam.getDbType(); - int zoom = mapRequestParam.getZoom(); - int x = mapRequestParam.getX(); - int y = mapRequestParam.getY(); - allBytesInBlob = MapDbOperation.getTile(x, y, zoom, dbId); - } - return allBytesInBlob; - } - -} diff --git a/MapHttpService/src/main/java/com/service/map/MapDbOperation.java b/MapHttpService/src/main/java/com/service/map/MapDbOperation.java deleted file mode 100644 index de0eb61..0000000 --- a/MapHttpService/src/main/java/com/service/map/MapDbOperation.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.service.map; - -import com.zaxxer.hikari.HikariConfig; -import com.zaxxer.hikari.HikariDataSource; - -import java.sql.*; - -import org.slf4j.Logger; - -/** - * Map服务，数据库操作 - * - * @author luxiaoxun - * @version 1.0 - * @since 2015.06.1 - */ - -public class MapDbOperation { - - private static Logger log = org.slf4j.LoggerFactory - .getLogger(MapDbOperation.class); - - //private static ComboPooledDataSource pooledDs; - private static String dbType; - private static String sqliteDbPath; - private static HikariDataSource dataSource; - - static boolean init() throws ClassNotFoundException, SQLException { - try { - //dbType = DBXMLConfiguration.GetInstance().GetDbType(); - dbType = PropertiesUtil.getInstance().GetDbType(); - if (dbType.equals("0")) { - sqliteDbPath = PropertiesUtil.getInstance() - .GetSqliteDbPath(); - Class.forName("org.sqlite.JDBC"); - return true; - } else if (dbType.equals("1")) { - String url = PropertiesUtil.getInstance().GetMysqlUrl(); - String user = PropertiesUtil.getInstance().GetMysqlUser(); - String pswd = PropertiesUtil.getInstance().GetMysqlPassword(); - - HikariConfig config = new HikariConfig(); - //config.setDataSourceClassName("com.mysql.jdbc.jdbc2.optional.MysqlDataSource"); - config.setJdbcUrl(url); - config.setUsername(user); - config.setPassword(pswd); - config.addDataSourceProperty("cachePrepStmts", "true"); - config.addDataSourceProperty("prepStmtCacheSize", "250"); - config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048"); - config.setMaximumPoolSize(32); - dataSource = new HikariDataSource(config); - return true; - } - return false; - } catch (Exception e) { - log.error(e.toString()); - return false; - } - } - - public static byte[] getTile(int x, int y, int zoom, String dbId) { - try { - if (dbType.equals("0")) { - return getTileFromSqlite(x, y, zoom, dbId); - } - if (dbType.equals("1")) { - return getTileFromMySql(x, y, zoom, dbId); - } else { - return null; - } - } catch (Exception ex) { - log.error(ex.getMessage()); - return null; - } - } - - public static byte[] getTileFromSqlite(int x, int y, int zoom, - String dbId) throws SQLException { - byte[] allBytesInBlob = null; - Connection dbConnection = null; - Statement stm = null; - ResultSet res = null; - try { - dbConnection = DriverManager.getConnection("jdbc:sqlite:" - + sqliteDbPath); - stm = dbConnection.createStatement(); - res = stm - .executeQuery(String - .format("select Tile from TilesData where id = (select id from Tiles where X = %s and Y = %s and Zoom = %s and Type = %s)", - x, y, zoom, dbId)); - if (res != null) { - if (res.next()) { - allBytesInBlob = res.getBytes("Tile"); - } - } - } finally { - attemptClose(res); - attemptClose(stm); - attemptClose(dbConnection); - } - return allBytesInBlob; - } - - public static byte[] getTileFromMySql(int x, int y, int zoom, - String dbId) throws SQLException { - byte[] allBytesInBlob = null; - Connection dbConnection = null; - Statement stm = null; - ResultSet res = null; - try { - dbConnection = dataSource.getConnection(); - stm = dbConnection.createStatement(); - res = stm - .executeQuery(String - .format("select Tile from gmapnetcache where X = %s and Y = %s and Zoom = %s and Type = %s", - x, y, zoom, dbId)); - if (res != null) { - if (res.next()) { - allBytesInBlob = res.getBytes("Tile"); - } - } - } finally { - attemptClose(res); - attemptClose(stm); - attemptClose(dbConnection); - } - - return allBytesInBlob; - } - - private static void attemptClose(ResultSet o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } - } - - private static void attemptClose(Statement o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } - } - - private static void attemptClose(Connection o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } - } -} diff --git a/MapHttpService/src/main/java/com/service/map/MapHttpServer.java b/MapHttpService/src/main/java/com/service/map/MapHttpServer.java deleted file mode 100644 index 073136f..0000000 --- a/MapHttpService/src/main/java/com/service/map/MapHttpServer.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.service.map; - -import java.sql.SQLException; -import org.slf4j.Logger; - -import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelInitializer; -import io.netty.channel.ChannelOption; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.SocketChannel; -import io.netty.channel.socket.nio.NioServerSocketChannel; -import io.netty.handler.codec.http.HttpObjectAggregator; -import io.netty.handler.codec.http.HttpRequestDecoder; -import io.netty.handler.codec.http.HttpResponseEncoder; -import io.netty.util.concurrent.DefaultEventExecutorGroup; -import io.netty.util.concurrent.EventExecutorGroup; - -/** - * Map服务，主程序 - * - * @author luxiaoxun - * @version 1.0 - * @since 2015.06.1 - */ - -public class MapHttpServer{ - - private static Logger log = org.slf4j.LoggerFactory - .getLogger(MapHttpServer.class); - - private EventLoopGroup bossGroup; - private EventLoopGroup workerGroup; - private EventExecutorGroup eventExecutorGroup; - - public void start(int port) throws Exception { - bossGroup = new NioEventLoopGroup(); - workerGroup = new NioEventLoopGroup(); - eventExecutorGroup = new DefaultEventExecutorGroup(32); - try { - ServerBootstrap b = new ServerBootstrap(); - b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class) - .childHandler(new ChannelInitializer() { - @Override - public void initChannel(SocketChannel ch) throws Exception { - ch.pipeline().addLast(new HttpResponseEncoder()); - ch.pipeline().addLast(new HttpRequestDecoder()); - //aggregates an HttpMessage and its following HttpContents into a single FullHttpRequest or FullHttpResponse - //with no following HttpContents. - ch.pipeline().addLast(new HttpObjectAggregator(65536)); - ch.pipeline().addLast(eventExecutorGroup,new HttpServerInboundHandler()); - } - }).option(ChannelOption.SO_BACKLOG, 128) - .childOption(ChannelOption.SO_KEEPALIVE, false) - .childOption(ChannelOption.TCP_NODELAY,true); - - ChannelFuture f = b.bind(port).sync(); - - f.channel().closeFuture().sync(); - } finally { - destroy(); - } - } - - public void destroy(){ - if(eventExecutorGroup!=null){ - eventExecutorGroup.shutdownGracefully(); - } - if(workerGroup!=null){ - workerGroup.shutdownGracefully(); - } - if(bossGroup!=null){ - bossGroup.shutdownGracefully(); - } - - log.info("Map Http Server is shut down"); - } - - public static void main(String[] args){ - boolean isOK = false; - //final String portString = DBXMLConfiguration.GetInstance().GetListenPort(); - final String portString = PropertiesUtil.getInstance().GetListenPort(); - final int port = Integer.parseInt(portString); - - try { - isOK = MapDbOperation.init(); - } catch (ClassNotFoundException e) { - log.error("Init database failed! "+e.getMessage()); - } catch (SQLException e) { - log.error("Init database failed! "+e.getMessage()); - } - if(isOK) - { - final MapHttpServer server = new MapHttpServer(); - try { - log.info("Listening for connections on port " + port); - server.start(port); - Runtime.getRuntime().addShutdownHook(new Thread(){ - @Override - public void run(){ - server.destroy(); - } - }); - } catch (Exception e) { - log.error("Map Http Service failed! "+e.getMessage()); - } - } - else { - log.error("Connect database failed!"); - } - } - -} diff --git a/MapHttpService/src/main/java/com/service/map/MapRequestParam.java b/MapHttpService/src/main/java/com/service/map/MapRequestParam.java deleted file mode 100644 index e49e684..0000000 --- a/MapHttpService/src/main/java/com/service/map/MapRequestParam.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.service.map; - -public class MapRequestParam { - - private boolean isOk; - - private String dbType; - private int zoom; - private int x; - private int y; - - public boolean isOk() { - return isOk; - } - public void setOk(boolean isOk) { - this.isOk = isOk; - } - public String getDbType() { - return dbType; - } - public void setDbType(String dbType) { - this.dbType = dbType; - } - public int getZoom() { - return zoom; - } - public void setZoom(int zoom) { - this.zoom = zoom; - } - public int getX() { - return x; - } - public void setX(int x) { - this.x = x; - } - public int getY() { - return y; - } - public void setY(int y) { - this.y = y; - } - - @Override - public int hashCode() { - return this.dbType.hashCode()^this.x^this.y^this.zoom; - } - - @Override - public boolean equals(Object obj) { - if(! (obj instanceof MapRequestParam)){ - return false; - } - MapRequestParam that = (MapRequestParam)obj; - return this.isOk == that.isOk() - && this.dbType == that.getDbType() - && this.zoom == that.getZoom() - && this.x == that.getX() - && this.y == that.getY(); - } - - @Override - public String toString() { - return "IsOk:"+ this.isOk+" DbType:"+this.dbType+" Zoom:"+this.zoom + " X:"+this.x+" Y:"+this.y; - } - -} diff --git a/MapHttpService/src/main/resources/log4j.properties b/MapHttpService/src/main/resources/log4j.properties index d5ebd69..edfe56d 100644 --- a/MapHttpService/src/main/resources/log4j.properties +++ b/MapHttpService/src/main/resources/log4j.properties @@ -1,19 +1,17 @@ # Root logger option -log4j.rootLogger=debug, stdout, file +log4j.rootLogger=info, stdout, file # Direct log messages to stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.Target=System.out -log4j.appender.stdout.Threshold = info +log4j.appender.stdout.Threshold=info log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} %5p %c{1}:%L - %m%n # Direct log messages to file -log4j.appender.file = org.apache.log4j.RollingFileAppender -log4j.appender.file.File = logs/log.log -log4j.appender.file.Append = true -log4j.appender.file.MaxFileSize = 100KB -log4j.appender.file.MaxBackupIndex = 20 -log4j.appender.file.Threshold = info -log4j.appender.file.layout = org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} %5p %c{1}:%L - %m%n +log4j.appender.file=org.apache.log4j.DailyRollingFileAppender +log4j.appender.file.File=logs/map.log +log4j.appender.file.Append=true +log4j.appender.file.Threshold=info +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} %5p %c{1}:%L - %m%n diff --git a/MapHttpService/src/main/resources/mapConfig.properties b/MapHttpService/src/main/resources/mapConfig.properties index 73dad19..c1043a3 100644 --- a/MapHttpService/src/main/resources/mapConfig.properties +++ b/MapHttpService/src/main/resources/mapConfig.properties @@ -1,7 +1,7 @@ -listenPort=8899 +port=8899 # Which database to use 0:SQLite 1:MySQL -database.dbType=0 -database.Mysql.Url=jdbc:mysql://127.0.0.1/gmapcache -database.Mysql.User=luxx -database.Mysql.Password=123456 -database.Sqlite.SqliteDbPath=D:\\MapCache\\TileDBv5\\en\\Data.gmdb \ No newline at end of file +database.type=0 +database.mysql.url=jdbc:mysql://127.0.0.1/gmapcache +database.mysql.username=luxx +database.mysql.password=123456 +database.sqlite.path=E:\\GIS\\MapDownloader\\MapCache\\TileDBv5\\en\\Data.gmdb diff --git a/NettyMqService/NettyMqService.iml b/NettyMqService/NettyMqService.iml deleted file mode 100644 index ce7cbfe..0000000 --- a/NettyMqService/NettyMqService.iml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/NettyMqService/pom.xml b/NettyMqService/pom.xml index efa114d..7180ccc 100644 --- a/NettyMqService/pom.xml +++ b/NettyMqService/pom.xml @@ -1,160 +1,122 @@ - - 4.0.0 - com.nettymq - NettyMqService - 0.0.1-SNAPSHOT + + + + Code4Java + com.luxx + 1.0.0 + + 4.0.0 - - UTF-8 - UTF-8 - UTF-8 - + NettyMqService + jar - - - - junit - junit - 4.11 - test - + + UTF-8 + UTF-8 + UTF-8 + 1.7.31 + 4.1.42.Final + 32.0.0-jre + - - - org.slf4j - slf4j-log4j12 - 1.7.7 - + + + + junit + junit + 4.13.1 + test + - - - org.springframework - spring-aop - 3.2.2.RELEASE - - - org.springframework - spring-context - 3.2.2.RELEASE - - - org.springframework - spring-beans - 3.2.2.RELEASE - - - org.springframework - spring-core - 3.2.2.RELEASE - - - org.springframework - spring-expression - 3.2.2.RELEASE - - - org.springframework - spring-tx - 3.2.4.RELEASE - + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + - - - com.rabbitmq - amqp-client - 3.5.1 - - - org.springframework.amqp - spring-rabbit - 1.4.5.RELEASE - - - org.springframework.amqp - spring-amqp - 1.4.5.RELEASE - - - - aopalliance - aopalliance - 1.0 - + + + com.rabbitmq + amqp-client + 4.8.0 + - - - commons-logging - commons-logging - 1.1.1 - + + + io.netty + netty-all + ${netty.version} + - - - io.netty - netty-all - 4.0.23.Final - + + + com.google.guava + guava + ${guava.version} + + - - - com.google.guava - guava - 18.0 - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 8 + 8 + + - - - com.mchange - mchange-commons-java - 0.2.8 - - + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + package + + shade + + + + + META-INF/spring.handlers + + + META-INF/spring.schemas + + + com.luxx.mq.MainServer + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + + - - - - org.apache.maven.plugins - maven-shade-plugin - 2.3 - - - package - - shade - - - - - META-INF/spring.handlers - - - META-INF/spring.schemas - - - com.nettymq.server.MainServer - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - - \ No newline at end of file diff --git a/NettyMqService/src/main/java/com/luxx/mq/MainServer.java b/NettyMqService/src/main/java/com/luxx/mq/MainServer.java new file mode 100644 index 0000000..fcc5b3a --- /dev/null +++ b/NettyMqService/src/main/java/com/luxx/mq/MainServer.java @@ -0,0 +1,13 @@ +package com.luxx.mq; + +import com.luxx.mq.server.NettyMqServer; + +/** + * Main Program + */ +public class MainServer { + public static void main(String[] args) { + NettyMqServer server = new NettyMqServer(); + server.doStart(); + } +} diff --git a/NettyMqService/src/main/java/com/luxx/mq/config/MqConfig.java b/NettyMqService/src/main/java/com/luxx/mq/config/MqConfig.java new file mode 100644 index 0000000..43276a5 --- /dev/null +++ b/NettyMqService/src/main/java/com/luxx/mq/config/MqConfig.java @@ -0,0 +1,8 @@ +package com.luxx.mq.config; + +public class MqConfig { + public static String MQ_HOST = "rabbitmq.host"; + public static String MQ_PORT = "rabbitmq.port"; + public static String MQ_USERNAME = "rabbitmq.username"; + public static String MQ_PASSWORD = "rabbitmq.password"; +} diff --git a/NettyMqService/src/main/java/com/luxx/mq/handler/EchoServerHandler.java b/NettyMqService/src/main/java/com/luxx/mq/handler/EchoServerHandler.java new file mode 100644 index 0000000..82fc699 --- /dev/null +++ b/NettyMqService/src/main/java/com/luxx/mq/handler/EchoServerHandler.java @@ -0,0 +1,70 @@ +package com.luxx.mq.handler; + +import com.luxx.mq.server.MqSender; +import com.luxx.mq.message.Message; +import io.netty.channel.group.ChannelGroup; +import io.netty.channel.group.DefaultChannelGroup; +import io.netty.util.CharsetUtil; +import io.netty.util.ReferenceCountUtil; +import io.netty.util.concurrent.GlobalEventExecutor; +import io.netty.buffer.Unpooled; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * Handler implementation for the echo server. + */ +public class EchoServerHandler extends ChannelInboundHandlerAdapter { + private static final Logger log = LoggerFactory.getLogger(EchoServerHandler.class); + + public static final ChannelGroup channels = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE); + + private MqSender mqSender; + + public EchoServerHandler(MqSender mqSender) { + this.mqSender = mqSender; + } + + @Override + public void channelRead(ChannelHandlerContext ctx, Object msg) { + try { + // ByteBuf in = (ByteBuf) msg; + // String data = in.toString(io.netty.util.CharsetUtil.UTF_8); + Message message = (Message) (msg); + + // Receive message from client + // Send message to rabbit MQ who wants to subscribe + String dataString = new String(message.getData(), CharsetUtil.UTF_8); + mqSender.send(dataString); + + // Echo server: send back the msg to client (just for test) + log.debug(String.format("Receive message: %s", dataString)); + ctx.writeAndFlush(Unpooled.copiedBuffer(message.getData())); + } finally { + ReferenceCountUtil.release(msg); + } + } + + @Override + public void channelActive(ChannelHandlerContext ctx) throws Exception { + // A closed channel will be removed from ChannelGroup automatically + channels.add(ctx.channel()); + } + + @Override + public void channelInactive(ChannelHandlerContext ctx) throws Exception { + // System.out.println("Disconnected client "+ctx.channel().remoteAddress()); + log.debug("Disconnected client " + ctx.channel().remoteAddress()); + } + + @Override + public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { + ctx.close(); + log.warn(cause.getMessage()); + } + +} diff --git a/NettyMqService/src/main/java/com/luxx/mq/handler/HeartBeatHandler.java b/NettyMqService/src/main/java/com/luxx/mq/handler/HeartBeatHandler.java new file mode 100644 index 0000000..aff0250 --- /dev/null +++ b/NettyMqService/src/main/java/com/luxx/mq/handler/HeartBeatHandler.java @@ -0,0 +1,29 @@ +package com.luxx.mq.handler; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.handler.timeout.IdleState; +import io.netty.handler.timeout.IdleStateEvent; + +/** + * Handler implementation for heart beating. + */ +public class HeartBeatHandler extends ChannelInboundHandlerAdapter { + private static final Logger log = LoggerFactory.getLogger(HeartBeatHandler.class); + + @Override + public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception { + if (evt instanceof IdleStateEvent) { + IdleStateEvent event = (IdleStateEvent) evt; + if (event.state() == IdleState.READER_IDLE) { + // Read timeout + // System.out.println("READER_IDLE: read timeout from "+ctx.channel().remoteAddress()); + // ctx.disconnect(); //Channel disconnect + log.info("READER_IDLE: read idle from " + ctx.channel().remoteAddress()); + } + } + } +} diff --git a/NettyMqService/src/main/java/com/luxx/mq/handler/MessageDecoder.java b/NettyMqService/src/main/java/com/luxx/mq/handler/MessageDecoder.java new file mode 100644 index 0000000..e9795b9 --- /dev/null +++ b/NettyMqService/src/main/java/com/luxx/mq/handler/MessageDecoder.java @@ -0,0 +1,43 @@ +package com.luxx.mq.handler; + +import java.util.List; + +import com.luxx.mq.message.Header; +import com.luxx.mq.message.Message; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.ByteToMessageDecoder; + +public class MessageDecoder extends ByteToMessageDecoder { + + @Override + protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) throws Exception { + // At least 5 bytes to decode + if (in.readableBytes() < 5) { + return; + } + + in.markReaderIndex(); + int msgLength = in.readInt(); + if (in.readableBytes() < msgLength) { + in.resetReaderIndex(); + return; + } + + byte msgType = in.readByte(); + if (msgLength >= 5) { + ByteBuf bf = in.readBytes(msgLength - 5); + byte[] data = bf.array(); + Header header = new Header(); + header.setMsgLength(msgLength); + header.setMsgType(msgType); + + Message message = new Message(); + message.setHeader(header); + message.setData(data); + + out.add(message); // Decode one message successfully + } + } +} diff --git a/NettyMqService/src/main/java/com/luxx/mq/handler/NettyMqServerChannelInitializer.java b/NettyMqService/src/main/java/com/luxx/mq/handler/NettyMqServerChannelInitializer.java new file mode 100644 index 0000000..699a8b7 --- /dev/null +++ b/NettyMqService/src/main/java/com/luxx/mq/handler/NettyMqServerChannelInitializer.java @@ -0,0 +1,30 @@ +package com.luxx.mq.handler; + +import com.luxx.mq.server.MqSender; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.socket.SocketChannel; +import io.netty.handler.codec.LengthFieldBasedFrameDecoder; +import io.netty.handler.timeout.IdleStateHandler; + +/** + * Netty ChannelInitializer + */ +public class NettyMqServerChannelInitializer extends ChannelInitializer { + + // private EventBus eventBus; + private MqSender mqSender; + + public NettyMqServerChannelInitializer(MqSender mqSender) { + this.mqSender = mqSender; + } + + @Override + public void initChannel(SocketChannel ch) throws Exception { + // Reader idle time 3 minutes + ch.pipeline().addLast(new IdleStateHandler(3 * 60, 0, 0)); + ch.pipeline().addLast(new HeartBeatHandler()); + ch.pipeline().addLast(new LengthFieldBasedFrameDecoder(65536, 0, 4, -4, 0)); + ch.pipeline().addLast(new MessageDecoder()); + ch.pipeline().addLast(new EchoServerHandler(mqSender)); + } +} diff --git a/NettyMqService/src/main/java/com/luxx/mq/message/Header.java b/NettyMqService/src/main/java/com/luxx/mq/message/Header.java new file mode 100644 index 0000000..8f0c56d --- /dev/null +++ b/NettyMqService/src/main/java/com/luxx/mq/message/Header.java @@ -0,0 +1,38 @@ +package com.luxx.mq.message; + +import java.nio.ByteBuffer; + +public class Header { + private int msgLength; // The whole message length includes header + private byte msgType; // one byte for message type + + public int getMsgLength() { + // ByteBuffer b = ByteBuffer.wrap(msgLength); + // return b.getInt(); + return msgLength; + } + + public void setMsgLength(int msgLength) { + // ByteBuffer b = ByteBuffer.allocate(4); + // b.putInt(msgLength); + // this.msgLength = b.array(); + this.msgLength = msgLength; + } + + public byte getMsgType() { + return msgType; + } + + public void setMsgType(byte msgType) { + this.msgType = msgType; + } + + public byte[] getBytes() { + byte[] buffer = new byte[5]; + ByteBuffer b = ByteBuffer.allocate(4); + b.putInt(msgLength); + System.arraycopy(b.array(), 0, buffer, 0, 4); + buffer[4] = msgType; + return buffer; + } +} diff --git a/NettyMqService/src/main/java/com/luxx/mq/message/Message.java b/NettyMqService/src/main/java/com/luxx/mq/message/Message.java new file mode 100644 index 0000000..5a2a093 --- /dev/null +++ b/NettyMqService/src/main/java/com/luxx/mq/message/Message.java @@ -0,0 +1,36 @@ +package com.luxx.mq.message; + +public class Message { + private Header header; + private byte[] data; + + public Header getHeader() { + return header; + } + + public void setHeader(Header header) { + this.header = header; + } + + public byte[] getData() { + return data; + } + + public void setData(byte[] data) { + this.data = data; + } + + public byte[] getBytes() { + if (header != null) { + int len = header.getMsgLength(); + byte[] buffer = new byte[len]; + byte[] headerBytes = header.getBytes(); + System.arraycopy(headerBytes, 0, buffer, 0, headerBytes.length); + if (data != null) { + System.arraycopy(data, 0, buffer, headerBytes.length, data.length); + } + return buffer; + } + return null; + } +} diff --git a/NettyMqService/src/main/java/com/luxx/mq/server/MqReceiver.java b/NettyMqService/src/main/java/com/luxx/mq/server/MqReceiver.java new file mode 100644 index 0000000..ed6fd3d --- /dev/null +++ b/NettyMqService/src/main/java/com/luxx/mq/server/MqReceiver.java @@ -0,0 +1,82 @@ +package com.luxx.mq.server; + +import com.luxx.mq.config.MqConfig; +import com.luxx.mq.handler.EchoServerHandler; +import com.luxx.mq.util.PropertiesUtil; +import com.rabbitmq.client.*; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.group.ChannelGroupFutureListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.nio.charset.StandardCharsets; + +/** + * RabbitMQ Receiver based on RabbitMQ java client API + */ +public class MqReceiver { + private static final Logger log = LoggerFactory.getLogger(MqReceiver.class); + private ConnectionFactory connectionFactory; + private String exchangeName = "NettyMqServerListenerExchange"; + private String queueName = "MqListenerQueue"; + private String routeKey = "mqListener"; + + private Thread listenThread; + + public MqReceiver() { + String host = PropertiesUtil.getInstance().getProperty(MqConfig.MQ_HOST); + int port = PropertiesUtil.getInstance().getPropertyAsInt(MqConfig.MQ_PORT); + String username = PropertiesUtil.getInstance().getProperty(MqConfig.MQ_USERNAME); + String password = PropertiesUtil.getInstance().getProperty(MqConfig.MQ_PASSWORD); + connectionFactory = new ConnectionFactory(); + connectionFactory.setHost(host); + connectionFactory.setUsername(username); + connectionFactory.setPassword(password); + connectionFactory.setPort(port); + connectionFactory.setVirtualHost("/"); + } + + public void start() { + listenThread = new Thread(() -> { + try { + Connection connection = connectionFactory.newConnection(); + final Channel channel = connection.createChannel(); + channel.exchangeDeclare(exchangeName, "direct", true, false, null); + channel.queueDeclare(queueName, true, false, false, null); + channel.queueBind(queueName, exchangeName, routeKey); + // process the message one by one + channel.basicQos(1); + + Consumer consumer = new DefaultConsumer(channel) { + @Override + public void handleDelivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body) { + String message = new String(body, StandardCharsets.UTF_8); + broadcastMsgAndAck(message, channel, envelope); + } + }; + channel.basicConsume(queueName, false, consumer); + } catch (Exception ex) { + log.error("Create Rabbit MQ listener error: " + ex.getMessage()); + } + }); + + listenThread.setDaemon(true); + listenThread.start(); + } + + private void broadcastMsgAndAck(String message, final Channel channel, final Envelope envelope) { + // Broadcast message to all connected clients + // If you want to send to a specified client, just add your own logic and ack manually + // Be aware that ChannelGroup is thread safe + log.info("Connected client number: " + EchoServerHandler.channels.size()); + ByteBuf msg = Unpooled.copiedBuffer(message.getBytes()); + EchoServerHandler.channels.writeAndFlush(msg).addListener( + (ChannelGroupFutureListener) arg0 -> { + // manually ack to MQ server when message is consumed. + channel.basicAck(envelope.getDeliveryTag(), false); + log.debug("Mq Receiver get message"); + }); + } +} diff --git a/NettyMqService/src/main/java/com/luxx/mq/server/MqSender.java b/NettyMqService/src/main/java/com/luxx/mq/server/MqSender.java new file mode 100644 index 0000000..d54318a --- /dev/null +++ b/NettyMqService/src/main/java/com/luxx/mq/server/MqSender.java @@ -0,0 +1,51 @@ +package com.luxx.mq.server; + +import com.luxx.mq.config.MqConfig; +import com.luxx.mq.util.PropertiesUtil; +import com.rabbitmq.client.Channel; +import com.rabbitmq.client.Connection; +import com.rabbitmq.client.ConnectionFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; + +/** + * RabbitMQ Sender based on Spring AMQP + */ +public class MqSender { + private static final Logger log = LoggerFactory.getLogger(MqSender.class); + private ConnectionFactory connectionFactory; + private String exchangeName = "NettyMqServerSenderExchange"; + private Channel channel = null; + + public MqSender() { + String host = PropertiesUtil.getInstance().getProperty(MqConfig.MQ_HOST); + int port = PropertiesUtil.getInstance().getPropertyAsInt(MqConfig.MQ_PORT); + String username = PropertiesUtil.getInstance().getProperty(MqConfig.MQ_USERNAME); + String password = PropertiesUtil.getInstance().getProperty(MqConfig.MQ_PASSWORD); + connectionFactory = new ConnectionFactory(); + connectionFactory.setHost(host); + connectionFactory.setUsername(username); + connectionFactory.setPassword(password); + connectionFactory.setPort(port); + connectionFactory.setVirtualHost("/"); + + Connection connection = null; + try { + connection = connectionFactory.newConnection(); + channel = connection.createChannel(); + channel.exchangeDeclare(exchangeName, "fanout"); + } catch (Exception e) { + log.error("Exception: " + e.toString()); + } + } + + public void send(String data) { + try { + channel.basicPublish(exchangeName, "", null, data.getBytes()); + } catch (IOException e) { + log.error("Mq sender error: " + e.toString()); + } + } +} diff --git a/NettyMqService/src/main/java/com/luxx/mq/server/NettyMqServer.java b/NettyMqService/src/main/java/com/luxx/mq/server/NettyMqServer.java new file mode 100644 index 0000000..a5d9627 --- /dev/null +++ b/NettyMqService/src/main/java/com/luxx/mq/server/NettyMqServer.java @@ -0,0 +1,87 @@ +package com.luxx.mq.server; + +import com.luxx.mq.handler.NettyMqServerChannelInitializer; +import io.netty.bootstrap.ServerBootstrap; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelOption; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.socket.nio.NioServerSocketChannel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Netty RabbitMQ Server + */ +public class NettyMqServer { + private static final Logger log = LoggerFactory.getLogger(NettyMqServer.class); + + private EventLoopGroup bossGroup; + private EventLoopGroup workerGroup; + private Channel serverChannel; + private MqSender mqSender; + + public NettyMqServer() { + bossGroup = new NioEventLoopGroup(); + workerGroup = new NioEventLoopGroup(); + mqSender = new MqSender(); + } + + private void start(int port) { + try { + // start server + ServerBootstrap b = new ServerBootstrap(); + b.group(bossGroup, workerGroup) + .channel(NioServerSocketChannel.class) + .childHandler(new NettyMqServerChannelInitializer(mqSender)); + b.option(ChannelOption.SO_BACKLOG, 128); + b.childOption(ChannelOption.SO_KEEPALIVE, false); + b.childOption(ChannelOption.TCP_NODELAY, true); + b.childOption(ChannelOption.SO_REUSEADDR, true); + ChannelFuture f = b.bind(port).sync(); + serverChannel = f.channel(); + + // start mq listener + startMqListener(); + + log.info("Server start OK!"); + } catch (Exception ex) { + log.error("Server start error: " + ex.getMessage()); + stop(); + } + } + + private void startMqListener() { + MqReceiver mqReceiver = new MqReceiver(); + mqReceiver.start(); + } + + private void stop() { + if (serverChannel != null) { + serverChannel.close(); + } + if (workerGroup != null) { + workerGroup.shutdownGracefully(); + } + if (bossGroup != null) { + bossGroup.shutdownGracefully(); + } + + log.info("Server is shut down"); + } + + public void doStart() { + int port = 18866; + try { + start(port); + } catch (Exception e) { + log.error("Server start error: " + e.getMessage()); + } + } + + public void doStop() { + stop(); + } + +} diff --git a/IndexSearchService/src/main/java/com/luxx/util/PropertiesUtil.java b/NettyMqService/src/main/java/com/luxx/mq/util/PropertiesUtil.java similarity index 66% rename from IndexSearchService/src/main/java/com/luxx/util/PropertiesUtil.java rename to NettyMqService/src/main/java/com/luxx/mq/util/PropertiesUtil.java index 8c747da..db29ff7 100644 --- a/IndexSearchService/src/main/java/com/luxx/util/PropertiesUtil.java +++ b/NettyMqService/src/main/java/com/luxx/mq/util/PropertiesUtil.java @@ -1,16 +1,16 @@ -package com.luxx.util; +package com.luxx.mq.util; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.InputStream; import java.util.Properties; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - public class PropertiesUtil { + private static Logger log = LoggerFactory.getLogger(PropertiesUtil.class); - private static Logger log = LogManager.getLogger(PropertiesUtil.class); - private Properties prop = null; - private static String propertiesFile = "/config.properties"; + private static final String propertiesFile = "/config.properties"; + private Properties prop; private PropertiesUtil() { prop = new Properties(System.getProperties()); @@ -35,4 +35,8 @@ public String getProperty(String key) { return value; } + public Integer getPropertyAsInt(String key) { + String value = prop.getProperty(key); + return Integer.valueOf(value); + } } diff --git a/NettyMqService/src/main/java/com/nettymq/message/Header.java b/NettyMqService/src/main/java/com/nettymq/message/Header.java deleted file mode 100644 index 8bfb425..0000000 --- a/NettyMqService/src/main/java/com/nettymq/message/Header.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.nettymq.message; - -import java.nio.ByteBuffer; - -public class Header { - - private int msgLength; // The whole message length includes header - - private byte msgType; // one byte for message type - - public int getMsgLength() { - // ByteBuffer b = ByteBuffer.wrap(msgLength); - // return b.getInt(); - return msgLength; - } - - public void setMsgLength(int msgLength) { - // ByteBuffer b = ByteBuffer.allocate(4); - // b.putInt(msgLength); - // this.msgLength = b.array(); - this.msgLength = msgLength; - } - - public byte getMsgType() { - return msgType; - } - - public void setMsgType(byte msgType) { - this.msgType = msgType; - } - - public byte[] getBytes() { - byte[] buffer = new byte[5]; - ByteBuffer b = ByteBuffer.allocate(4); - b.putInt(msgLength); - System.arraycopy(b.array(), 0, buffer, 0, 4); - buffer[4] = msgType; - return buffer; - } -} diff --git a/NettyMqService/src/main/java/com/nettymq/message/Message.java b/NettyMqService/src/main/java/com/nettymq/message/Message.java deleted file mode 100644 index 54675be..0000000 --- a/NettyMqService/src/main/java/com/nettymq/message/Message.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.nettymq.message; - -public class Message { - - private Header header; - - private byte[] data; - - public Header getHeader() { - return header; - } - - public void setHeader(Header header) { - this.header = header; - } - - public byte[] getData() { - return data; - } - - public void setData(byte[] data) { - this.data = data; - } - - public byte[] getBytes() { - if (header != null) { - int len = header.getMsgLength(); - byte[] buffer = new byte[len]; - byte[] headerBytes = header.getBytes(); - System.arraycopy(headerBytes, 0, buffer, 0, headerBytes.length); - if (data != null) { - System.arraycopy(data, 0, buffer, headerBytes.length, - data.length); - } - - return buffer; - } - - return null; - } -} diff --git a/NettyMqService/src/main/java/com/nettymq/server/EchoServerHandler.java b/NettyMqService/src/main/java/com/nettymq/server/EchoServerHandler.java deleted file mode 100644 index 7d890b0..0000000 --- a/NettyMqService/src/main/java/com/nettymq/server/EchoServerHandler.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.nettymq.server; - -import io.netty.channel.group.ChannelGroup; -import io.netty.channel.group.DefaultChannelGroup; -import io.netty.util.CharsetUtil; -import io.netty.util.ReferenceCountUtil; -import io.netty.util.concurrent.GlobalEventExecutor; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.nettymq.message.Message; - -/** - * Handler implementation for the echo server. - */ -public class EchoServerHandler extends ChannelInboundHandlerAdapter { - - private static final Logger log = LoggerFactory - .getLogger(EchoServerHandler.class); - - static final ChannelGroup channels = new DefaultChannelGroup( - GlobalEventExecutor.INSTANCE); - - private MqSender mqSender; - - public EchoServerHandler(MqSender mqSender) { - this.mqSender = mqSender; - } - - @Override - public void channelRead(ChannelHandlerContext ctx, Object msg) { - try { - // ByteBuf in = (ByteBuf) msg; - // String data = in.toString(io.netty.util.CharsetUtil.UTF_8); - Message message = (Message) (msg); - - // Receive message from client - // Send message to rabbit MQ who wants to subscribe - String dataString = new String(message.getData(), CharsetUtil.UTF_8); - mqSender.send(dataString); - - // Echo server: send back the msg to client (just for test) - log.debug(String.format("Receive message: %s", dataString)); - ctx.writeAndFlush(Unpooled.copiedBuffer(message.getData())); - } finally { - ReferenceCountUtil.release(msg); - } - } - - @Override - public void channelActive(ChannelHandlerContext ctx) throws Exception { - // A closed channel will be removed from ChannelGroup automatically - channels.add(ctx.channel()); - } - - @Override - public void channelInactive(ChannelHandlerContext ctx) throws Exception { - // System.out.println("Disconnected client "+ctx.channel().remoteAddress()); - log.debug("Disconnected client " + ctx.channel().remoteAddress()); - } - - @Override - public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) - throws Exception { - ctx.close(); - log.warn(cause.getMessage()); - } - -} diff --git a/NettyMqService/src/main/java/com/nettymq/server/HeartBeatHandler.java b/NettyMqService/src/main/java/com/nettymq/server/HeartBeatHandler.java deleted file mode 100644 index de471a4..0000000 --- a/NettyMqService/src/main/java/com/nettymq/server/HeartBeatHandler.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.nettymq.server; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.handler.timeout.IdleState; -import io.netty.handler.timeout.IdleStateEvent; - -/** - * Handler implementation for heart beating. - */ -public class HeartBeatHandler extends ChannelInboundHandlerAdapter { - - private static final Logger log = LoggerFactory - .getLogger(HeartBeatHandler.class); - - @Override - public void userEventTriggered(ChannelHandlerContext ctx, Object evt) - throws Exception { - if (evt instanceof IdleStateEvent) { - IdleStateEvent event = (IdleStateEvent) evt; - if (event.state() == IdleState.READER_IDLE) { - // Read timeout - // System.out.println("READER_IDLE: read timeout from "+ctx.channel().remoteAddress()); - // ctx.disconnect(); //Channel disconnect - log.info("READER_IDLE: read timeout from " - + ctx.channel().remoteAddress()); - } - } - } -} diff --git a/NettyMqService/src/main/java/com/nettymq/server/MainServer.java b/NettyMqService/src/main/java/com/nettymq/server/MainServer.java deleted file mode 100644 index b6527bb..0000000 --- a/NettyMqService/src/main/java/com/nettymq/server/MainServer.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.nettymq.server; - -/** - * Main Program - */ -public class MainServer { - public static void main(String[] args) { - NettyMqServer server = new NettyMqServer(); - server.doStart(); - } -} diff --git a/NettyMqService/src/main/java/com/nettymq/server/MqListener.java b/NettyMqService/src/main/java/com/nettymq/server/MqListener.java deleted file mode 100644 index 0114875..0000000 --- a/NettyMqService/src/main/java/com/nettymq/server/MqListener.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.nettymq.server; - -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.Channel; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.core.MessageListener; - -/** - * RabbitMQ Listener based on Spring AMQP - */ -public class MqListener implements MessageListener { - - private static final Logger log = LoggerFactory.getLogger(MqListener.class); - - public MqListener() { - - } - - public void onMessage(Message message) { - log.debug("Get message from rabbitMQ"); - // do some thing with the message - if (message != null) { - for (Channel c : EchoServerHandler.channels) { - ByteBuf msg = Unpooled.copiedBuffer(message.getBody()); - c.writeAndFlush(msg); - } - } - } -} diff --git a/NettyMqService/src/main/java/com/nettymq/server/MqReceiver.java b/NettyMqService/src/main/java/com/nettymq/server/MqReceiver.java deleted file mode 100644 index 6303144..0000000 --- a/NettyMqService/src/main/java/com/nettymq/server/MqReceiver.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.nettymq.server; - -import com.rabbitmq.client.Channel; -import com.rabbitmq.client.Connection; -import com.rabbitmq.client.ConnectionFactory; -import com.rabbitmq.client.QueueingConsumer; - -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.channel.group.ChannelGroupFuture; -import io.netty.channel.group.ChannelGroupFutureListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * RabbitMQ Receiver based on RabbitMQ java client API - */ -public class MqReceiver { - private static final Logger log = LoggerFactory.getLogger(MqReceiver.class); - private ConnectionFactory connnectionFactory; - private String exchangeName = "NettyMqServerListenerExchange"; - private String queueName = "MqListenerQueue"; - private String routeKey = "mqListener"; - - private Thread listenThread; - - public MqReceiver() { - connnectionFactory = new ConnectionFactory(); - connnectionFactory.setHost("192.8.125.202"); - connnectionFactory.setUsername("guest"); - connnectionFactory.setPassword("guest"); - connnectionFactory.setPort(5672); - connnectionFactory.setVirtualHost("/"); - } - - public void start() { - listenThread = new Thread() { - @Override - public void run() { - try { - Connection connection = connnectionFactory.newConnection(); - final Channel channel = connection.createChannel(); - channel.exchangeDeclare(exchangeName, "direct", true, - false, null); - channel.queueDeclare(queueName, true, false, false, null); - channel.queueBind(queueName, exchangeName, routeKey); - - // process the message one by one - channel.basicQos(1); - - QueueingConsumer queueingConsumer = new QueueingConsumer( - channel); - // auto-ack is false - channel.basicConsume(queueName, false, queueingConsumer); - while (true) { - final QueueingConsumer.Delivery delivery = queueingConsumer - .nextDelivery(); - String message = new String(delivery.getBody()); - broudcastMsgAndAck(message, channel, delivery); - } - } catch (Exception ex) { - log.error(String.format( - "Create Rabbit MQ listener error %s", - ex.getMessage())); - } - } - }; - - listenThread.setDaemon(true); - listenThread.start(); - } - - private void broudcastMsgAndAck(String message, final Channel channel, - final QueueingConsumer.Delivery delivery) { - // Broudcast message to all connected clients - // If you want to send to a specified client, just add - // your own logic and ack manually - // Be aware that ChannelGroup is thread safe - if (EchoServerHandler.channels != null) { - log.info(String.format("Conneted client number: %d", - EchoServerHandler.channels.size())); - - ByteBuf msg = Unpooled.copiedBuffer(message.getBytes()); - EchoServerHandler.channels.writeAndFlush(msg).addListener( - new ChannelGroupFutureListener() { - public void operationComplete(ChannelGroupFuture arg0) - throws Exception { - // manually ack to MQ server - // when message is consumed. - channel.basicAck(delivery.getEnvelope() - .getDeliveryTag(), false); - log.debug("Mq Receiver get message"); - } - }); - } - - } -} diff --git a/NettyMqService/src/main/java/com/nettymq/server/MqSender.java b/NettyMqService/src/main/java/com/nettymq/server/MqSender.java deleted file mode 100644 index 5b1dfc1..0000000 --- a/NettyMqService/src/main/java/com/nettymq/server/MqSender.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.nettymq.server; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.FileSystemXmlApplicationContext; -import org.springframework.amqp.rabbit.core.RabbitTemplate; - -/** - * RabbitMQ Sender based on Spring AMQP - */ -public class MqSender { - - private RabbitTemplate rabbitTemplate; - - public MqSender() { - @SuppressWarnings("resource") - ApplicationContext applicationContext = new FileSystemXmlApplicationContext( - "classpath:rmqConfig.xml"); - - rabbitTemplate = (RabbitTemplate) applicationContext - .getBean("messageSender"); - } - - public void send(String data) { - rabbitTemplate.convertAndSend("NettyMqServerSenderExchange", "", data); - } -} diff --git a/NettyMqService/src/main/java/com/nettymq/server/NettyMqServer.java b/NettyMqService/src/main/java/com/nettymq/server/NettyMqServer.java deleted file mode 100644 index bbf9fdf..0000000 --- a/NettyMqService/src/main/java/com/nettymq/server/NettyMqServer.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.nettymq.server; - -import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelOption; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioServerSocketChannel; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Netty RabbitMQ Server - */ -public class NettyMqServer { - private static final Logger log = LoggerFactory - .getLogger(NettyMqServer.class); - - private EventLoopGroup bossGroup; - private EventLoopGroup workerGroup; - private Channel serverChannel; - - private MqSender mqSender; - - public NettyMqServer() { - bossGroup = new NioEventLoopGroup(); - workerGroup = new NioEventLoopGroup(); - mqSender = new MqSender(); - } - - private void start(int port) { - try { - // start server - ServerBootstrap b = new ServerBootstrap(); - b.group(bossGroup, workerGroup) - .channel(NioServerSocketChannel.class) - .childHandler(new NettyMqServerChannelInitializer(mqSender)); - b.option(ChannelOption.SO_BACKLOG, 128); - b.childOption(ChannelOption.SO_KEEPALIVE, false); - b.childOption(ChannelOption.TCP_NODELAY, true); - b.childOption(ChannelOption.SO_REUSEADDR, true); - ChannelFuture f = b.bind(port).sync(); - serverChannel = f.channel(); - - // start mq listener - startMqListener(); - - log.info("Server start OK!"); - } catch (Exception ex) { - log.error("Server start error: " + ex.getMessage()); - stop(); - } - } - - private void startMqListener() { - // Not familiar with Spring AMQP, don't know how to Manually ack to the - // MQ server if one message is consumed. - // Problem: If ack-mode is Automatic, The message will be lost if you - // want some control - /* - * @SuppressWarnings("resource") ApplicationContext applicationContext = - * new FileSystemXmlApplicationContext( "classpath:rmqConfig.xml"); - * MqListener mqListener = (MqListener) - * applicationContext.getBean("messageListener"); - */ - - // Another way to start a MQ listener, just use the rabbit mq java - // client API - // Manually ack to MQ server if one message is consumed. - MqReceiver mqReceiver = new MqReceiver(); - mqReceiver.start(); - } - - private void stop() { - if (serverChannel != null) { - serverChannel.close(); - } - if (workerGroup != null) { - workerGroup.shutdownGracefully(); - } - if (bossGroup != null) { - bossGroup.shutdownGracefully(); - } - - log.info("Server is shut down"); - } - - public void doStart() { - int port = 18866; - try { - start(port); - } catch (Exception e) { - log.error("Server start error: " + e.getMessage()); - } - } - - public void doStop() { - stop(); - } - -} diff --git a/NettyMqService/src/main/java/com/nettymq/server/NettyMqServerChannelInitializer.java b/NettyMqService/src/main/java/com/nettymq/server/NettyMqServerChannelInitializer.java deleted file mode 100644 index 7d4607f..0000000 --- a/NettyMqService/src/main/java/com/nettymq/server/NettyMqServerChannelInitializer.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.nettymq.server; - -import io.netty.channel.ChannelInitializer; -import io.netty.channel.socket.SocketChannel; -import io.netty.handler.codec.LengthFieldBasedFrameDecoder; -import io.netty.handler.timeout.IdleStateHandler; - -/** - * Netty ChannelInitializer - */ -public class NettyMqServerChannelInitializer extends - ChannelInitializer { - - // private EventBus eventBus; - private MqSender mqSender; - - public NettyMqServerChannelInitializer(MqSender mqSender) { - this.mqSender = mqSender; - } - - @Override - public void initChannel(SocketChannel ch) throws Exception { - // Reader ilde time 3 minutes - ch.pipeline().addLast(new IdleStateHandler(3 * 60, 0, 0)); - ch.pipeline().addLast(new HeartBeatHandler()); - ch.pipeline().addLast( - new LengthFieldBasedFrameDecoder(65536, 0, 4, -4, 0)); - ch.pipeline().addLast(new ToMessageDecoder()); - ch.pipeline().addLast(new EchoServerHandler(mqSender)); - } -} diff --git a/NettyMqService/src/main/java/com/nettymq/server/ToMessageDecoder.java b/NettyMqService/src/main/java/com/nettymq/server/ToMessageDecoder.java deleted file mode 100644 index 2dc923c..0000000 --- a/NettyMqService/src/main/java/com/nettymq/server/ToMessageDecoder.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.nettymq.server; - -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.nettymq.message.Header; -import com.nettymq.message.Message; - -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.ByteToMessageDecoder; - -public class ToMessageDecoder extends ByteToMessageDecoder { - - @Override - protected void decode(ChannelHandlerContext ctx, ByteBuf in, - List out) throws Exception { - - // At least 5 bytes to decode - if (in.readableBytes() < 5) { - return; - } - - in.markReaderIndex(); - int msgLength = in.readInt(); - if (in.readableBytes() < msgLength) { - in.resetReaderIndex(); - return; - } - - byte msgType = in.readByte(); - if (msgLength >= 5) { - ByteBuf bf = in.readBytes(msgLength - 5); - byte[] data = bf.array(); - Header header = new Header(); - header.setMsgLength(msgLength); - header.setMsgType(msgType); - - Message message = new Message(); - message.setHeader(header); - message.setData(data); - - out.add(message); // Decode one message successfully - } - } -} diff --git a/NettyMqService/src/main/java/com/nettymq/test/ClientMsgSender.java b/NettyMqService/src/main/java/com/nettymq/test/ClientMsgSender.java deleted file mode 100644 index 098956c..0000000 --- a/NettyMqService/src/main/java/com/nettymq/test/ClientMsgSender.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.nettymq.test; - -import java.io.IOException; -import java.io.OutputStream; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -public class ClientMsgSender { - - private final ScheduledExecutorService scheduler = Executors - .newScheduledThreadPool(1); - - private OutputStream out; - - public ClientMsgSender(OutputStream out) { - this.out = out; - } - - public void stop() { - scheduler.shutdown(); - } - - public void start() { - scheduler.scheduleWithFixedDelay(new Runnable() { - public void run() { - String msg = new String("Test Msg"); - byte[] msgBytes = TcpClient.getMessageBytes(msg); - if (msgBytes != null) { - try { - out.write(msgBytes); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - }, 3, 1, TimeUnit.SECONDS); - } -} diff --git a/NettyMqService/src/main/java/com/nettymq/test/TcpClient.java b/NettyMqService/src/main/java/com/nettymq/test/TcpClient.java deleted file mode 100644 index 891b01e..0000000 --- a/NettyMqService/src/main/java/com/nettymq/test/TcpClient.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.nettymq.test; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.Socket; -import java.net.UnknownHostException; - -import com.nettymq.message.*; - -/** - * Tcp client for echo server. This client also receive message forwarded by - * netty MQ server - */ -public class TcpClient { - - private final static String serverString = "127.0.0.1"; - private final static int servPort = 18866; - - public static void main(String[] args) { - - Socket socket = null; - try { - // Create socket that is connected to server on specified port - socket = new Socket(serverString, servPort); - System.out.println("Connected to server...send echo string (quit to end)"); - - final InputStream in = socket.getInputStream(); - OutputStream out = socket.getOutputStream(); - - startReceiveThread(in); - - // sendMsgToServerFromInput(out); - sendMsgToServerFromThread(out); - } catch (IOException ex) { - ex.printStackTrace(); - } - } - - private static void startReceiveThread(final InputStream in) { - Thread receiveThread = new Thread() { - public void run() { - while (true) { - byte[] readBytes = new byte[2048]; - int ret = 0; - try { - ret = in.read(readBytes); - } catch (IOException e) { - break; - } - if (ret == -1) { - break; - } - String retString = new String(readBytes); - System.out.println("Received : " + retString); - } - } - }; - - receiveThread.setDaemon(true); - receiveThread.start(); - } - - private static void sendMsgToServerFromInput(OutputStream out) { - BufferedReader inFromUser = new BufferedReader(new InputStreamReader( - System.in)); - while (true) { - String msg = new String(); - try { - msg = inFromUser.readLine(); - } catch (IOException e) { - e.printStackTrace(); - } - if (msg.equals("quit")) { - break; - } - byte[] msgBytes = getMessageBytes(msg); - if (msgBytes != null) { - try { - out.write(msgBytes); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - } - - private static void sendMsgToServerFromThread(final OutputStream out) { - ClientMsgSender msgSender = new ClientMsgSender(out); - msgSender.start(); - } - - public static byte[] getMessageBytes(String msg) { - msg = msg.trim(); - if (!msg.isEmpty()) { - byte[] data = msg.getBytes(); - - Header header = new Header(); - byte msgType = new Byte("1"); - header.setMsgType(msgType); - header.setMsgLength(5 + data.length); - - Message message = new Message(); - try { - message.setData(msg.getBytes("UTF-8")); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - message.setHeader(header); - return message.getBytes(); - } - - return null; - } -} diff --git a/NettyMqService/src/main/resources/config.properties b/NettyMqService/src/main/resources/config.properties new file mode 100644 index 0000000..173bd28 --- /dev/null +++ b/NettyMqService/src/main/resources/config.properties @@ -0,0 +1,4 @@ +rabbitmq.host=192.8.125.202 +rabbitmq.port=5672 +rabbitmq.username=guest +rabbitmq.password=guest \ No newline at end of file diff --git a/NettyMqService/src/main/resources/log4j.properties b/NettyMqService/src/main/resources/log4j.properties index 8e2301d..03c7a2f 100644 --- a/NettyMqService/src/main/resources/log4j.properties +++ b/NettyMqService/src/main/resources/log4j.properties @@ -4,15 +4,14 @@ log4j.rootLogger=info, stdout, file # Direct log messages to stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.Target=System.out +log4j.appender.stdout.Threshold=info log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n +log4j.appender.stdout.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} %5p %c{1}:%L - %m%n # Direct log messages to file -log4j.appender.file = org.apache.log4j.RollingFileAppender -log4j.appender.file.File = logs/log.log -log4j.appender.file.Append = true -log4j.appender.file.MaxFileSize = 100KB -log4j.appender.file.MaxBackupIndex = 20 -log4j.appender.file.Threshold = warn -log4j.appender.file.layout = org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} %5p %c{1}:%L - %m%n +log4j.appender.file=org.apache.log4j.DailyRollingFileAppender +log4j.appender.file.File=logs/mq-service.log +log4j.appender.file.Append=true +log4j.appender.file.Threshold=info +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} %5p %c{1}:%L - %m%n diff --git a/NettyMqService/src/main/resources/rmqConfig.xml b/NettyMqService/src/main/resources/rmqConfig.xml deleted file mode 100644 index 06bd6b3..0000000 --- a/NettyMqService/src/main/resources/rmqConfig.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/NettyMqService/src/test/java/test/ClientMsgSender.java b/NettyMqService/src/test/java/test/ClientMsgSender.java new file mode 100644 index 0000000..f857950 --- /dev/null +++ b/NettyMqService/src/test/java/test/ClientMsgSender.java @@ -0,0 +1,39 @@ +package test; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +public class ClientMsgSender { + + private final ScheduledExecutorService scheduler = Executors + .newScheduledThreadPool(1); + + private OutputStream out; + + public ClientMsgSender(OutputStream out) { + this.out = out; + } + + public void stop() { + scheduler.shutdown(); + } + + public void start() { + scheduler.scheduleWithFixedDelay(new Runnable() { + public void run() { + String msg = new String("Test Msg"); + byte[] msgBytes = TcpClient.getMessageBytes(msg); + if (msgBytes != null) { + try { + out.write(msgBytes); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + }, 3, 1, TimeUnit.SECONDS); + } +} diff --git a/NettyMqService/src/test/java/test/TcpClient.java b/NettyMqService/src/test/java/test/TcpClient.java new file mode 100644 index 0000000..e7e2b7d --- /dev/null +++ b/NettyMqService/src/test/java/test/TcpClient.java @@ -0,0 +1,118 @@ +package test; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.Socket; + +import com.luxx.mq.message.Header; +import com.luxx.mq.message.Message; + +/** + * Tcp client for echo server. This client also receive message forwarded by + * netty MQ server + */ +public class TcpClient { + + private final static String serverString = "127.0.0.1"; + private final static int servPort = 18866; + + public static void main(String[] args) { + + Socket socket = null; + try { + // Create socket that is connected to server on specified port + socket = new Socket(serverString, servPort); + System.out.println("Connected to server...send echo string (quit to end)"); + + final InputStream in = socket.getInputStream(); + OutputStream out = socket.getOutputStream(); + + startReceiveThread(in); + + // sendMsgToServerFromInput(out); + sendMsgToServerFromThread(out); + } catch (IOException ex) { + ex.printStackTrace(); + } + } + + private static void startReceiveThread(final InputStream in) { + Thread receiveThread = new Thread() { + public void run() { + while (true) { + byte[] readBytes = new byte[2048]; + int ret = 0; + try { + ret = in.read(readBytes); + } catch (IOException e) { + break; + } + if (ret == -1) { + break; + } + String retString = new String(readBytes); + System.out.println("Received : " + retString); + } + } + }; + + receiveThread.setDaemon(true); + receiveThread.start(); + } + + private static void sendMsgToServerFromInput(OutputStream out) { + BufferedReader inFromUser = new BufferedReader(new InputStreamReader( + System.in)); + while (true) { + String msg = new String(); + try { + msg = inFromUser.readLine(); + } catch (IOException e) { + e.printStackTrace(); + } + if (msg.equals("quit")) { + break; + } + byte[] msgBytes = getMessageBytes(msg); + if (msgBytes != null) { + try { + out.write(msgBytes); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + private static void sendMsgToServerFromThread(final OutputStream out) { + ClientMsgSender msgSender = new ClientMsgSender(out); + msgSender.start(); + } + + public static byte[] getMessageBytes(String msg) { + msg = msg.trim(); + if (!msg.isEmpty()) { + byte[] data = msg.getBytes(); + + Header header = new Header(); + byte msgType = new Byte("1"); + header.setMsgType(msgType); + header.setMsgLength(5 + data.length); + + Message message = new Message(); + try { + message.setData(msg.getBytes("UTF-8")); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + message.setHeader(header); + return message.getBytes(); + } + + return null; + } +} diff --git a/README.md b/README.md index b7fd849..37bee54 100644 --- a/README.md +++ b/README.md @@ -3,28 +3,32 @@ Repository for my java projects ## 1. NettyMqService How to implement a message queue service with Netty and RabbitMQ. -#### 中文详情(Chinese Details): +##### 中文详情(Chinese Details): * [Message Queue Service based on Netty and RabbitMQ](http://www.cnblogs.com/luxiaoxun/p/4257105.html) -## 2. IndexSearchService +## 2. MapHttpService +A simple Http Map Service providing tile image for Map. + +## 3. WebGisDemo +A simple web GIS page based on [leaflet](https://github.com/Leaflet/Leaflet). +##### 中文详情([Chinese Details](http://www.cnblogs.com/luxiaoxun/p/5022333.html)) 1. How to use Elasticsearch. 2. How to use Solr or Lucene to index and query data. -#### 中文详情(Chinese Details): +3. How to use Elasticsearch to index and query POI(GEO data). + * [Lucene index and query POI data](http://www.cnblogs.com/luxiaoxun/p/5020247.html) * [Solr index and query MYSQL data](http://www.cnblogs.com/luxiaoxun/p/4442770.html) * [Solr index and query GEO data](http://www.cnblogs.com/luxiaoxun/p/4477591.html) * [Elasticsearch index and query data](http://www.cnblogs.com/luxiaoxun/p/4869509.html) * [SQL to Elasticsearch Java Code](http://www.cnblogs.com/luxiaoxun/p/6826211.html) -## 3. MapHttpService -A simple Http Map Service providing tile image. +How to use WebGisDemo with MapHttpService: +1. Download map tile image with [MapDownloader](https://github.com/luxiaoxun/MapDownloader) +2. Start MapHttpService with right data source, an example: + >port=8899 + >database.type=0 # Use SQLite + >database.sqlite.path=E:\\GIS\\MapDownloader\\MapCache\\TileDBv5\\en\\Data.gmdb +3. Start WebGISDemo: http://localhost:9090/map + +![map](https://github.com/luxiaoxun/Code4Java/blob/master/WebGisDemo/picture/map-demo.png) -## 4. WebGISDemo -A simple web GIS page based on [leaflet](https://github.com/Leaflet/Leaflet). -#### 中文详情([Chinese Details](http://www.cnblogs.com/luxiaoxun/p/5022333.html)) -How to use WebGISDemo with MapHttpService: -1. Start MapHttpService with right datasurce, an example: - >listenPort=8899 - >database.dbType=0 # Use SQLite - >database.Sqlite.SqliteDbPath=D:\\GIS\\MapDownloader\\MapDownloader\\bin\\Release\\MapCache\\TileDBv5\\en\\Data.gmdb -2. Publish the page "map.html" to chrome to play. diff --git a/WebGisDemo/WebContent/META-INF/MANIFEST.MF b/WebGisDemo/WebContent/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e..0000000 --- a/WebGisDemo/WebContent/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/WebGisDemo/WebContent/WEB-INF/page/map.jsp b/WebGisDemo/WebContent/WEB-INF/page/map.jsp deleted file mode 100644 index ae7c5b8..0000000 --- a/WebGisDemo/WebContent/WEB-INF/page/map.jsp +++ /dev/null @@ -1,284 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" %> - - - - Map Demo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- + - - -
-
-
-
- - - - - -
-
    -
    -
    -
    - - -
    -
      -
      -
      -
      -
      -
      -
      -
      - - - - - - diff --git a/WebGisDemo/WebContent/WEB-INF/springConfig.xml b/WebGisDemo/WebContent/WEB-INF/springConfig.xml deleted file mode 100644 index 12dc174..0000000 --- a/WebGisDemo/WebContent/WEB-INF/springConfig.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/WebGisDemo/WebContent/WEB-INF/web.xml b/WebGisDemo/WebContent/WEB-INF/web.xml deleted file mode 100644 index 0284711..0000000 --- a/WebGisDemo/WebContent/WEB-INF/web.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - WebGisDemo - - BaseStationServlet - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - /WEB-INF/springConfig.xml - - 1 - - - BaseStationServlet - / - - - \ No newline at end of file diff --git a/WebGisDemo/WebContent/js/jquery-1.7.2.min.js b/WebGisDemo/WebContent/js/jquery-1.7.2.min.js deleted file mode 100644 index 16ad06c..0000000 --- a/WebGisDemo/WebContent/js/jquery-1.7.2.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.7.2 jquery.com | jquery.org/license */ -(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"":"")+""),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;e=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
      a",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="
      "+""+"
      ",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="
      t
      ",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="
      ",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function( -a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&j.push({elem:this,matches:d.slice(e)});for(k=0;k0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

      ";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
      ";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*",""],legend:[1,"
      ","
      "],thead:[1,"","
      "],tr:[2,"","
      "],td:[3,"","
      "],col:[2,"","
      "],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
      ","
      "]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f -.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(;d1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]===""&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
      ").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/WebGisDemo/WebContent/map.html b/WebGisDemo/WebContent/map.html deleted file mode 100644 index cdc15fe..0000000 --- a/WebGisDemo/WebContent/map.html +++ /dev/null @@ -1,278 +0,0 @@ - - - - Map Demo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      -
      -
      - - -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      - + - - -
      -
      -
      -
      - - - - - -
      -
        -
        -
        -
        - - -
        -
          -
          -
          -
          -
          -
          -
          -
          - - - - - - diff --git a/WebGisDemo/WebGisDemo.iml b/WebGisDemo/WebGisDemo.iml deleted file mode 100644 index e8aa987..0000000 --- a/WebGisDemo/WebGisDemo.iml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/WebGisDemo/db_table/db_table.sql b/WebGisDemo/db_table/db_table.sql new file mode 100644 index 0000000..afdde2c --- /dev/null +++ b/WebGisDemo/db_table/db_table.sql @@ -0,0 +1,31 @@ +CREATE DATABASE `data_db`; + +USE `data_db`; + +DROP TABLE IF EXISTS `station`; +CREATE TABLE `station` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `country_code` varchar(16) DEFAULT '', + `provider` varchar(32) DEFAULT '', + `lac` varchar(32) DEFAULT '', + `cell` varchar(32) DEFAULT '', + `latitude` DOUBLE(20,8) DEFAULT NULL, + `longitude` DOUBLE(20,8) DEFAULT NULL, + `address` varchar(512) DEFAULT '', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='station table' + +INSERT INTO `station` (`id`, `country_code`, `provider`, `lac`, `cell`, `latitude`, `longitude`, `address`) +VALUES ('1', '406', '0', '111', '222', '32.12800000', '118.77420000', '南京测试点1'); + +INSERT INTO `station` (`id`, `country_code`, `provider`, `lac`, `cell`, `latitude`, `longitude`, `address`) +VALUES ('2', '406', '1', '123', '234', '32.22700000', '118.86420000', '南京测试点2'); + +INSERT INTO `station` (`id`, `country_code`, `provider`, `lac`, `cell`, `latitude`, `longitude`, `address`) +VALUES ('3', '406', '0', '222', '333', '30.32600000', '118.78420000', '南京测试点3'); + +INSERT INTO `station` (`id`, `country_code`, `provider`, `lac`, `cell`, `latitude`, `longitude`, `address`) +VALUES ('4', '406', '1', '123', '234', '31.22700000', '118.56420000', '南京测试点4'); + +INSERT INTO `station` (`id`, `country_code`, `provider`, `lac`, `cell`, `latitude`, `longitude`, `address`) +VALUES ('5', '406', '0', '222', '333', '32.32600000', '118.68420000', '南京测试点5'); diff --git a/WebGisDemo/picture/map-demo.png b/WebGisDemo/picture/map-demo.png new file mode 100644 index 0000000..0d37a33 Binary files /dev/null and b/WebGisDemo/picture/map-demo.png differ diff --git a/WebGisDemo/pom.xml b/WebGisDemo/pom.xml new file mode 100644 index 0000000..d06d8c6 --- /dev/null +++ b/WebGisDemo/pom.xml @@ -0,0 +1,187 @@ + + + Code4Java + com.luxx + 1.0.0 + + + 4.0.0 + WebGisDemo + jar + + + UTF-8 + UTF-8 + UTF-8 + 2.5.12 + 2.2.2 + 1.4.2 + 7.17.14 + 2.18.0 + 2.14.0 + 3.0.0 + 1.18.16 + 32.0.0-jre + 3.4.5 + 8.0.28 + + + + + redshift + https://redshift-maven-repository.s3-website-us-east-1.amazonaws.com/release + + + + + + + org.springframework.boot + spring-boot-starter + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-logging + + + + + org.springframework.boot + spring-boot-starter-web + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-validation + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-log4j2 + ${spring-boot.version} + + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + + + + org.springframework.boot + spring-boot-starter-freemarker + ${spring-boot.version} + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis.spring-boot.version} + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper.spring-boot.version} + + + + + com.zaxxer + HikariCP + ${hikaricp.version} + + + + mysql + mysql-connector-java + ${mysql.version} + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + + + org.elasticsearch + elasticsearch + ${es.version} + + + org.elasticsearch.client + elasticsearch-rest-client + ${es.version} + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + ${es.version} + + + + + com.google.guava + guava + ${guava.version} + + + + + io.springfox + springfox-boot-starter + ${swagger.version} + + + + + org.projectlombok + lombok + ${lombok.version} + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 8 + 8 + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + true + + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/WebGisDemo/src/BaseStationConfiguration.xml b/WebGisDemo/src/BaseStationConfiguration.xml deleted file mode 100644 index 682a243..0000000 --- a/WebGisDemo/src/BaseStationConfiguration.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/WebGisDemo/src/com/map/controller/BaseStationController.java b/WebGisDemo/src/com/map/controller/BaseStationController.java deleted file mode 100644 index 34ac75a..0000000 --- a/WebGisDemo/src/com/map/controller/BaseStationController.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.map.controller; - -import com.map.model.BaseStation; -import com.map.model.Message; -import com.map.model.PoiPoint; -import com.map.service.BaseStationService; -import com.map.util.JsonHelper; -import com.poi.service.PoiData; -import com.poi.service.PoiIndexService; - -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -/** - * Created by luxiaoxun on 2015/11/25. - */ - -@Controller -public class BaseStationController { - private BaseStationService baseStationService = new BaseStationService(); - private PoiIndexService poiIndexService; - - public BaseStationController(){ - try { - poiIndexService = new PoiIndexService(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @RequestMapping(value="/map", method= {RequestMethod.GET,RequestMethod.POST}) - public String map(Model model,HttpServletRequest request,HttpSession session) { - return "map"; - } - - @RequestMapping(value="/supermap", method= {RequestMethod.GET,RequestMethod.POST}) - public String supermap(Model model,HttpServletRequest request,HttpSession session) { - return "supermap"; - } - - @RequestMapping(value="/loadData", method= {RequestMethod.GET,RequestMethod.POST}) - public @ResponseBody Message loadData(Model model,HttpServletRequest request,HttpSession session) { - Message msg = new Message(); - List datas = baseStationService.getAllBaseStation(); - msg.setMsg("ok"); - msg.setData(datas); - return msg; - } - - @RequestMapping(value="/getDataInCircle", method= {RequestMethod.GET,RequestMethod.POST}) - public @ResponseBody Message getDataInCircle(Model model,HttpServletRequest request,HttpSession session) { - double radius =Double.parseDouble(request.getParameter("radius")); - double lat = Double.parseDouble(request.getParameter("lat")); - double lng = Double.parseDouble(request.getParameter("lng")); - - List datas = poiIndexService.searchPoiInCircle(lng, lat, radius/1000); - Message msg = new Message(); - msg.setMsg("ok"); - msg.setData(datas); - - return msg; - } - - @RequestMapping(value="/getDataInRectangle", method= {RequestMethod.GET,RequestMethod.POST}) - public @ResponseBody Message getDataInRectange(Model model,HttpServletRequest request, - HttpSession session) { - String json = request.getParameter("latlngs"); - List points = JsonHelper.jsonToObjectList(json, ArrayList.class, PoiPoint.class); - Message msg = new Message(); - if(points!=null && points.size()>=4){ - double minLat = points.get(0).getLat(); - double maxLat = points.get(1).getLat(); - double minLng = points.get(0).getLng(); - double maxLng = points.get(1).getLng(); - - for (PoiPoint poiPoint : points) { - double lat = poiPoint.getLat(); - double lng = poiPoint.getLng(); - if(lat > maxLat){ - maxLat = lat; - } - if(lat < minLat){ - minLat = lat; - } - if(lng > maxLng){ - maxLng = lng; - } - if(lng < minLng){ - minLng = lng; - } - } - - List datas = poiIndexService.searchPoiInRectangle(minLng, minLat, maxLng, maxLat); - msg.setMsg("ok"); - msg.setData(datas); - } - else { - msg.setMsg("failed"); - } - - return msg; - } - -} diff --git a/WebGisDemo/src/com/map/dao/BaseStationDb.java b/WebGisDemo/src/com/map/dao/BaseStationDb.java deleted file mode 100644 index 6df6a87..0000000 --- a/WebGisDemo/src/com/map/dao/BaseStationDb.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.map.dao; - -import java.io.Reader; -import java.util.ArrayList; -import java.util.List; - -import org.apache.ibatis.io.Resources; -import org.apache.ibatis.session.SqlSession; -import org.apache.ibatis.session.SqlSessionFactory; -import org.apache.ibatis.session.SqlSessionFactoryBuilder; - -import com.map.service.IBaseStationOperation; -import com.map.model.BaseStation; - -public class BaseStationDb { - private static SqlSessionFactory sqlSessionFactory; - - static { - try { - // 通过配置文件初始化sqlSessionFactory - Reader reader = Resources.getResourceAsReader("BaseStationConfiguration.xml"); - sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public List getAllBaseStations(){ - List stations = new ArrayList(); - SqlSession session = sqlSessionFactory.openSession(); - try { - IBaseStationOperation stationOperation = session.getMapper(IBaseStationOperation.class); - stations = stationOperation.getAllBaseStation(); - } finally { - session.close(); - } - - return stations; - } -} - diff --git a/WebGisDemo/src/com/map/mapper/BaseStation.xml b/WebGisDemo/src/com/map/mapper/BaseStation.xml deleted file mode 100644 index 3fca6e4..0000000 --- a/WebGisDemo/src/com/map/mapper/BaseStation.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/WebGisDemo/src/com/map/model/BaseStation.java b/WebGisDemo/src/com/map/model/BaseStation.java deleted file mode 100644 index d70743a..0000000 --- a/WebGisDemo/src/com/map/model/BaseStation.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.map.model; - -public class BaseStation { - - private long baseStationId; - - private String countryCode; - - private String provider; - - private String lac; - - private String cell; - - private double latitude; - - private double longitude; - - private double r_latitude; - - private double r_longitude; - - private double range; - - private String address; - - public BaseStation() { - - } - - public long getBaseStationId() { - return baseStationId; - } - - public void setBaseStationId(long baseStationId) { - this.baseStationId = baseStationId; - } - - public String getCountryCode() { - return countryCode; - } - - public void setCountryCode(String countryCode) { - this.countryCode = countryCode; - } - - public String getProvider() { - return provider; - } - - public void setProvider(String provider) { - this.provider = provider; - } - - public String getLac() { - return lac; - } - - public void setLac(String lac) { - this.lac = lac; - } - - public String getCell() { - return cell; - } - - public void setCell(String cell) { - this.cell = cell; - } - - public double getLatitude() { - return latitude; - } - - public void setLatitude(double latitude) { - this.latitude = latitude; - } - - public double getLongitude() { - return longitude; - } - - public void setLongitude(double longitude) { - this.longitude = longitude; - } - - public double getR_latitude() { - return r_latitude; - } - - public void setR_latitude(double r_latitude) { - this.r_latitude = r_latitude; - } - - public double getR_longitude() { - return r_longitude; - } - - public void setR_longitude(double r_longitude) { - this.r_longitude = r_longitude; - } - - public double getRange() { - return range; - } - - public void setRange(double range) { - this.range = range; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - @Override - public String toString(){ - return "ID: "+baseStationId+" Address: "+address; - } - -} diff --git a/WebGisDemo/src/com/map/model/Message.java b/WebGisDemo/src/com/map/model/Message.java deleted file mode 100644 index 939ebb3..0000000 --- a/WebGisDemo/src/com/map/model/Message.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.map.model; - -/** - * Created by luxiaoxun on 2015/11/26. - */ -public class Message { - - private String msg; - - private Object data; - - public Message(){ - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public Object getData() { - return data; - } - - public void setData(Object data) { - this.data = data; - } - - -} diff --git a/WebGisDemo/src/com/map/model/PoiPoint.java b/WebGisDemo/src/com/map/model/PoiPoint.java deleted file mode 100644 index 4fbf08c..0000000 --- a/WebGisDemo/src/com/map/model/PoiPoint.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.map.model; - -public class PoiPoint { - - private double lat; - - private double lng; - - public PoiPoint(){ - - } - - public PoiPoint(double lat, double lng) { - this.lat = lat; - this.lng = lng; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - public double getLng() { - return lng; - } - - public void setLng(double lng) { - this.lng = lng; - } - - - -} diff --git a/WebGisDemo/src/com/map/service/BaseStationService.java b/WebGisDemo/src/com/map/service/BaseStationService.java deleted file mode 100644 index ce9b140..0000000 --- a/WebGisDemo/src/com/map/service/BaseStationService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.map.service; - -import com.map.dao.BaseStationDb; -import com.map.model.BaseStation; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - -/** - * Created by luxiaoxun on 2015/11/25. - */ - -public class BaseStationService implements IBaseStationOperation { - - private BaseStationDb baseStaionDb = new BaseStationDb(); - - public List getAllBaseStation(){ - return baseStaionDb.getAllBaseStations(); - } -} diff --git a/WebGisDemo/src/com/map/service/IBaseStationOperation.java b/WebGisDemo/src/com/map/service/IBaseStationOperation.java deleted file mode 100644 index 4213df0..0000000 --- a/WebGisDemo/src/com/map/service/IBaseStationOperation.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.map.service; - -import java.util.List; - -import com.map.model.BaseStation; - -public interface IBaseStationOperation { - List getAllBaseStation(); -} diff --git a/WebGisDemo/src/com/map/util/JsonHelper.java b/WebGisDemo/src/com/map/util/JsonHelper.java deleted file mode 100644 index 927d9b3..0000000 --- a/WebGisDemo/src/com/map/util/JsonHelper.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.map.util; - -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.HashMap; - -import org.codehaus.jackson.map.DeserializationConfig.Feature; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.JavaType; - -public class JsonHelper { - - private static ObjectMapper objMapper = new ObjectMapper(); - - static { - SimpleDateFormat dateFormat = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - objMapper.setDateFormat(dateFormat); - } - - public static type jsonToObject(String json, Class cls) { - type obj = null; - JavaType javaType = objMapper.getTypeFactory().constructType(cls); - objMapper.configure(Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); - try { - obj = objMapper.readValue(json, javaType); - } catch (IOException e) { - e.printStackTrace(); - } - return obj; - } - - public static type jsonToObjectList(String json, - Class collectionClass, Class... elementClass) { - type obj = null; - JavaType javaType = objMapper.getTypeFactory().constructParametricType( - collectionClass, elementClass); - objMapper.configure(Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); - try { - obj = objMapper.readValue(json, javaType); - } catch (IOException e) { - e.printStackTrace(); - } - return obj; - } - - public static type jsonToObjectHashMap(String json, - Class keyClass, Class valueClass) { - type obj = null; - JavaType javaType = objMapper.getTypeFactory().constructParametricType( - HashMap.class, keyClass, valueClass); - objMapper.configure(Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); - try { - obj = objMapper.readValue(json, javaType); - } catch (IOException e) { - e.printStackTrace(); - } - return obj; - } - - public static String objectToJson(Object o) { - String json = ""; - try { - json = objMapper.writeValueAsString(o); - } catch (IOException e) { - e.printStackTrace(); - } - // System.out.println(json); - return json; - } - -} diff --git a/WebGisDemo/src/log4j.properties b/WebGisDemo/src/log4j.properties deleted file mode 100644 index ae33260..0000000 --- a/WebGisDemo/src/log4j.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Root logger option -log4j.rootLogger=info, stdout, file - -# Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.Threshold = info -log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n - -# Direct log messages to file -log4j.appender.file = org.apache.log4j.RollingFileAppender -log4j.appender.file.File = logs/log.log -log4j.appender.file.Append = true -log4j.appender.file.MaxFileSize = 100KB -log4j.appender.file.MaxBackupIndex = 20 -log4j.appender.file.Threshold = warn -log4j.appender.file.layout = org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss} %5p %c{1}:%L - %m%n diff --git a/WebGisDemo/src/main/java/com/luxx/gis/WebGisApp.java b/WebGisDemo/src/main/java/com/luxx/gis/WebGisApp.java new file mode 100644 index 0000000..5453082 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/WebGisApp.java @@ -0,0 +1,33 @@ +package com.luxx.gis; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.SpringBootConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@SpringBootApplication +@SpringBootConfiguration +@EnableWebMvc +@ComponentScan(basePackages = "com.luxx") +public class WebGisApp implements WebMvcConfigurer { + private static final String[] CLASSPATH_RESOURCE_LOCATIONS = { + "classpath:/META-INF/resources/", "classpath:/resources/", + "classpath:/static/", "classpath:/public/"}; + + public static void main(String[] args) { + SpringApplication.run(WebGisApp.class, args); + } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("swagger-ui.html") + .addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/"); + registry.addResourceHandler("/static/**") + .addResourceLocations(CLASSPATH_RESOURCE_LOCATIONS); + } +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/client/ElasticSearchClient.java b/WebGisDemo/src/main/java/com/luxx/gis/client/ElasticSearchClient.java new file mode 100644 index 0000000..4500aa0 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/client/ElasticSearchClient.java @@ -0,0 +1,365 @@ +package com.luxx.gis.client; + +import java.io.IOException; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.http.HttpHost; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.apache.http.impl.nio.client.HttpAsyncClientBuilder; +import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; +import org.elasticsearch.action.bulk.*; +import org.elasticsearch.action.index.IndexRequest; +import org.elasticsearch.action.search.*; +import org.elasticsearch.action.support.master.AcknowledgedResponse; +import org.elasticsearch.client.*; +import org.elasticsearch.client.indices.CreateIndexRequest; +import org.elasticsearch.client.indices.CreateIndexResponse; +import org.elasticsearch.client.indices.PutMappingRequest; +import org.elasticsearch.common.unit.ByteSizeUnit; +import org.elasticsearch.common.unit.ByteSizeValue; +import org.elasticsearch.common.xcontent.XContentBuilder; +import org.elasticsearch.core.TimeValue; +import org.elasticsearch.index.query.QueryBuilder; +import org.elasticsearch.search.Scroll; +import org.elasticsearch.search.SearchHit; +import org.elasticsearch.search.SearchHits; +import org.elasticsearch.search.aggregations.AggregationBuilder; +import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; +import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; +import org.elasticsearch.search.aggregations.bucket.histogram.ParsedDateHistogram; +import org.elasticsearch.search.aggregations.bucket.terms.Terms; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.elasticsearch.search.aggregations.metrics.Max; +import org.elasticsearch.search.aggregations.metrics.Sum; +import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +@Component +@Lazy +public class ElasticSearchClient { + private static Logger log = LogManager.getLogger(ElasticSearchClient.class); + + @Value("${es.address}") + private String esAddress; + + @Value("${es.username:}") + private String username; + + @Value("${es.password:}") + private String password; + + // ES Client + private RestHighLevelClient client; + private BulkProcessor bulkProcessor; + private int bulkSize = 5; + private int bulkActions = 1000; + private int flushInterval = 3; + private int concurrentRequests = 5; + + @PostConstruct + public void init() throws UnknownHostException { + log.info("es.address: " + esAddress); + String[] hostPort = esAddress.split(":"); + if (!StringUtils.isEmpty(username) && !StringUtils.isEmpty(password)) { + client = new RestHighLevelClient(RestClient.builder(new HttpHost(hostPort[0], Integer.parseInt(hostPort[1]))) + .setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() { + @Override + public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) { + CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); + credentialsProvider.setCredentials(AuthScope.ANY, + new UsernamePasswordCredentials(username, password)); + return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider); + } + })); + } else { + client = new RestHighLevelClient(RestClient.builder(new HttpHost(hostPort[0], Integer.parseInt(hostPort[1])))); + } + + BulkProcessor.Listener listener = new BulkProcessor.Listener() { + @Override + public void beforeBulk(long executionId, BulkRequest request) { + log.debug("ES before bulk, number of actions: {}", request.numberOfActions()); + } + + @Override + public void afterBulk(long executionId, BulkRequest request, BulkResponse responses) { + if (responses.hasFailures()) { + try { + StringBuilder sb = new StringBuilder("Failure in bulk execution: "); + int pos = responses.getItems().length - 1; + BulkItemResponse response = responses.getItems()[pos]; + while (!response.isFailed() && pos >= 0) { + response = responses.getItems()[pos]; + --pos; + } + sb.append("\n[").append(pos) + .append("]: index [").append(response.getIndex()) + .append("], type [").append(response.getType()) + .append("], id [").append(response.getId()) + .append("], message [").append(response.getFailureMessage()) + .append("]"); + log.warn(sb.toString()); + } catch (Exception e) { + log.warn("Print es bulk error failed: {}", e.toString()); + if (log.isDebugEnabled()) + log.debug("ES bulk error: {}", responses.buildFailureMessage()); + } + } + } + + @Override + public void afterBulk(long executionId, BulkRequest request, Throwable failure) { + log.error("ES bulk got exception: {}", failure.toString()); + } + }; + + bulkProcessor = BulkProcessor.builder( + (request, bulkListener) -> client.bulkAsync(request, RequestOptions.DEFAULT, bulkListener), + listener, "ES-bulk-processor") + .setBulkActions(bulkActions) + .setBulkSize(new ByteSizeValue(bulkSize, ByteSizeUnit.MB)) + .setFlushInterval(TimeValue.timeValueSeconds(flushInterval)) + .setConcurrentRequests(concurrentRequests) + .build(); + } + + @PreDestroy + public void close() { + if (client != null) { + try { + client.close(); + } catch (IOException e) { + log.error(e.toString()); + } + } + } + + public RestHighLevelClient getClient() { + return this.client; + } + + // Create Index + public boolean createIndex(String indexName) { + if (StringUtils.isEmpty(indexName)) { + return false; + } + try { + org.elasticsearch.client.indices.CreateIndexRequest request = new CreateIndexRequest(indexName); + CreateIndexResponse createIndexResponse = client.indices().create(request, RequestOptions.DEFAULT); + return createIndexResponse.isAcknowledged(); + } catch (Exception e) { + log.error("Create index error: " + e.toString()); + return false; + } + } + + // Delete Index + public boolean deleteIndex(String indexName) { + if (StringUtils.isEmpty(indexName)) { + return false; + } + try { + DeleteIndexRequest request = new DeleteIndexRequest(indexName); + AcknowledgedResponse deleteIndexResponse = client.indices() + .delete(request, RequestOptions.DEFAULT); + return deleteIndexResponse.isAcknowledged(); + } catch (Exception ex) { + log.error("Delete index {} error: {}", indexName, ex); + return false; + } + } + + // Define index mapping + public void createIndexMapping(String index, XContentBuilder contentBuilder) { + PutMappingRequest request = new PutMappingRequest(index); + request.source(contentBuilder); + try { + client.indices().putMapping(request, RequestOptions.DEFAULT); + } catch (IOException e) { + log.error("Put mapping error: " + e.toString()); + } + } + + public BulkProcessor getBulkRequest() { + return this.bulkProcessor; + } + + public IndexRequest getIndexRequest(String index, String jsonSource) { + return new IndexRequest(index).source(jsonSource); + } + + // Get data + public List getSearchData(String index, QueryBuilder queryBuilder, int size) { + List ids = new ArrayList<>(); + SearchRequest searchRequest = new SearchRequest(index); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + sourceBuilder.query(queryBuilder); + sourceBuilder.size(size); + searchRequest.source(sourceBuilder); + try { + SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT); + SearchHits searchHits = searchResponse.getHits(); + for (SearchHit searchHit : searchHits) { + Integer id = (Integer) searchHit.getSourceAsMap().get("id"); + ids.add(id); + } + } catch (IOException e) { + log.error(e); + } + return ids; + } + + // Get data by scroll + public List getSearchDataByScrolls(String index, QueryBuilder queryBuilder) { + List ids = new ArrayList<>(); + final Scroll scroll = new Scroll(TimeValue.timeValueMinutes(1L)); + SearchRequest searchRequest = new SearchRequest(index); + searchRequest.scroll(TimeValue.timeValueMinutes(1L)); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + sourceBuilder.query(queryBuilder); + searchRequest.source(sourceBuilder); + try { + SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT); + String scrollId = searchResponse.getScrollId(); + SearchHit[] searchHits = searchResponse.getHits().getHits(); + while (searchHits != null && searchHits.length > 0) { + SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId); + scrollRequest.scroll(scroll); + searchResponse = client.scroll(scrollRequest, RequestOptions.DEFAULT); + scrollId = searchResponse.getScrollId(); + searchHits = searchResponse.getHits().getHits(); + for (SearchHit searchHit : searchHits) { + Integer id = (Integer) searchHit.getSourceAsMap().get("id"); + ids.add(id); + } + } + ClearScrollRequest clearScrollRequest = new ClearScrollRequest(); + clearScrollRequest.addScrollId(scrollId); + ClearScrollResponse clearScrollResponse = client.clearScroll(clearScrollRequest, RequestOptions.DEFAULT); + boolean succeeded = clearScrollResponse.isSucceeded(); + } catch (Exception ex) { + log.error(ex); + } + return ids; + } + + // Get results from aggregation + public Map getAggSearchResult(String index, QueryBuilder queryBuilder, + AggregationBuilder aggregationBuilder, String aggName) { + Map resultsMap = new HashMap<>(); + SearchRequest searchRequest = new SearchRequest(index); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + sourceBuilder.query(queryBuilder); + sourceBuilder.aggregation(aggregationBuilder); + searchRequest.source(sourceBuilder); + + try { + SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT); + Terms terms = searchResponse.getAggregations().get(aggName); + if (terms != null) { + for (Terms.Bucket entry : terms.getBuckets()) { + resultsMap.put(entry.getKey().toString(), String.valueOf(entry.getDocCount())); + } + } + } catch (Exception ex) { + log.error(ex); + } + + return resultsMap; + } + + // Get results from date histogram aggregation + public Map getDateHistogramAggSearchResult(String index, QueryBuilder queryBuilder, + DateHistogramAggregationBuilder aggregationBuilder, String aggName) { + Map resultsMap = new HashMap<>(); + SearchRequest searchRequest = new SearchRequest(index); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + sourceBuilder.query(queryBuilder); + sourceBuilder.aggregation(aggregationBuilder); + searchRequest.source(sourceBuilder); + try { + SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT); + ParsedDateHistogram dateHistogram = searchResponse.getAggregations().get(aggName); + if (dateHistogram != null) { + for (Histogram.Bucket entry : dateHistogram.getBuckets()) { + resultsMap.put(entry.getKey().toString(), String.valueOf(entry.getDocCount())); + } + } + } catch (Exception ex) { + log.error(ex); + } + + return resultsMap; + } + + public Map getSumAggSearchOrderResult(String index, QueryBuilder queryBuilder, + AggregationBuilder aggregationBuilder, String aggName, String subAggName) { + Map resultsMap = new HashMap<>(); + SearchRequest searchRequest = new SearchRequest(index); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + sourceBuilder.query(queryBuilder); + sourceBuilder.aggregation(aggregationBuilder); + searchRequest.source(sourceBuilder); + try { + SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT); + Terms terms = searchResponse.getAggregations().get(aggName); + if (terms != null) { + for (Terms.Bucket entry : terms.getBuckets()) { + String fieldName = entry.getKey().toString(); + // long fieldCount = entry.getDocCount(); + Sum maxagg = entry.getAggregations().get(subAggName); + double fieldValue = maxagg.getValue(); + // System.out.println(String.format("%s %s %s", fieldName, fieldCount, fieldValue)); + resultsMap.put(fieldName, String.valueOf(fieldValue)); + } + } + } catch (Exception ex) { + log.error(ex); + } + return resultsMap; + } + + public Map getMaxAggSearchOrderResult(String index, QueryBuilder queryBuilder, + AggregationBuilder aggregationBuilder, String aggName, String subAggName) { + Map resultsMap = new HashMap<>(); + SearchRequest searchRequest = new SearchRequest(index); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + sourceBuilder.query(queryBuilder); + sourceBuilder.aggregation(aggregationBuilder); + searchRequest.source(sourceBuilder); + try { + SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT); + Terms terms = searchResponse.getAggregations().get(aggName); + if (terms != null) { + for (Terms.Bucket entry : terms.getBuckets()) { + String fieldName = entry.getKey().toString(); + // long fieldCount = entry.getDocCount(); + Max maxagg = entry.getAggregations().get(subAggName); + double fieldValue = maxagg.getValue(); + // System.out.println(String.format("%s %s %s", fieldName, fieldCount, fieldValue)); + resultsMap.put(fieldName, String.valueOf(fieldValue)); + } + } + } catch (Exception ex) { + log.error(ex); + } + return resultsMap; + } + +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/config/IndexConfig.java b/WebGisDemo/src/main/java/com/luxx/gis/config/IndexConfig.java new file mode 100644 index 0000000..86fddf0 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/config/IndexConfig.java @@ -0,0 +1,65 @@ +package com.luxx.gis.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ConditionalOnProperty(prefix = "index.db", name = "url") +public class IndexConfig { + + @Value("${index.db.url}") + private String dbUrl; + + @Value("${index.db.username}") + private String dbUserName; + + @Value("${index.db.password}") + private String dbPassword; + + @Value("${index.db.table}") + private String dbTable; + + @Value("${index.db.type}") + private String dbType; + + public String getDbUrl() { + return dbUrl; + } + + public void setDbUrl(String dbUrl) { + this.dbUrl = dbUrl; + } + + public String getDbUserName() { + return dbUserName; + } + + public void setDbUserName(String dbUserName) { + this.dbUserName = dbUserName; + } + + public String getDbPassword() { + return dbPassword; + } + + public void setDbPassword(String dbPassword) { + this.dbPassword = dbPassword; + } + + public String getDbTable() { + return dbTable; + } + + public void setDbTable(String dbTable) { + this.dbTable = dbTable; + } + + public String getDbType() { + return dbType; + } + + public void setDbType(String dbType) { + this.dbType = dbType; + } +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/config/SwaggerConfig.java b/WebGisDemo/src/main/java/com/luxx/gis/config/SwaggerConfig.java new file mode 100644 index 0000000..fd35bf9 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/config/SwaggerConfig.java @@ -0,0 +1,31 @@ +package com.luxx.gis.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; + +@Configuration +public class SwaggerConfig { + @Bean + public Docket createRestApi() { + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .apis(RequestHandlerSelectors.basePackage("com.luxx.gis")) + .paths(PathSelectors.any()) + .build(); + } + + // 构建 api文档的详细信息函数 + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("WEB GIS平台") + .version("1.0") + .build(); + } +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/controller/DataIndexController.java b/WebGisDemo/src/main/java/com/luxx/gis/controller/DataIndexController.java new file mode 100644 index 0000000..998ad02 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/controller/DataIndexController.java @@ -0,0 +1,28 @@ +package com.luxx.gis.controller; + +import com.luxx.gis.executor.IndexExecutor; +import com.luxx.gis.model.ResultData; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/data") +@Api(tags = "data") +@Slf4j +public class DataIndexController { + @Autowired + @Qualifier("poiIndexExecutor") + private IndexExecutor indexExecutor; + + @PostMapping(value = "/index") + public ResultData indexData() { + log.info("Start to index data"); + indexExecutor.start(); + ResultData msg = new ResultData(); + msg.setMsg("ok"); + return msg; + } +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/controller/MapController.java b/WebGisDemo/src/main/java/com/luxx/gis/controller/MapController.java new file mode 100644 index 0000000..1664117 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/controller/MapController.java @@ -0,0 +1,17 @@ +package com.luxx.gis.controller; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.servlet.ModelAndView; + +@Controller +@Slf4j +public class MapController { + + @GetMapping("/map") + public ModelAndView map() { + return new ModelAndView("map"); + } + +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/controller/StationController.java b/WebGisDemo/src/main/java/com/luxx/gis/controller/StationController.java new file mode 100644 index 0000000..ad386c1 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/controller/StationController.java @@ -0,0 +1,86 @@ +package com.luxx.gis.controller; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.luxx.gis.model.Station; +import com.luxx.gis.model.PoiData; +import com.luxx.gis.model.PoiPoint; +import com.luxx.gis.model.ResultData; +import com.luxx.gis.model.request.DataInCircleRequest; +import com.luxx.gis.model.request.DataInRectangleRequest; +import com.luxx.gis.service.StationService; +import com.luxx.gis.service.IndexSearchService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.Min; +import java.util.List; + +@RestController +@RequestMapping("/station") +@Api(tags = "station") +@Slf4j +public class StationController { + @Autowired + private StationService stationService; + + @Autowired + private IndexSearchService indexSearchService; + + @GetMapping("/loadData") + public ResultData loadData(@RequestParam(defaultValue = "1") @Min(1) int pageNum, + @RequestParam(defaultValue = "10") int pageSize) { + PageHelper.startPage(pageNum, pageSize); + List stationList = stationService.getStation(); + PageInfo pageInfo = new PageInfo<>(stationList); + ResultData msg = new ResultData(); + msg.setMsg("ok"); + msg.setData(pageInfo); + return msg; + } + + @PostMapping("/dataInCircle") + public ResultData getDataInCircle(@RequestBody DataInCircleRequest request) { + log.info("Query data in circle: " + request); + double radius = request.getRadius(); + double lat = request.getLat(); + double lng = request.getLng(); + List dataList = indexSearchService.searchPoiInCircle(lng, lat, radius); + ResultData msg = new ResultData(); + msg.setMsg("ok"); + msg.setData(dataList); + return msg; + } + + @PostMapping("/dataInRectangle") + public ResultData getDataInRectangle(@RequestBody DataInRectangleRequest request) { + log.info("Query data in rectangle: " + request); + List points = request.getPoints(); + ResultData msg = new ResultData(); + if (points != null && points.size() >= 4) { + double minLat = points.get(0).getLat(); + double maxLat = points.get(1).getLat(); + double minLng = points.get(0).getLon(); + double maxLng = points.get(1).getLon(); + + for (PoiPoint poiPoint : points) { + double lat = poiPoint.getLat(); + double lng = poiPoint.getLon(); + maxLat = Math.max(maxLat, lat); + minLat = Math.min(minLat, lat); + maxLng = Math.max(maxLng, lng); + minLng = Math.min(minLng, lng); + } + List dataList = indexSearchService.searchPoiInRectangle(minLng, minLat, maxLng, maxLat); + msg.setMsg("ok"); + msg.setData(dataList); + } else { + msg.setMsg("failed"); + } + + return msg; + } + +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/dao/StationMapper.java b/WebGisDemo/src/main/java/com/luxx/gis/dao/StationMapper.java new file mode 100644 index 0000000..be5adeb --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/dao/StationMapper.java @@ -0,0 +1,17 @@ +package com.luxx.gis.dao; + +import com.luxx.gis.model.Station; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface StationMapper { + List getStation(); + + int insert(Station station); + + int delete(int id); + + int update(Station station); +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/executor/IndexExecutor.java b/WebGisDemo/src/main/java/com/luxx/gis/executor/IndexExecutor.java new file mode 100644 index 0000000..cd2da5e --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/executor/IndexExecutor.java @@ -0,0 +1,35 @@ +package com.luxx.gis.executor; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; + +public abstract class IndexExecutor { + public abstract void start(); + + public abstract void stop(); + + public void attemptClose(ResultSet o) { + try { + if (o != null) + o.close(); + } catch (Exception e) { + } + } + + public void attemptClose(Statement o) { + try { + if (o != null) + o.close(); + } catch (Exception e) { + } + } + + public void attemptClose(Connection o) { + try { + if (o != null) + o.close(); + } catch (Exception e) { + } + } +} diff --git a/IndexSearchService/src/main/java/com/luxx/service/MysqlDataTransferEexcutor.java b/WebGisDemo/src/main/java/com/luxx/gis/executor/MysqlIndexExecutor.java similarity index 63% rename from IndexSearchService/src/main/java/com/luxx/service/MysqlDataTransferEexcutor.java rename to WebGisDemo/src/main/java/com/luxx/gis/executor/MysqlIndexExecutor.java index 7eb04c0..2728638 100644 --- a/IndexSearchService/src/main/java/com/luxx/service/MysqlDataTransferEexcutor.java +++ b/WebGisDemo/src/main/java/com/luxx/gis/executor/MysqlIndexExecutor.java @@ -1,4 +1,4 @@ -package com.luxx.service; +package com.luxx.gis.executor; import java.sql.Connection; import java.sql.ResultSet; @@ -8,60 +8,74 @@ import java.util.Date; import java.util.List; -import com.luxx.util.PropertiesUtil; +import com.luxx.gis.config.IndexConfig; +import com.luxx.gis.model.HotspotData; +import com.luxx.gis.service.IndexDataSource; +import com.luxx.gis.service.MysqlIndexService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import com.luxx.model.HotspotData; -import com.luxx.util.DataSourceUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; -public class MysqlDataTransferEexcutor { +import javax.annotation.PostConstruct; - private static Logger log = LogManager.getLogger(MysqlDataTransferEexcutor.class); +@Component +@ConditionalOnProperty(name = "index.es.cluster.address") +public class MysqlIndexExecutor extends IndexExecutor { + private static Logger log = LogManager.getLogger(MysqlIndexExecutor.class); - private MysqlIndexService indexService = new MysqlIndexService(); + @Autowired + private MysqlIndexService mysqlIndexService; + + @Autowired + private IndexDataSource indexDataSource; + + @Autowired + private IndexConfig indexConfig; // 读取数据分页 private long pageNum = 0; private int pageCount = 30000; - private boolean isFinished = false; - + private volatile boolean isFinished = false; private String dataTableName; - public MysqlDataTransferEexcutor() { - this.dataTableName = PropertiesUtil.getInstance().getProperty("db.table"); + @PostConstruct + public void init() { + dataTableName = indexConfig.getDbTable(); } + @Override public void start() { - - log.info("Start index ..."); + log.info("Start index mysql data to ES"); //indexService.deleteIndex(); - indexService.createIndex(); - indexService.defineIndexTypeMapping(); + mysqlIndexService.createIndex(); + mysqlIndexService.createIndexMapping(); Thread exportThread = new Thread(new Runnable() { public void run() { while (!isFinished) { - List dataList = getDataFromOldDataBase(); + List dataList = getDataFromDataBase(); if (dataList != null && !dataList.isEmpty()) { - indexService.indexHotSpotDataList(dataList); + mysqlIndexService.indexHotSpotDataList(dataList); log.info(String.format("Index data complete %s pages", pageNum)); } } - log.info("Index complete ..."); + log.info("Index mysql data to ES complete "); } }); exportThread.start(); } - private List getDataFromOldDataBase() { - List dataList = new ArrayList(pageCount); + private List getDataFromDataBase() { + List dataList = new ArrayList<>(pageCount); Connection dbConnection = null; Statement stm = null; ResultSet res = null; try { - dbConnection = DataSourceUtil.getConnection(); + dbConnection = indexDataSource.getConnection(); stm = dbConnection.createStatement(); ++pageNum; long startNum = (pageNum - 1) * pageCount; @@ -100,28 +114,7 @@ private List getDataFromOldDataBase() { return dataList; } - private void attemptClose(ResultSet o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } + @Override + public void stop() { } - - private void attemptClose(Statement o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } - } - - private void attemptClose(Connection o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } - } - } diff --git a/WebGisDemo/src/main/java/com/luxx/gis/executor/PoiIndexExecutor.java b/WebGisDemo/src/main/java/com/luxx/gis/executor/PoiIndexExecutor.java new file mode 100644 index 0000000..152cdec --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/executor/PoiIndexExecutor.java @@ -0,0 +1,118 @@ +package com.luxx.gis.executor; + +import com.luxx.gis.config.IndexConfig; +import com.luxx.gis.model.PoiData; +import com.luxx.gis.service.IndexDataSource; +import com.luxx.gis.service.PoiIndexService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.PostConstruct; +import java.util.List; +import java.util.ArrayList; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + +@Component +@ConditionalOnProperty(name = "index.db.url") +public class PoiIndexExecutor extends IndexExecutor { + private static Logger log = LogManager.getLogger(PoiIndexExecutor.class); + + @Autowired + private PoiIndexService poiIndexService; + + @Autowired + private IndexDataSource indexDataSource; + + @Autowired + private IndexConfig indexConfig; + + // 读取数据分页 + private long pageNum = 0; + private int pageCount = 1000; + private String dataTableName; + + @PostConstruct + public void init() { + dataTableName = indexConfig.getDbTable(); + } + + @Override + public void start() { + log.info("Start index POI"); + try { + poiIndexService.clear(); + poiIndexService.createIndexMapping(); + poiIndexService.createIndex(); + + Thread exportThread = new Thread(new Runnable() { + public void run() { + boolean isRunning = true; + while (isRunning) { + List dataList = getDataFromDataBase(); + if (dataList == null || dataList.isEmpty()) { + log.info("Index POI finished"); + break; + } + int len = dataList.size(); + poiIndexService.indexPoiDataList(dataList); + log.info("Index POI max id：" + dataList.get(len - 1).getId()); + } + } + }); + exportThread.start(); + } catch (Exception ex) { + log.error("Index POI exception：" + ex.toString()); + } + } + + private List getDataFromDataBase() { + List dataList = new ArrayList<>(pageCount); + Connection dbConnection = null; + Statement stm = null; + ResultSet res = null; + try { + dbConnection = indexDataSource.getConnection(); + if (dbConnection != null) { + stm = dbConnection.createStatement(); + ++pageNum; + long startNum = (pageNum - 1) * pageCount; + res = stm.executeQuery(String.format( + "SELECT * FROM %s LIMIT %s,%s ", dataTableName, + startNum, pageCount)); + if (res != null) { + while (res.next()) { + int id = res.getInt("id"); + String address = res.getString("address"); + double lat = res.getDouble("latitude"); + double lng = res.getDouble("longitude"); + PoiData data = new PoiData(id, address, lat, lng); + dataList.add(data); + } + } + } else { + log.error("Get connection fail"); + return null; + } + } catch (SQLException e) { + e.printStackTrace(); + log.error(e.toString()); + } finally { + attemptClose(res); + attemptClose(stm); + attemptClose(dbConnection); + } + + return dataList; + } + + + @Override + public void stop() { + } +} diff --git a/IndexSearchService/src/main/java/com/luxx/service/RedshiftDataTransferEexcutor.java b/WebGisDemo/src/main/java/com/luxx/gis/executor/RedshiftIndexExecutor.java similarity index 67% rename from IndexSearchService/src/main/java/com/luxx/service/RedshiftDataTransferEexcutor.java rename to WebGisDemo/src/main/java/com/luxx/gis/executor/RedshiftIndexExecutor.java index 6563de8..d2c333d 100644 --- a/IndexSearchService/src/main/java/com/luxx/service/RedshiftDataTransferEexcutor.java +++ b/WebGisDemo/src/main/java/com/luxx/gis/executor/RedshiftIndexExecutor.java @@ -1,4 +1,4 @@ -package com.luxx.service; +package com.luxx.gis.executor; import java.sql.Connection; import java.sql.ResultSet; @@ -7,62 +7,77 @@ import java.util.ArrayList; import java.util.List; -import com.luxx.model.EndpointData; -import com.luxx.util.DataSourceUtil; -import com.luxx.util.PropertiesUtil; +import com.luxx.gis.config.IndexConfig; +import com.luxx.gis.model.EndpointData; +import com.luxx.gis.service.RedshiftIndexService; +import com.luxx.gis.service.IndexDataSource; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Component; -public class RedshiftDataTransferEexcutor { +import javax.annotation.PostConstruct; - private static Logger log = LogManager.getLogger(RedshiftDataTransferEexcutor.class); +@Component +@ConditionalOnProperty(name = "index.es.cluster.address") +public class RedshiftIndexExecutor extends IndexExecutor { + private static Logger log = LogManager.getLogger(RedshiftIndexExecutor.class); - private RedshiftIndexService indexService = new RedshiftIndexService(); + @Autowired + private RedshiftIndexService indexService; + + @Autowired + private IndexDataSource indexDataSource; + + @Autowired + private IndexConfig indexConfig; // 读取数据分页 private long pageNum = 1; private int pageCount = 30000; - private boolean isFinished = false; - + private volatile boolean isFinished = false; private String dataTableName; - public RedshiftDataTransferEexcutor() { - this.dataTableName = PropertiesUtil.getInstance().getProperty("db.table"); + @PostConstruct + public void init() { + dataTableName = indexConfig.getDbTable(); } + @Override public void start() { - // log.info("Delete old index..."); + // log.info("Delete old index"); //indexService.deleteIndex(); - log.info("Create new index..."); + log.info("Create new index"); indexService.createIndex(); - log.info("Create new index type mapping..."); - indexService.defineIndexTypeMapping(); + log.info("Create new index type mapping"); + indexService.createIndexMapping(); - log.info("Start index ..."); + log.info("Start index redshift data to ES"); Thread exportThread = new Thread(new Runnable() { public void run() { while (!isFinished) { - List dataList = getDataFromOldDataBase(); + List dataList = getDataFromDataBase(); if (dataList != null && !dataList.isEmpty()) { indexService.indexHotSpotDataListForRedshift(dataList); log.info(String.format("Index data complete %s pages", pageNum)); } } - log.info("Index complete ..."); + log.info("Index redshift data to ES complete"); } }); exportThread.start(); } - private List getDataFromOldDataBase() { + private List getDataFromDataBase() { List dataList = new ArrayList(pageCount); Connection dbConnection = null; Statement stm = null; ResultSet res = null; try { - dbConnection = DataSourceUtil.getConnection(); + dbConnection = indexDataSource.getConnection(); stm = dbConnection.createStatement(); ++pageNum; long startNum = (pageNum - 1) * pageCount; @@ -105,28 +120,7 @@ private List getDataFromOldDataBase() { return dataList; } - private void attemptClose(ResultSet o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } - } - - private void attemptClose(Statement o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } + @Override + public void stop() { } - - private void attemptClose(Connection o) { - try { - if (o != null) - o.close(); - } catch (Exception e) { - } - } - -} +} \ No newline at end of file diff --git a/IndexSearchService/src/main/java/com/luxx/model/EndpointData.java b/WebGisDemo/src/main/java/com/luxx/gis/model/EndpointData.java similarity index 98% rename from IndexSearchService/src/main/java/com/luxx/model/EndpointData.java rename to WebGisDemo/src/main/java/com/luxx/gis/model/EndpointData.java index 9ead1a9..e907728 100644 --- a/IndexSearchService/src/main/java/com/luxx/model/EndpointData.java +++ b/WebGisDemo/src/main/java/com/luxx/gis/model/EndpointData.java @@ -1,10 +1,9 @@ -package com.luxx.model; +package com.luxx.gis.model; import java.io.Serializable; import java.util.Date; public class EndpointData implements Serializable { - private static final long serialVersionUID = 1493676048457257941L; private int org_id; diff --git a/WebGisDemo/src/main/java/com/luxx/gis/model/HotspotData.java b/WebGisDemo/src/main/java/com/luxx/gis/model/HotspotData.java new file mode 100644 index 0000000..807407b --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/model/HotspotData.java @@ -0,0 +1,26 @@ +package com.luxx.gis.model; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class HotspotData implements Serializable { + private static final long serialVersionUID = -2132799122365334550L; + + private Long id; + private int seqNum; + private Date collectTime; + + private String imsi; + private String imei; + private String tmsi; + + private String srcLac; + private String deviceID; + private String teleOper; + private String ownArea; + private String teleSevenNum; + private String teleBrand; +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/model/PoiData.java b/WebGisDemo/src/main/java/com/luxx/gis/model/PoiData.java new file mode 100644 index 0000000..d1b6235 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/model/PoiData.java @@ -0,0 +1,24 @@ +package com.luxx.gis.model; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class PoiData implements Serializable { + private static final long serialVersionUID = -3978597686509612192L; + + private long id; + private String address; + private PoiPoint poiPoint; + + public PoiData() { + } + + public PoiData(long id, String address, double lat, double lng) { + this.id = id; + this.address = address; + this.poiPoint = new PoiPoint(lat, lng); + } + +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/model/PoiPoint.java b/WebGisDemo/src/main/java/com/luxx/gis/model/PoiPoint.java new file mode 100644 index 0000000..3c5102b --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/model/PoiPoint.java @@ -0,0 +1,17 @@ +package com.luxx.gis.model; + +import lombok.Data; + +@Data +public class PoiPoint { + private double lat; + private double lon; + + public PoiPoint() { + } + + public PoiPoint(double lat, double lon) { + this.lat = lat; + this.lon = lon; + } +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/model/ResultData.java b/WebGisDemo/src/main/java/com/luxx/gis/model/ResultData.java new file mode 100644 index 0000000..e7bd7bc --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/model/ResultData.java @@ -0,0 +1,33 @@ +package com.luxx.gis.model; + +public class ResultData { + private String msg; + private Object data; + + public ResultData() { + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } + + @Override + public String toString() { + return "ResultData{" + + "msg='" + msg + '\'' + + ", data=" + data + + '}'; + } +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/model/Station.java b/WebGisDemo/src/main/java/com/luxx/gis/model/Station.java new file mode 100644 index 0000000..a8a5ea4 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/model/Station.java @@ -0,0 +1,22 @@ +package com.luxx.gis.model; + +import lombok.Data; + +@Data +public class Station { + private long id; + + private String countryCode; + + private String provider; + + private String lac; + + private String cell; + + private double latitude; + + private double longitude; + + private String address; +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/model/request/DataInCircleRequest.java b/WebGisDemo/src/main/java/com/luxx/gis/model/request/DataInCircleRequest.java new file mode 100644 index 0000000..21742ad --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/model/request/DataInCircleRequest.java @@ -0,0 +1,10 @@ +package com.luxx.gis.model.request; + +import lombok.Data; + +@Data +public class DataInCircleRequest { + private double radius; + private double lat; + private double lng; +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/model/request/DataInRectangleRequest.java b/WebGisDemo/src/main/java/com/luxx/gis/model/request/DataInRectangleRequest.java new file mode 100644 index 0000000..0423ca5 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/model/request/DataInRectangleRequest.java @@ -0,0 +1,11 @@ +package com.luxx.gis.model.request; + +import com.luxx.gis.model.PoiPoint; +import lombok.Data; + +import java.util.List; + +@Data +public class DataInRectangleRequest { + private List points; +} diff --git a/IndexSearchService/src/main/java/com/luxx/util/DataSourceUtil.java b/WebGisDemo/src/main/java/com/luxx/gis/service/IndexDataSource.java similarity index 55% rename from IndexSearchService/src/main/java/com/luxx/util/DataSourceUtil.java rename to WebGisDemo/src/main/java/com/luxx/gis/service/IndexDataSource.java index 80c1729..4b49737 100644 --- a/IndexSearchService/src/main/java/com/luxx/util/DataSourceUtil.java +++ b/WebGisDemo/src/main/java/com/luxx/gis/service/IndexDataSource.java @@ -1,37 +1,43 @@ -package com.luxx.util; +package com.luxx.gis.service; import java.sql.Connection; import java.sql.SQLException; +import com.luxx.gis.config.IndexConfig; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; -public class DataSourceUtil { - +import javax.annotation.PostConstruct; + +@Service +@ConditionalOnProperty(name = "index.db.url") +public class IndexDataSource { private static final Long HIKARI_MAX_LIFE_TIME_MS = 1800000L; // 30 min private static final Long HIKARI_LEAK_DETECTION_THRESHOLD_MS = 60000L; private static final int HIKARI_POOL_SIZE = 5; - private static HikariDataSource dataSource = null; - private DataSourceUtil(){ - } + @Autowired + private IndexConfig indexConfig; + + @PostConstruct + public void init() { + String dbUrl = indexConfig.getDbUrl(); + String username = indexConfig.getDbUserName(); + String password = indexConfig.getDbPassword(); + String dbType = indexConfig.getDbType(); - static{ - String dbUrl = PropertiesUtil.getInstance().getProperty("db.url"); - String username = PropertiesUtil.getInstance().getProperty("db.username"); - String password = PropertiesUtil.getInstance().getProperty("db.password"); - String dbType = PropertiesUtil.getInstance().getProperty("db.type"); - HikariConfig config = new HikariConfig(); config.setJdbcUrl(dbUrl); config.setUsername(username); config.setPassword(password); - if(dbType.equals("redshift")){ + if (dbType.equals("redshift")) { config.setDriverClassName("com.amazon.redshift.jdbc.Driver"); - } - else if(dbType.equals("mysql")){ - config.setDriverClassName("com.mysql.jdbc.Driver"); + } else if (dbType.equals("mysql")) { + config.setDriverClassName("com.mysql.cj.jdbc.Driver"); } config.addDataSourceProperty("cachePrepStmts", "true"); config.addDataSourceProperty("prepStmtCacheSize", "250"); @@ -39,16 +45,15 @@ else if(dbType.equals("mysql")){ config.setMaxLifetime(HIKARI_MAX_LIFE_TIME_MS); config.setMaximumPoolSize(HIKARI_POOL_SIZE); config.setMinimumIdle(HIKARI_POOL_SIZE); - config.setLeakDetectionThreshold(HIKARI_LEAK_DETECTION_THRESHOLD_MS); - + config.setLeakDetectionThreshold(HIKARI_LEAK_DETECTION_THRESHOLD_MS); + dataSource = new HikariDataSource(config); } - public static Connection getConnection() throws SQLException{ - if (dataSource != null){ + public Connection getConnection() throws SQLException { + if (dataSource != null) { return dataSource.getConnection(); - } - else{ + } else { return null; } } diff --git a/WebGisDemo/src/main/java/com/luxx/gis/service/IndexSearchService.java b/WebGisDemo/src/main/java/com/luxx/gis/service/IndexSearchService.java new file mode 100644 index 0000000..4b2089b --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/service/IndexSearchService.java @@ -0,0 +1,25 @@ +package com.luxx.gis.service; + +import com.luxx.gis.model.PoiData; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class IndexSearchService { + @Autowired + private PoiIndexService poiIndexService; + + public List searchPoiInCircle(double lng, double lat, double radius) { + return poiIndexService.searchPoiInCircle(lng, lat, String.valueOf(radius)); + } + + public List searchPoiInRectangle(double minLng, double minLat, + double maxLng, double maxLat) { + return poiIndexService.searchPoiInRectangle(minLng, minLat, maxLng, maxLat); + } +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/service/MysqlIndexService.java b/WebGisDemo/src/main/java/com/luxx/gis/service/MysqlIndexService.java new file mode 100644 index 0000000..db8e437 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/service/MysqlIndexService.java @@ -0,0 +1,233 @@ +package com.luxx.gis.service; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.luxx.gis.client.ElasticSearchClient; +import com.luxx.gis.model.HotspotData; + +import com.luxx.gis.util.JsonUtil; +import org.elasticsearch.action.bulk.BulkProcessor; +import org.elasticsearch.common.xcontent.XContentBuilder; +import org.elasticsearch.common.xcontent.XContentFactory; +import org.elasticsearch.index.query.QueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.search.aggregations.AggregationBuilders; +import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; +import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; +import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; + +@Service +@ConditionalOnProperty(name = "index.es.cluster.address") +public class MysqlIndexService { + private static Logger log = LogManager.getLogger(MysqlIndexService.class); + + @Autowired + private ElasticSearchClient elasticSearchClient; + + // Index Name + private static final String Index = "hotspot"; + + // Field Name + private static final String TimeFieldName = "CollectTime"; + private static final String IDFieldName = "id"; + private static final String IMSIFieldName = "IMSI"; + private static final String IMEIFieldName = "IMEI"; + private static final String DeviceIDFieldName = "DeviceID"; + private static final String OwnAreaFieldName = "OwnArea"; + private static final String TeleOperFieldName = "TeleOper"; + private static final String SeqNumFieldName = "SeqNum"; + + private static final String DateFormat = "yyyy-MM-dd HH:mm:ss"; + + public void deleteIndex() { + elasticSearchClient.deleteIndex(Index); + } + + public void createIndex() { + elasticSearchClient.createIndex(Index); + } + + public void createIndexMapping() { + XContentBuilder contentBuilder = prepareMappingBuilder(); + elasticSearchClient.createIndexMapping(Index, contentBuilder); + } + + public XContentBuilder prepareMappingBuilder() { + XContentBuilder contentBuilder = null; + try { + contentBuilder = XContentFactory.jsonBuilder(); + contentBuilder.startObject(); + { + contentBuilder.startObject("properties"); + { + contentBuilder.startObject(IDFieldName).field("type", "long").endObject(); + contentBuilder.startObject(SeqNumFieldName).field("type", "long").endObject(); + contentBuilder.startObject(IMSIFieldName).field("type", "keyword").endObject(); + contentBuilder.startObject(IMEIFieldName).field("type", "keyword").endObject(); + contentBuilder.startObject(DeviceIDFieldName).field("type", "keyword").endObject(); + contentBuilder.startObject(OwnAreaFieldName).field("type", "keyword").endObject(); + contentBuilder.startObject(TeleOperFieldName).field("type", "keyword").endObject(); + contentBuilder.startObject(TimeFieldName).field("type", "date").field("format", DateFormat).endObject(); + } + contentBuilder.endObject(); + } + contentBuilder.endObject(); + } catch (IOException e) { + log.error(e); + } + return contentBuilder; + } + + // Build json data + public String getIndexDataFromHotspotData(HotspotData data) { + Map map = new HashMap<>(); + if (data != null) { + map.put(IDFieldName, data.getId()); + map.put(SeqNumFieldName, data.getSeqNum()); + map.put(IMSIFieldName, data.getImsi()); + map.put(IMEIFieldName, data.getImei()); + map.put(DeviceIDFieldName, data.getDeviceID()); + map.put(OwnAreaFieldName, data.getOwnArea()); + map.put(TeleOperFieldName, data.getTeleOper()); + map.put(TimeFieldName, data.getCollectTime()); + } + return JsonUtil.objectToJson(map); + } + + // Index data in bulk + public void indexHotSpotDataList(List dataList) { + if (dataList != null && dataList.size() > 0) { + BulkProcessor bulkRequest = elasticSearchClient.getBulkRequest(); + for (int i = 0; i < dataList.size(); ++i) { + HotspotData data = dataList.get(i); + String jsonSource = getIndexDataFromHotspotData(data); + if (jsonSource != null) { + bulkRequest.add(elasticSearchClient.getIndexRequest(Index, jsonSource)); + } + } + } + } + + // Build query based on device List + private QueryBuilder getDeviceQueryBuilder(List deviceList) { + QueryBuilder deviceQueryBuilder = QueryBuilders.matchAllQuery(); + if (deviceList != null && deviceList.size() > 0) { + deviceQueryBuilder = QueryBuilders.termsQuery(DeviceIDFieldName, deviceList); + } + return deviceQueryBuilder; + } + + // Build date time range query + private QueryBuilder getDateRangeQueryBuilder(String startTime, String endTime) { + QueryBuilder rangeBuilder = QueryBuilders.matchAllQuery(); + if (startTime != null && endTime != null) { + rangeBuilder = QueryBuilders.rangeQuery(TimeFieldName).from(startTime).to(endTime).format(DateFormat); + } + return rangeBuilder; + } + + // Get result from startTime to endTime + public List getSearchResultBetweenTime(String startTime, String endTime) { + QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); + return elasticSearchClient.getSearchDataByScrolls(Index, rangeBuilder); + } + + // Get count histogram based on date from startTime to endTime + public Map getDeviceDateFacetDistributeInfo(String startTime, String endTime, + List deviceList, final String gap) { + Map resultsMap = new HashMap<>(); + QueryBuilder deviceQueryBuilder = getDeviceQueryBuilder(deviceList); + QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(deviceQueryBuilder).must(rangeBuilder); + + DateHistogramAggregationBuilder dateHistogramAggBuilder = AggregationBuilders.dateHistogram("dateAgg").field(TimeFieldName) + .fixedInterval(DateHistogramInterval.YEAR); + switch (gap) { + case "Quarter": + dateHistogramAggBuilder = AggregationBuilders.dateHistogram("dateAgg").field(TimeFieldName) + .fixedInterval(DateHistogramInterval.QUARTER); + break; + case "Month": + dateHistogramAggBuilder = AggregationBuilders.dateHistogram("dateAgg").field(TimeFieldName) + .fixedInterval(DateHistogramInterval.MONTH); + break; + case "Week": + dateHistogramAggBuilder = AggregationBuilders.dateHistogram("dateAgg").field(TimeFieldName) + .fixedInterval(DateHistogramInterval.WEEK); + break; + case "Day": + dateHistogramAggBuilder = AggregationBuilders.dateHistogram("dateAgg").field(TimeFieldName) + .fixedInterval(DateHistogramInterval.DAY); + break; + } + + resultsMap = elasticSearchClient.getDateHistogramAggSearchResult(Index, queryBuilder, dateHistogramAggBuilder, "dateAgg"); + return resultsMap; + } + + // Get count aggregation based on device from startTime to endTime + public Map getDeviceDistributedInfo(String startTime, String endTime, List deviceList) { + Map resultsMap = new HashMap<>(); + + QueryBuilder deviceQueryBuilder = getDeviceQueryBuilder(deviceList); + QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(deviceQueryBuilder).must(rangeBuilder); + + TermsAggregationBuilder termsAggBuilder = AggregationBuilders.terms("DeviceIDAgg").size(Integer.MAX_VALUE) + .field(DeviceIDFieldName); + resultsMap = elasticSearchClient.getAggSearchResult(Index, queryBuilder, termsAggBuilder, "DeviceIDAgg"); + return resultsMap; + } + + // Get count aggregation based on OwnArea from startTime to endTime + public Map getOwnAreaDistributeInfo(String startTime, String endTime, List deviceList, + String provinceName, String cityName) { + Map resultsMap = new HashMap<>(); + + QueryBuilder deviceQueryBuilder = getDeviceQueryBuilder(deviceList); + QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); + + QueryBuilder areaFieldQueryBuilder = QueryBuilders.matchAllQuery(); + if (provinceName != null && !provinceName.isEmpty()) { + if (cityName != null && !cityName.isEmpty()) { + areaFieldQueryBuilder = QueryBuilders.termQuery(OwnAreaFieldName, provinceName + " " + cityName); + } else { + areaFieldQueryBuilder = QueryBuilders.prefixQuery(OwnAreaFieldName, provinceName); + } + } + + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(deviceQueryBuilder).must(rangeBuilder) + .must(areaFieldQueryBuilder); + + TermsAggregationBuilder termsAggBuilder = AggregationBuilders.terms("OwnFieldAgg").size(Integer.MAX_VALUE) + .field(OwnAreaFieldName); + + resultsMap = elasticSearchClient.getAggSearchResult(Index, queryBuilder, termsAggBuilder, "OwnFieldAgg"); + return resultsMap; + } + + // Get count aggregation based on TeleOper from startTime to endTime + public Map getTeleOperDistributeInfo(String startTime, String endTime, List deviceList) { + Map resultsMap = new HashMap<>(); + + QueryBuilder deviceQueryBuilder = getDeviceQueryBuilder(deviceList); + QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); + + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(deviceQueryBuilder).must(rangeBuilder); + + TermsAggregationBuilder termsAggBuilder = AggregationBuilders.terms("TelOperFieldAgg").size(Integer.MAX_VALUE) + .field(TeleOperFieldName); + + resultsMap = elasticSearchClient.getAggSearchResult(Index, queryBuilder, termsAggBuilder, "TelOperFieldAgg"); + return resultsMap; + } +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/service/PoiIndexService.java b/WebGisDemo/src/main/java/com/luxx/gis/service/PoiIndexService.java new file mode 100644 index 0000000..ffe9f6e --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/service/PoiIndexService.java @@ -0,0 +1,187 @@ +package com.luxx.gis.service; + +import com.luxx.gis.client.ElasticSearchClient; +import com.luxx.gis.model.PoiData; +import com.luxx.gis.util.JsonUtil; +import org.apache.lucene.document.*; +import org.apache.lucene.search.*; +import org.apache.lucene.search.BooleanClause.Occur; +import org.apache.lucene.spatial.query.SpatialArgs; +import org.apache.lucene.spatial.query.SpatialOperation; +import org.apache.lucene.util.QueryBuilder; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.elasticsearch.action.bulk.BulkProcessor; +import org.elasticsearch.action.search.SearchRequest; +import org.elasticsearch.action.search.SearchResponse; +import org.elasticsearch.client.RequestOptions; +import org.elasticsearch.common.geo.GeoPoint; +import org.elasticsearch.common.unit.DistanceUnit; +import org.elasticsearch.common.xcontent.XContentBuilder; +import org.elasticsearch.common.xcontent.XContentFactory; +import org.elasticsearch.index.query.GeoBoundingBoxQueryBuilder; +import org.elasticsearch.index.query.GeoDistanceQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.query.TermQueryBuilder; +import org.elasticsearch.search.SearchHit; +import org.elasticsearch.search.SearchHits; +import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.swing.text.html.HTMLDocument; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +@Service +public class PoiIndexService { + private static Logger log = LogManager.getLogger(PoiIndexService.class); + + // Field Name + private static final String IDFieldName = "id"; + private static final String AddressFieldName = "address"; + private static final String LatFieldName = "lat"; + private static final String LngFieldName = "lng"; + private static final String LocationFieldName = "poiPoint"; + + private static final String IndexName = "geo_location"; + + private final int maxResultCount = 100; + + @Autowired + private ElasticSearchClient elasticSearchClient; + + public void clear() { + elasticSearchClient.deleteIndex(IndexName); + } + + public void createIndex() { + elasticSearchClient.createIndex(IndexName); + } + + public void createIndexMapping() { + XContentBuilder contentBuilder = prepareMappingBuilder(); + elasticSearchClient.createIndexMapping(IndexName, contentBuilder); + } + + public XContentBuilder prepareMappingBuilder() { + XContentBuilder contentBuilder = null; + try { + contentBuilder = XContentFactory.jsonBuilder(); + contentBuilder.startObject(); + { + contentBuilder.startObject("properties"); + { + contentBuilder.startObject(IDFieldName).field("type", "long").endObject(); + contentBuilder.startObject(AddressFieldName).field("type", "keyword").endObject(); + contentBuilder.startObject(LocationFieldName).field("type", "geo_point").endObject(); + } + contentBuilder.endObject(); + } + contentBuilder.endObject(); + } catch (IOException e) { + log.error(e); + } + return contentBuilder; + } + + public boolean indexPoiDataList(List dataList) { + try { + if (dataList != null && dataList.size() > 0) { + BulkProcessor bulkRequest = elasticSearchClient.getBulkRequest(); + for (int i = 0; i < dataList.size(); ++i) { + PoiData data = dataList.get(i); + String jsonSource = JsonUtil.objectToJson(data); + if (jsonSource != null) { + bulkRequest.add(elasticSearchClient.getIndexRequest(IndexName, jsonSource)); + } + } + return true; + } + return false; + } catch (Exception e) { + log.error(e.toString()); + return false; + } + } + + public List searchPoiInRectangle(double minLng, double minLat, double maxLng, double maxLat) { + List results = new ArrayList<>(); + SearchRequest searchRequest = new SearchRequest(IndexName); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + GeoBoundingBoxQueryBuilder geoBoundingBoxQueryBuilder = QueryBuilders.geoBoundingBoxQuery(LocationFieldName) + .setCorners(maxLat, minLng, minLat, maxLng); + sourceBuilder.query(geoBoundingBoxQueryBuilder); + searchRequest.source(sourceBuilder); + try { + SearchResponse searchResponse = elasticSearchClient.getClient().search(searchRequest, RequestOptions.DEFAULT); + SearchHits searchHits = searchResponse.getHits(); + for (SearchHit searchHit : searchHits) { + Long id = (Long) searchHit.getSourceAsMap().get(IDFieldName); + String address = (String) searchHit.getSourceAsMap().get(AddressFieldName); + GeoPoint geoPoint = (GeoPoint) searchHit.getSourceAsMap().get(LocationFieldName); + PoiData poiData = new PoiData(id, address, geoPoint.getLat(), geoPoint.getLon()); + results.add(poiData); + } + } catch (Exception e) { + log.error("Search Poi in rectangle error: " + e.toString()); + } + return results; + } + + public List searchPoiInCircle(double lng, double lat, String distanceKm) { + List results = new ArrayList<>(); + SearchRequest searchRequest = new SearchRequest(IndexName); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + GeoDistanceQueryBuilder geoDistanceQueryBuilder = QueryBuilders.geoDistanceQuery(LocationFieldName) + .distance(distanceKm, DistanceUnit.KILOMETERS) + .point(lat, lng); + sourceBuilder.query(geoDistanceQueryBuilder); + searchRequest.source(sourceBuilder); + try { + SearchResponse searchResponse = elasticSearchClient.getClient().search(searchRequest, RequestOptions.DEFAULT); + SearchHits searchHits = searchResponse.getHits(); + for (SearchHit searchHit : searchHits) { + Long id = (Long) searchHit.getSourceAsMap().get(IDFieldName); + String address = (String) searchHit.getSourceAsMap().get(AddressFieldName); + GeoPoint geoPoint = (GeoPoint) searchHit.getSourceAsMap().get(LocationFieldName); + PoiData poiData = new PoiData(id, address, geoPoint.getLat(), geoPoint.getLon()); + results.add(poiData); + } + } catch (Exception e) { + log.error("Search Poi in circle error: " + e.toString()); + } + + return results; + } + + public List searchPoiInCircleAndAddress(double lng, double lat, String distanceKm, String address) { + List results = new ArrayList<>(); + SearchRequest searchRequest = new SearchRequest(IndexName); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + GeoDistanceQueryBuilder geoDistanceQueryBuilder = QueryBuilders.geoDistanceQuery(LocationFieldName) + .distance(distanceKm, DistanceUnit.KILOMETERS) + .point(lat, lng); + TermQueryBuilder termQueryBuilder = QueryBuilders.termQuery(AddressFieldName, address); + sourceBuilder.query(geoDistanceQueryBuilder).query(termQueryBuilder); + searchRequest.source(sourceBuilder); + try { + SearchResponse searchResponse = elasticSearchClient.getClient().search(searchRequest, RequestOptions.DEFAULT); + SearchHits searchHits = searchResponse.getHits(); + for (SearchHit searchHit : searchHits) { + Long id = (Long) searchHit.getSourceAsMap().get(IDFieldName); + String addr = (String) searchHit.getSourceAsMap().get(AddressFieldName); + GeoPoint geoPoint = (GeoPoint) searchHit.getSourceAsMap().get(LocationFieldName); + PoiData poiData = new PoiData(id, addr, geoPoint.getLat(), geoPoint.getLon()); + results.add(poiData); + } + } catch (Exception e) { + log.error("Search Poi in circle and address error: " + e.toString()); + } + + return results; + } + +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/service/RedshiftIndexService.java b/WebGisDemo/src/main/java/com/luxx/gis/service/RedshiftIndexService.java new file mode 100644 index 0000000..a1c3e3b --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/service/RedshiftIndexService.java @@ -0,0 +1,159 @@ +package com.luxx.gis.service; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.luxx.gis.client.ElasticSearchClient; +import com.luxx.gis.model.EndpointData; +import com.luxx.gis.util.JsonUtil; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.elasticsearch.action.bulk.*; +import org.elasticsearch.common.xcontent.XContentBuilder; +import org.elasticsearch.common.xcontent.XContentFactory; +import org.elasticsearch.index.query.QueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.search.aggregations.AggregationBuilders; +import org.elasticsearch.search.aggregations.BucketOrder; +import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +@Service +@ConditionalOnProperty(name = "index.es.cluster.address") +public class RedshiftIndexService { + private static Logger log = LogManager.getLogger(RedshiftIndexService.class); + + @Autowired + private ElasticSearchClient elasticSearchClient; + + // Index Name + private static final String Index = "endpoint"; + + private static final String DateFormat = "yyyy-MM-dd HH:mm:ss"; + + private static final String TimeField = "date_time"; + + public void deleteIndex() { + elasticSearchClient.deleteIndex(Index); + } + + public void createIndex() { + elasticSearchClient.createIndex(Index); + } + + public void createIndexMapping() { + XContentBuilder contentBuilder = prepareMappingBuilder(); + elasticSearchClient.createIndexMapping(Index, contentBuilder); + } + + public XContentBuilder prepareMappingBuilder() { + XContentBuilder contentBuilder = null; + try { + contentBuilder = XContentFactory.jsonBuilder(); + contentBuilder.startObject(); + { + contentBuilder.startObject("properties"); + { + contentBuilder.startObject("org_id").field("type", "integer").endObject(); + contentBuilder.startObject("endpoint_id").field("type", "long").endObject(); + contentBuilder.startObject("ds_bytes").field("type", "long").endObject(); + contentBuilder.startObject("ds_max_bps").field("type", "double").endObject(); + contentBuilder.startObject("ds_avg_bps").field("type", "double").endObject(); + contentBuilder.startObject("ds_mwt").field("type", "integer").endObject(); + contentBuilder.startObject("us_bytes").field("type", "long").endObject(); + contentBuilder.startObject("us_max_bps").field("type", "double").endObject(); + contentBuilder.startObject("us_avg_bps").field("type", "double").endObject(); + contentBuilder.startObject("us_mwt").field("type", "integer").endObject(); + contentBuilder.startObject(TimeField).field("type", "date").field("format", DateFormat).endObject(); + } + contentBuilder.endObject(); + } + contentBuilder.endObject(); + } catch (IOException e) { + log.error(e); + } + + return contentBuilder; + } + + public String getIndexDataFromHotspotDataForRedshift(EndpointData data) { + Map map = new HashMap<>(); + if (data != null) { + map.put("org_id", data.getOrg_id()); + map.put("endpoint_id", data.getEndpoint_id()); + map.put("ds_bytes", data.getDs_bytes()); + map.put("ds_max_bps", data.getDs_max_bytes()); + map.put("ds_avg_bps", data.getDs_avg_bytes()); + map.put("ds_mwt", data.getDs_mwt()); + map.put("us_bytes", data.getUs_bytes()); + map.put("us_max_bps", data.getUs_max_bytes()); + map.put("us_avg_bps", data.getUs_avg_bytes()); + map.put("us_mwt", data.getUs_mwt()); + map.put(TimeField, data.getDate_time()); + } + return JsonUtil.objectToJson(map); + } + + // Index data in bulk + public void indexHotSpotDataListForRedshift(List dataList) { + if (dataList != null && dataList.size() > 0) { + BulkProcessor bulkRequest = elasticSearchClient.getBulkRequest(); + for (int i = 0; i < dataList.size(); ++i) { + EndpointData data = dataList.get(i); + String jsonSource = getIndexDataFromHotspotDataForRedshift(data); + if (jsonSource != null) { + bulkRequest.add(elasticSearchClient.getIndexRequest(Index, jsonSource)); + } + } + } + } + + private QueryBuilder getDateRangeQueryBuilder(String startTime, String endTime) { + QueryBuilder rangeBuilder = QueryBuilders.matchAllQuery(); + if (!StringUtils.isEmpty(startTime) && !StringUtils.isEmpty(endTime)) { + rangeBuilder = QueryBuilders.rangeQuery(TimeField).from(startTime).to(endTime).format(DateFormat); + } + return rangeBuilder; + } + + // Get top N endpoint_id based on sum of usage(ds_bytes) from startTime to endTime + public Map getTopNEndpointUsage(String startTime, String endTime, int orgId, int topN) { + Map resultsMap = new HashMap<>(); + + QueryBuilder orgIdQueryBuilder = QueryBuilders.termQuery("org_id", orgId); + QueryBuilder endpointIdFilterBuilder = QueryBuilders.termQuery("endpoint_id", 0); + QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(orgIdQueryBuilder).must(rangeBuilder) + .mustNot(endpointIdFilterBuilder); + TermsAggregationBuilder termsBuilder = AggregationBuilders.terms("endpointUsageAgg").field("endpoint_id") + .size(topN); + termsBuilder.subAggregation(AggregationBuilders.sum("sum_usage").field("ds_bytes")); + termsBuilder.order(BucketOrder.aggregation("sum_usage", false)); + + resultsMap = elasticSearchClient.getSumAggSearchOrderResult(Index, queryBuilder, termsBuilder, "endpointUsageAgg", "sum_usage"); + + return resultsMap; + } + + // Get endpoint_id and max_bps based on query from startTime to endTime + public Map getEndpointMaxbps(String startTime, String endTime, int orgId) { + Map resultsMap = new HashMap<>(); + QueryBuilder orgIdQueryBuilder = QueryBuilders.termQuery("org_id", orgId); + QueryBuilder endpointIdFilterBuilder = QueryBuilders.termQuery("endpoint_id", 0); + QueryBuilder rangeBuilder = getDateRangeQueryBuilder(startTime, endTime); + QueryBuilder maxBpsRangeBuilder = QueryBuilders.rangeQuery("ds_max_bps").from(4000000); + QueryBuilder queryBuilder = QueryBuilders.boolQuery().must(orgIdQueryBuilder).must(rangeBuilder) + .mustNot(endpointIdFilterBuilder).must(maxBpsRangeBuilder); + TermsAggregationBuilder termsBuilder = AggregationBuilders.terms("endpointMaxAgg").field("endpoint_id").size(Integer.MAX_VALUE); + termsBuilder.subAggregation(AggregationBuilders.max("max_bps").field("ds_max_bps")); + + resultsMap = elasticSearchClient.getMaxAggSearchOrderResult(Index, queryBuilder, termsBuilder, "endpointMaxAgg", "max_bps"); + return resultsMap; + } + +} diff --git a/WebGisDemo/src/main/java/com/luxx/gis/service/StationService.java b/WebGisDemo/src/main/java/com/luxx/gis/service/StationService.java new file mode 100644 index 0000000..b4d9522 --- /dev/null +++ b/WebGisDemo/src/main/java/com/luxx/gis/service/StationService.java @@ -0,0 +1,31 @@ +package com.luxx.gis.service; + +import java.util.List; + +import com.luxx.gis.dao.StationMapper; +import com.luxx.gis.model.Station; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class StationService { + @Autowired + private StationMapper stationMapper; + + public List getStation() { + return stationMapper.getStation(); + } + + public int insert(Station station) { + return stationMapper.insert(station); + } + + public int update(Station station) { + return stationMapper.update(station); + } + + public int delete(int id) { + return stationMapper.delete(id); + } + +} diff --git a/IndexSearchService/src/main/java/com/luxx/util/DateFormatUtil.java b/WebGisDemo/src/main/java/com/luxx/gis/util/DateFormatUtil.java similarity index 73% rename from IndexSearchService/src/main/java/com/luxx/util/DateFormatUtil.java rename to WebGisDemo/src/main/java/com/luxx/gis/util/DateFormatUtil.java index 2cac029..43e489f 100644 --- a/IndexSearchService/src/main/java/com/luxx/util/DateFormatUtil.java +++ b/WebGisDemo/src/main/java/com/luxx/gis/util/DateFormatUtil.java @@ -1,13 +1,12 @@ -package com.luxx.util; +package com.luxx.gis.util; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; /** * Date Format Helper - * + * * @author luxiaoxun * @version 1.0 * @since 2015.05.18 @@ -28,22 +27,6 @@ public class DateFormatUtil { isoFormatterUtc.setTimeZone(utc); } - /* - * Convert string "yyyy-MM-dd HH:mm:ss" to date - */ - public static Date StringToDate(String text) throws ParseException { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - sdf.setTimeZone(utc); - Date date = null; - try { - date = sdf.parse(text); - } catch (ParseException e) { - throw e; - } - - return date; - } - /* * Convert date to string "yyyy-MM-dd HH:mm:ss" */ @@ -53,23 +36,6 @@ public static String DateToString(Date date) { return sdf.format(date); } - /* - * Convert string "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" to date - */ - public static Date UtcStringToDate(String text) throws ParseException { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); - sdf.setTimeZone(utc); - - Date date = null; - try { - date = sdf.parse(text); - } catch (ParseException e) { - throw e; - } - - return date; - } - /* * Convert current date to string "yyyy-MM-dd'T'HH:mm:ss.SSS zzz" */ diff --git a/IndexSearchService/src/main/java/com/luxx/util/JsonUtil.java b/WebGisDemo/src/main/java/com/luxx/gis/util/JsonUtil.java similarity index 87% rename from IndexSearchService/src/main/java/com/luxx/util/JsonUtil.java rename to WebGisDemo/src/main/java/com/luxx/gis/util/JsonUtil.java index a1251f0..c17892b 100644 --- a/IndexSearchService/src/main/java/com/luxx/util/JsonUtil.java +++ b/WebGisDemo/src/main/java/com/luxx/gis/util/JsonUtil.java @@ -1,10 +1,9 @@ -package com.luxx.util; +package com.luxx.gis.util; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.HashMap; -import com.fasterxml.jackson.core.JsonParser.Feature; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; @@ -20,7 +19,6 @@ public class JsonUtil { public static type jsonToObject(String json, Class cls) { type obj = null; JavaType javaType = objMapper.getTypeFactory().constructType(cls); - objMapper.configure(Feature.ALLOW_MISSING_VALUES, true); try { obj = objMapper.readValue(json, javaType); } catch (IOException e) { @@ -32,7 +30,6 @@ public static type jsonToObject(String json, Class cls) { public static type jsonToObjectList(String json, Class collectionClass, Class... elementClass) { type obj = null; JavaType javaType = objMapper.getTypeFactory().constructParametricType(collectionClass, elementClass); - objMapper.configure(Feature.ALLOW_MISSING_VALUES, true); try { obj = objMapper.readValue(json, javaType); } catch (IOException e) { @@ -44,7 +41,6 @@ public static type jsonToObjectList(String json, Class collectionClass public static type jsonToObjectHashMap(String json, Class keyClass, Class valueClass) { type obj = null; JavaType javaType = objMapper.getTypeFactory().constructParametricType(HashMap.class, keyClass, valueClass); - objMapper.configure(Feature.ALLOW_MISSING_VALUES, true); try { obj = objMapper.readValue(json, javaType); } catch (IOException e) { diff --git a/WebGisDemo/src/main/resources/application.properties b/WebGisDemo/src/main/resources/application.properties new file mode 100644 index 0000000..f8fc3e6 --- /dev/null +++ b/WebGisDemo/src/main/resources/application.properties @@ -0,0 +1,27 @@ +#spring.profiles.active=dev +server.port=9090 +# resources +spring.mvc.servlet.load-on-startup=0 +spring.mvc.static-path-pattern=/static/** +spring.mvc.servlet.path=/ +# freemarker +spring.freemarker.templateLoaderPath=classpath:/templates/ +spring.freemarker.suffix=.ftl +spring.freemarker.charset=UTF-8 +spring.freemarker.request-context-attribute=request +spring.freemarker.settings.number_format=0.########## +# spring mybatis +mybatis.mapper-locations=classpath*:/mapper/*.xml +logging.config=classpath:log4j/log4j2-dev.xml +# spring datasource +spring.datasource.url=jdbc:mysql://127.0.0.1:3306/data_db?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&allowPublicKeyRetrieval=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8 +spring.datasource.username=root +spring.datasource.password=admin +# ES +es.address=127.0.0.1:9200 +# POI index DB +index.db.url=jdbc:mysql://127.0.0.1:3306/data_db?useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai +index.db.username=root +index.db.password=admin +index.db.table=station +index.db.type=mysql diff --git a/WebGisDemo/src/main/resources/log4j/log4j2-dev.xml b/WebGisDemo/src/main/resources/log4j/log4j2-dev.xml new file mode 100644 index 0000000..d00b831 --- /dev/null +++ b/WebGisDemo/src/main/resources/log4j/log4j2-dev.xml @@ -0,0 +1,45 @@ + + + + ${sys:user.dir}/logs/ + app + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebGisDemo/src/main/resources/log4j/log4j2-prd.xml b/WebGisDemo/src/main/resources/log4j/log4j2-prd.xml new file mode 100644 index 0000000..3fc5f39 --- /dev/null +++ b/WebGisDemo/src/main/resources/log4j/log4j2-prd.xml @@ -0,0 +1,36 @@ + + + + ${sys:user.dir}/logs/ + app + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebGisDemo/src/main/resources/mapper/StationMapper.xml b/WebGisDemo/src/main/resources/mapper/StationMapper.xml new file mode 100644 index 0000000..6386faa --- /dev/null +++ b/WebGisDemo/src/main/resources/mapper/StationMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + id, + country_code, + provider, + lac, + cell, + latitude, + longitude, + address + + + + + + INSERT INTO station + + + country_code, + + + provider, + + + lac, + + + cell, + + + latitude, + + + longitude, + + + address + + + + + #{countryCode}, + + + #{provider}, + + + #{lac}, + + + #{cell}, + + + #{latitude}, + + + #{longitude}, + + + #{address} + + + + + + DELETE FROM station + WHERE id = #{id} + + + + UPDATE station + + country_code = #{countryCode}, + provider = #{provider}, + lac = #{lac}, + cell = #{cell}, + latitude = #{latitude}, + longitude = #{longitude}, + address = #{address} + + WHERE id = #{id} + + + + diff --git a/WebGisDemo/WebContent/css/images/layers.png b/WebGisDemo/src/main/resources/static/css/images/layers-2x.png similarity index 100% rename from WebGisDemo/WebContent/css/images/layers.png rename to WebGisDemo/src/main/resources/static/css/images/layers-2x.png diff --git a/WebGisDemo/src/main/resources/static/css/images/layers.png b/WebGisDemo/src/main/resources/static/css/images/layers.png new file mode 100644 index 0000000..ef90a08 Binary files /dev/null and b/WebGisDemo/src/main/resources/static/css/images/layers.png differ diff --git a/WebGisDemo/WebContent/css/images/spritesheet.png b/WebGisDemo/src/main/resources/static/css/images/spritesheet-2x.png similarity index 100% rename from WebGisDemo/WebContent/css/images/spritesheet.png rename to WebGisDemo/src/main/resources/static/css/images/spritesheet-2x.png diff --git a/WebGisDemo/src/main/resources/static/css/images/spritesheet.png b/WebGisDemo/src/main/resources/static/css/images/spritesheet.png new file mode 100644 index 0000000..f7035a1 Binary files /dev/null and b/WebGisDemo/src/main/resources/static/css/images/spritesheet.png differ diff --git a/WebGisDemo/WebContent/css/leaflet-ie.css b/WebGisDemo/src/main/resources/static/css/leaflet-ie.css similarity index 100% rename from WebGisDemo/WebContent/css/leaflet-ie.css rename to WebGisDemo/src/main/resources/static/css/leaflet-ie.css diff --git a/WebGisDemo/WebContent/css/leaflet-search.css b/WebGisDemo/src/main/resources/static/css/leaflet-search.css similarity index 100% rename from WebGisDemo/WebContent/css/leaflet-search.css rename to WebGisDemo/src/main/resources/static/css/leaflet-search.css diff --git a/WebGisDemo/WebContent/css/leaflet.css b/WebGisDemo/src/main/resources/static/css/leaflet.css similarity index 100% rename from WebGisDemo/WebContent/css/leaflet.css rename to WebGisDemo/src/main/resources/static/css/leaflet.css diff --git a/WebGisDemo/WebContent/css/leaflet.draw.css b/WebGisDemo/src/main/resources/static/css/leaflet.draw.css similarity index 100% rename from WebGisDemo/WebContent/css/leaflet.draw.css rename to WebGisDemo/src/main/resources/static/css/leaflet.draw.css diff --git a/WebGisDemo/WebContent/css/leaflet.mouseposition.css b/WebGisDemo/src/main/resources/static/css/leaflet.mouseposition.css similarity index 100% rename from WebGisDemo/WebContent/css/leaflet.mouseposition.css rename to WebGisDemo/src/main/resources/static/css/leaflet.mouseposition.css diff --git a/WebGisDemo/WebContent/css/locate-ie.css b/WebGisDemo/src/main/resources/static/css/locate-ie.css similarity index 100% rename from WebGisDemo/WebContent/css/locate-ie.css rename to WebGisDemo/src/main/resources/static/css/locate-ie.css diff --git a/WebGisDemo/WebContent/css/locate.css b/WebGisDemo/src/main/resources/static/css/locate.css similarity index 100% rename from WebGisDemo/WebContent/css/locate.css rename to WebGisDemo/src/main/resources/static/css/locate.css diff --git a/WebGisDemo/WebContent/css/mobile.css b/WebGisDemo/src/main/resources/static/css/mobile.css similarity index 100% rename from WebGisDemo/WebContent/css/mobile.css rename to WebGisDemo/src/main/resources/static/css/mobile.css diff --git a/WebGisDemo/WebContent/images/loader.gif b/WebGisDemo/src/main/resources/static/images/loader.gif similarity index 100% rename from WebGisDemo/WebContent/images/loader.gif rename to WebGisDemo/src/main/resources/static/images/loader.gif diff --git a/WebGisDemo/WebContent/images/locate.png b/WebGisDemo/src/main/resources/static/images/locate.png similarity index 100% rename from WebGisDemo/WebContent/images/locate.png rename to WebGisDemo/src/main/resources/static/images/locate.png diff --git a/WebGisDemo/WebContent/images/locate.svg b/WebGisDemo/src/main/resources/static/images/locate.svg similarity index 100% rename from WebGisDemo/WebContent/images/locate.svg rename to WebGisDemo/src/main/resources/static/images/locate.svg diff --git a/WebGisDemo/WebContent/images/locate_active.png b/WebGisDemo/src/main/resources/static/images/locate_active.png similarity index 100% rename from WebGisDemo/WebContent/images/locate_active.png rename to WebGisDemo/src/main/resources/static/images/locate_active.png diff --git a/WebGisDemo/WebContent/images/marker-icon.png b/WebGisDemo/src/main/resources/static/images/marker-icon.png similarity index 100% rename from WebGisDemo/WebContent/images/marker-icon.png rename to WebGisDemo/src/main/resources/static/images/marker-icon.png diff --git a/WebGisDemo/WebContent/images/marker-icon@2x.png b/WebGisDemo/src/main/resources/static/images/marker-icon@2x.png similarity index 100% rename from WebGisDemo/WebContent/images/marker-icon@2x.png rename to WebGisDemo/src/main/resources/static/images/marker-icon@2x.png diff --git a/WebGisDemo/WebContent/images/marker-shadow.png b/WebGisDemo/src/main/resources/static/images/marker-shadow.png similarity index 100% rename from WebGisDemo/WebContent/images/marker-shadow.png rename to WebGisDemo/src/main/resources/static/images/marker-shadow.png diff --git a/WebGisDemo/WebContent/images/search-icon.png b/WebGisDemo/src/main/resources/static/images/search-icon.png similarity index 100% rename from WebGisDemo/WebContent/images/search-icon.png rename to WebGisDemo/src/main/resources/static/images/search-icon.png diff --git a/WebGisDemo/WebContent/images/spinner.gif b/WebGisDemo/src/main/resources/static/images/spinner.gif similarity index 100% rename from WebGisDemo/WebContent/images/spinner.gif rename to WebGisDemo/src/main/resources/static/images/spinner.gif diff --git a/WebGisDemo/src/main/resources/static/js/jquery-1.11.3.min.js b/WebGisDemo/src/main/resources/static/js/jquery-1.11.3.min.js new file mode 100644 index 0000000..1e17782 --- /dev/null +++ b/WebGisDemo/src/main/resources/static/js/jquery-1.11.3.min.js @@ -0,0 +1,5 @@ +/*! jQuery v1.11.3 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.3",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b="length"in a&&a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1; + + return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
          a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function aa(){return!0}function ba(){return!1}function ca(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),ha=/^\s+/,ia=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ja=/<([\w:]+)/,ka=/\s*$/g,ra={option:[1,""],legend:[1,"
          ","
          "],area:[1,"",""],param:[1,"",""],thead:[1,"","
          "],tr:[2,"","
          "],col:[2,"","
          "],td:[3,"","
          "],_default:k.htmlSerialize?[0,"",""]:[1,"X
          ","
          "]},sa=da(y),ta=sa.appendChild(y.createElement("div"));ra.optgroup=ra.option,ra.tbody=ra.tfoot=ra.colgroup=ra.caption=ra.thead,ra.th=ra.td;function ua(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ua(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function va(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wa(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xa(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function ya(a){var b=pa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function za(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Aa(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Ba(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xa(b).text=a.text,ya(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!ga.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ta.innerHTML=a.outerHTML,ta.removeChild(f=ta.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ua(f),h=ua(a),g=0;null!=(e=h[g]);++g)d[g]&&Ba(e,d[g]);if(b)if(c)for(h=h||ua(a),d=d||ua(f),g=0;null!=(e=h[g]);g++)Aa(e,d[g]);else Aa(a,f);return d=ua(f,"script"),d.length>0&&za(d,!i&&ua(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=da(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(la.test(f)){h=h||o.appendChild(b.createElement("div")),i=(ja.exec(f)||["",""])[1].toLowerCase(),l=ra[i]||ra._default,h.innerHTML=l[1]+f.replace(ia,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&ha.test(f)&&p.push(b.createTextNode(ha.exec(f)[0])),!k.tbody){f="table"!==i||ka.test(f)?""!==l[1]||ka.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ua(p,"input"),va),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ua(o.appendChild(f),"script"),g&&za(h),c)){e=0;while(f=h[e++])oa.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ua(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&za(ua(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ua(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fa,""):void 0;if(!("string"!=typeof a||ma.test(a)||!k.htmlSerialize&&ga.test(a)||!k.leadingWhitespace&&ha.test(a)||ra[(ja.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ia,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ua(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ua(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&na.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ua(i,"script"),xa),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ua(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,ya),j=0;f>j;j++)d=g[j],oa.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qa,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Ca,Da={};function Ea(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fa(a){var b=y,c=Da[a];return c||(c=Ea(a,b),"none"!==c&&c||(Ca=(Ca||m("