Commit b597166632b8e2644b196271562d18809fbdbaa4

Authored by jiangjiazhi

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java

Showing 9 changed files

platform-job-index/src/main/java/com/lyms/platform/job/index/model/Product.java View file @ b597166
  1 +/*
  2 + * Copyright 2012 the original author or authors.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package com.lyms.platform.job.index.model;
  17 +
  18 +import java.util.List;
  19 +
  20 +import org.apache.solr.client.solrj.beans.Field;
  21 +
  22 +/**
  23 + * @author Christoph Strobl
  24 + */
  25 +public class Product implements SearchableProduct {
  26 +
  27 + @Field(ID_FIELD)
  28 + private String id;
  29 +
  30 + @Field(NAME_FIELD)
  31 + private String name;
  32 +
  33 + @Field(CATEGORY_FIELD)
  34 + private List<String> categories;
  35 +
  36 + @Field(WEIGHT_FIELD)
  37 + private Float weight;
  38 +
  39 + @Field(PRICE_FIELD)
  40 + private Float price;
  41 +
  42 + @Field(POPULARITY_FIELD)
  43 + private Integer popularity;
  44 +
  45 + @Field(AVAILABLE_FIELD)
  46 + private boolean available;
  47 +
  48 + public String getId() {
  49 + return id;
  50 + }
  51 +
  52 + public void setId(String id) {
  53 + this.id = id;
  54 + }
  55 +
  56 + public String getName() {
  57 + return name;
  58 + }
  59 +
  60 + public void setName(String name) {
  61 + this.name = name;
  62 + }
  63 +
  64 + public List<String> getCategories() {
  65 + return categories;
  66 + }
  67 +
  68 + public void setCategories(List<String> categories) {
  69 + this.categories = categories;
  70 + }
  71 +
  72 + public Float getWeight() {
  73 + return weight;
  74 + }
  75 +
  76 + public void setWeight(Float weight) {
  77 + this.weight = weight;
  78 + }
  79 +
  80 + public Float getPrice() {
  81 + return price;
  82 + }
  83 +
  84 + public void setPrice(Float price) {
  85 + this.price = price;
  86 + }
  87 +
  88 + public Integer getPopularity() {
  89 + return popularity;
  90 + }
  91 +
  92 + public void setPopularity(Integer popularity) {
  93 + this.popularity = popularity;
  94 + }
  95 +
  96 + public boolean isAvailable() {
  97 + return available;
  98 + }
  99 +
  100 + public void setAvailable(boolean available) {
  101 + this.available = available;
  102 + }
  103 +
  104 + @Override
  105 + public String toString() {
  106 + return "Product [id=" + id + ", name=" + name + ", categories=" + categories + ", weight=" + weight + ", price=" + price + ", popularity=" + popularity + ", available=" + available + "]";
  107 + }
  108 +
  109 +}
platform-job-index/src/main/java/com/lyms/platform/job/index/model/SearchableProduct.java View file @ b597166
  1 +/*
  2 + * Copyright 2012 the original author or authors.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package com.lyms.platform.job.index.model;
  17 +
  18 +/**
  19 + * @author Christoph Strobl
  20 + */
  21 +public interface SearchableProduct {
  22 +
  23 + String ID_FIELD = "id";
  24 + String NAME_FIELD = "name";
  25 + String PRICE_FIELD = "price";
  26 + String AVAILABLE_FIELD = "inStock";
  27 + String CATEGORY_FIELD = "cat";
  28 + String WEIGHT_FIELD = "weight";
  29 + String POPULARITY_FIELD = "popularity";
  30 +
  31 +}
platform-job-index/src/main/java/com/lyms/platform/job/index/repository/CustomSolrRepository.java View file @ b597166
  1 +/*
  2 + * Copyright 2012 the original author or authors.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package com.lyms.platform.job.index.repository;
  17 +
  18 +import java.util.List;
  19 +
  20 +import org.springframework.data.domain.Page;
  21 +import org.springframework.data.domain.Pageable;
  22 +import org.springframework.data.solr.example.model.Product;
  23 +
  24 +/**
  25 + * @author Christoph Strobl
  26 + */
  27 +public interface CustomSolrRepository {
  28 +
  29 + Page<Product> findProductsByCustomImplementation(String value, Pageable page);
  30 +
  31 + void updateProductCategory(String productId, List<String> categories);
  32 +
  33 +}
platform-job-index/src/main/java/com/lyms/platform/job/index/repository/CustomSolrRepositoryImpl.java View file @ b597166
  1 +/*
  2 + * Copyright 2012 the original author or authors.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package com.lyms.platform.job.index.repository;
  17 +
  18 +import java.util.List;
  19 +
  20 +import org.springframework.data.domain.Page;
  21 +import org.springframework.data.domain.Pageable;
  22 +import org.springframework.data.solr.core.SolrOperations;
  23 +import org.springframework.data.solr.core.query.PartialUpdate;
  24 +import org.springframework.data.solr.core.query.SimpleQuery;
  25 +import org.springframework.data.solr.core.query.SimpleStringCriteria;
  26 +import org.springframework.data.solr.example.model.Product;
  27 +import org.springframework.data.solr.example.model.SearchableProduct;
  28 +
  29 +/**
  30 + * @author Christoph Strobl
  31 + */
  32 +public class CustomSolrRepositoryImpl implements CustomSolrRepository {
  33 +
  34 + private SolrOperations solrTemplate;
  35 +
  36 + public CustomSolrRepositoryImpl() {
  37 + super();
  38 + }
  39 +
  40 + public CustomSolrRepositoryImpl(SolrOperations solrTemplate) {
  41 + super();
  42 + this.solrTemplate = solrTemplate;
  43 + }
  44 +
  45 + @Override
  46 + public Page<Product> findProductsByCustomImplementation(String value, Pageable page) {
  47 + return solrTemplate.queryForPage(new SimpleQuery(new SimpleStringCriteria("name:" + value)).setPageRequest(page),
  48 + Product.class);
  49 + }
  50 +
  51 + @Override
  52 + public void updateProductCategory(String productId, List<String> categories) {
  53 + PartialUpdate update = new PartialUpdate(SearchableProduct.ID_FIELD, productId);
  54 + update.setValueOfField(SearchableProduct.CATEGORY_FIELD, categories);
  55 +
  56 + solrTemplate.saveBean(update);
  57 + solrTemplate.commit();
  58 + }
  59 +
  60 +}
platform-job-index/src/main/java/com/lyms/platform/job/index/repository/DerivedSolrProductRepository.java View file @ b597166
  1 +/*
  2 + * Copyright 2012 the original author or authors.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package com.lyms.platform.job.index.repository;
  17 +
  18 +import java.util.List;
  19 +
  20 +import org.springframework.data.domain.Page;
  21 +import org.springframework.data.domain.Pageable;
  22 +import org.springframework.data.solr.example.model.Product;
  23 +import org.springframework.data.solr.example.model.SearchableProduct;
  24 +import org.springframework.data.solr.repository.Query;
  25 +import org.springframework.data.solr.repository.SolrCrudRepository;
  26 +
  27 +/**
  28 + * @author Christoph Strobl
  29 + */
  30 +public interface DerivedSolrProductRepository extends CustomSolrRepository, SolrCrudRepository<Product, String> {
  31 +
  32 + Page<Product> findByPopularity(Integer popularity, Pageable page);
  33 +
  34 + List<Product> findByNameStartingWith(String name);
  35 +
  36 + Page<Product> findByAvailableTrue(Pageable page);
  37 +
  38 + @Query(SearchableProduct.AVAILABLE_FIELD + ":false")
  39 + Page<Product> findByAvailableFalseUsingAnnotatedQuery(Pageable page);
  40 +
  41 +}
platform-job-index/src/main/java/com/lyms/platform/job/index/repository/ProductRepository.java View file @ b597166
  1 +/*
  2 + * Copyright 2012 the original author or authors.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package com.lyms.platform.job.index.repository;
  17 +
  18 +import org.springframework.data.domain.Page;
  19 +import org.springframework.data.repository.CrudRepository;
  20 +import org.springframework.data.solr.core.query.result.FacetPage;
  21 +import org.springframework.data.solr.example.model.Product;
  22 +
  23 +/**
  24 + * @author Christoph Strobl
  25 + */
  26 +public interface ProductRepository extends CrudRepository<Product, String> {
  27 +
  28 + Page<Product> findByPopularity(Integer popularity);
  29 +
  30 + FacetPage<Product> findByNameStartingWithAndFacetOnAvailable(String namePrefix);
  31 +
  32 + Page<Product> findByAvailableTrue();
  33 +
  34 +}
platform-job-index/src/main/java/com/lyms/platform/job/index/repository/SolrProductRepository.java View file @ b597166
  1 +/*
  2 + * Copyright 2012 the original author or authors.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package com.lyms.platform.job.index.repository;
  17 +
  18 +import org.springframework.data.domain.Page;
  19 +import org.springframework.data.repository.NoRepositoryBean;
  20 +import org.springframework.data.solr.core.query.Criteria;
  21 +import org.springframework.data.solr.core.query.FacetOptions;
  22 +import org.springframework.data.solr.core.query.FacetQuery;
  23 +import org.springframework.data.solr.core.query.Query;
  24 +import org.springframework.data.solr.core.query.SimpleFacetQuery;
  25 +import org.springframework.data.solr.core.query.SimpleField;
  26 +import org.springframework.data.solr.core.query.SimpleQuery;
  27 +import org.springframework.data.solr.core.query.result.FacetPage;
  28 +import org.springframework.data.solr.example.model.Product;
  29 +import org.springframework.data.solr.repository.support.SimpleSolrRepository;
  30 +
  31 +/**
  32 + * @author Christoph Strobl
  33 + */
  34 +@NoRepositoryBean
  35 +public class SolrProductRepository extends SimpleSolrRepository<Product, String> implements ProductRepository {
  36 +
  37 + @Override
  38 + public Page<Product> findByPopularity(Integer popularity) {
  39 + Query query = new SimpleQuery(new Criteria(SolrSearchableFields.POPULARITY).is(popularity));
  40 + return getSolrOperations().queryForPage(query, Product.class);
  41 + }
  42 +
  43 + @Override
  44 + public FacetPage<Product> findByNameStartingWithAndFacetOnAvailable(String namePrefix) {
  45 + FacetQuery query = new SimpleFacetQuery(new Criteria(SolrSearchableFields.NAME).startsWith(namePrefix));
  46 + query.setFacetOptions(new FacetOptions(SolrSearchableFields.AVAILABLE));
  47 + return getSolrOperations().queryForFacetPage(query, Product.class);
  48 + }
  49 +
  50 + @Override
  51 + public Page<Product> findByAvailableTrue() {
  52 + Query query = new SimpleQuery(new Criteria(new SimpleField(Criteria.WILDCARD)).expression(Criteria.WILDCARD));
  53 + query.addFilterQuery(new SimpleQuery(new Criteria(SolrSearchableFields.AVAILABLE).is(true)));
  54 +
  55 + return getSolrOperations().queryForPage(query, Product.class);
  56 + }
  57 +}
platform-job-index/src/main/java/com/lyms/platform/job/index/repository/SolrSearchableFields.java View file @ b597166
  1 +/*
  2 + * Copyright 2012 the original author or authors.
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package com.lyms.platform.job.index.repository;
  17 +
  18 +import org.springframework.data.solr.core.query.Field;
  19 +import org.springframework.data.solr.example.model.SearchableProduct;
  20 +
  21 +/**
  22 + * @author Christoph Strobl
  23 + */
  24 +public enum SolrSearchableFields implements Field {
  25 +
  26 + ID(SearchableProduct.ID_FIELD), NAME(SearchableProduct.NAME_FIELD), PRICE(SearchableProduct.PRICE_FIELD), AVAILABLE(
  27 + SearchableProduct.AVAILABLE_FIELD), CATEGORY(SearchableProduct.CATEGORY_FIELD), WEIGHT(
  28 + SearchableProduct.WEIGHT_FIELD), POPULARITY(SearchableProduct.POPULARITY_FIELD);
  29 +
  30 + private final String fieldName;
  31 +
  32 + private SolrSearchableFields(String fieldName) {
  33 + this.fieldName = fieldName;
  34 + }
  35 +
  36 + @Override
  37 + public String getName() {
  38 + return fieldName;
  39 + }
  40 +
  41 +}
1 1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2   - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3   - <modelVersion>4.0.0</modelVersion>
4   - <groupId>com.lyms.core</groupId>
5   - <artifactId>regional-platform</artifactId>
6   - <packaging>pom</packaging>
7   - <version>1.0.1</version>
8   - <name>regional-platform</name>
9   - <url>http://maven.apache.org</url>
  2 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  3 + <modelVersion>4.0.0</modelVersion>
  4 + <groupId>com.lyms.core</groupId>
  5 + <artifactId>regional-platform</artifactId>
  6 + <packaging>pom</packaging>
  7 + <version>1.0.1</version>
  8 + <name>regional-platform</name>
  9 + <url>http://maven.apache.org</url>
10 10  
11   - <build>
12   - <finalName>regional-platform</finalName>
13   - </build>
  11 + <build>
  12 + <finalName>regional-platform</finalName>
  13 + </build>
14 14  
15 15 <modules>
16   - <!--ๅŸบ็ก€็ฑป -->
17   - <module>platform-common</module>
  16 + <!--ๅŸบ็ก€็ฑป -->
  17 + <module>platform-common</module>
18 18 <module>platform-dal</module>
19   - <module>platform-biz-service</module>
20   - <module>platform-biz-patient-service</module>
21   - <!--ๅค–้ƒจๆŽฅๅฃ -->
  19 + <module>platform-biz-service</module>
  20 + <module>platform-biz-patient-service</module>
  21 + <!--ๅค–้ƒจๆŽฅๅฃ -->
22 22 <module>platform-data-api</module>
23   - <module>platform-operate-api</module>
24   - <module>platform-report-api</module>
  23 + <module>platform-operate-api</module>
  24 + <!---->
  25 + <module>platform-job-index</module>
  26 + <module>platform-report-api</module>
25 27 </modules>
26 28  
27 29 <properties>
28 30 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29 31 <org.springframework.version>3.2.4.RELEASE</org.springframework.version>
30 32 <org.spring.data-mongodb>1.5.6.RELEASE</org.spring.data-mongodb>
31   - <lyms.modelVersion>1.0.0</lyms.modelVersion>
32   - <!-- ๆ–‡ไปถๆ‹ท่ดๆ—ถ็š„็ผ–็  -->
33   - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34   - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
35   - <!-- ็ผ–่ฏ‘ๆ—ถ็š„็ผ–็  -->
36   - <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
  33 + <lyms.modelVersion>1.0.0</lyms.modelVersion>
  34 + <!-- ๆ–‡ไปถๆ‹ท่ดๆ—ถ็š„็ผ–็  -->
  35 + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  36 + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
  37 + <!-- ็ผ–่ฏ‘ๆ—ถ็š„็ผ–็  -->
  38 + <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
37 39 </properties>
  40 + <dependencyManagement>
  41 + <dependencies>
  42 + <dependency>
  43 + <groupId>com.alibaba</groupId>
  44 + <artifactId>dubbo</artifactId>
  45 + <version>2.5.3</version>
  46 + <exclusions>
  47 + <exclusion>
  48 + <groupId>org.springframework</groupId>
  49 + <artifactId>spring</artifactId>
  50 + </exclusion>
  51 + </exclusions>
  52 + </dependency>
  53 + <dependency>
  54 + <groupId>commons-httpclient</groupId>
  55 + <artifactId>commons-httpclient</artifactId>
  56 + <version>3.1</version>
  57 + </dependency>
  58 + <dependency>
  59 + <groupId>org.apache.zookeeper</groupId>
  60 + <artifactId>zookeeper</artifactId>
  61 + <version>3.4.5</version>
  62 + </dependency>
38 63  
39   - <dependencies>
40   - <dependency>
41   - <groupId>com.alibaba</groupId>
42   - <artifactId>dubbo</artifactId>
43   - <version>2.5.3</version>
44   - <exclusions>
45   - <exclusion>
46   - <groupId>org.springframework</groupId>
47   - <artifactId>spring</artifactId>
48   - </exclusion>
49   - </exclusions>
50   - </dependency>
  64 + <dependency>
  65 + <groupId>com.101tec</groupId>
  66 + <artifactId>zkclient</artifactId>
  67 + <version>0.3</version>
  68 + </dependency>
  69 + <dependency>
  70 + <groupId>com.alibaba</groupId>
  71 + <artifactId>druid</artifactId>
  72 + <version>1.0.15</version>
  73 + </dependency>
  74 + <dependency>
  75 + <groupId>org.apache.cxf</groupId>
  76 + <artifactId>cxf-rt-frontend-jaxws</artifactId>
  77 + <version>3.1.5</version>
  78 + </dependency>
  79 + <dependency>
  80 + <groupId>org.apache.cxf</groupId>
  81 + <artifactId>cxf-rt-transports-http</artifactId>
  82 + <version>3.1.5</version>
  83 + </dependency>
  84 + <dependency>
  85 + <groupId>org.apache.cxf</groupId>
  86 + <artifactId>cxf-rt-transports-http-jetty</artifactId>
  87 + <version>3.1.5</version>
  88 + </dependency>
  89 + <dependency>
  90 + <groupId>org.apache.cxf</groupId>
  91 + <artifactId>cxf-rt-ws-security</artifactId>
  92 + <version>3.1.5</version>
  93 + </dependency>
  94 + <dependency>
  95 + <groupId>org.apache.velocity</groupId>
  96 + <artifactId>velocity</artifactId>
  97 + <version>1.7</version>
  98 + </dependency>
  99 + <dependency>
  100 + <groupId>org.apache.velocity</groupId>
  101 + <artifactId>velocity-tools</artifactId>
  102 + <version>2.0</version>
  103 + </dependency>
  104 + <dependency>
  105 + <groupId>wsdl4j</groupId>
  106 + <artifactId>wsdl4j</artifactId>
  107 + <version>1.6.3</version>
  108 + </dependency>
51 109  
52   - <dependency>
53   - <groupId>org.apache.zookeeper</groupId>
54   - <artifactId>zookeeper</artifactId>
55   - <version>3.4.5</version>
56   - </dependency>
  110 + <dependency>
  111 + <groupId>org.igniterealtime.smack</groupId>
  112 + <artifactId>smack-core</artifactId>
  113 + <version>4.1.3</version>
  114 + </dependency>
  115 + <dependency>
  116 + <groupId>org.igniterealtime.smack</groupId>
  117 + <artifactId>smack-debug</artifactId>
  118 + <version>4.1.3</version>
  119 + </dependency>
  120 + <dependency>
  121 + <groupId>org.igniterealtime.smack</groupId>
  122 + <artifactId>smack-tcp</artifactId>
  123 + <version>4.1.3</version>
  124 + </dependency>
  125 + <dependency>
  126 + <groupId>org.igniterealtime.smack</groupId>
  127 + <artifactId>smack-java7</artifactId>
  128 + <version>4.1.3</version>
  129 + </dependency>
  130 + <dependency>
  131 + <groupId>org.igniterealtime.smack</groupId>
  132 + <artifactId>smack-resolver-javax</artifactId>
  133 + <version>4.1.3</version>
  134 + </dependency>
  135 + <dependency>
  136 + <groupId>org.igniterealtime.smack</groupId>
  137 + <artifactId>smack-resolver-dnsjava</artifactId>
  138 + <version>4.1.3</version>
  139 + </dependency>
57 140  
58   - <dependency>
59   - <groupId>com.101tec</groupId>
60   - <artifactId>zkclient</artifactId>
61   - <version>0.3</version>
62   - </dependency>
63   - <dependency>
64   - <groupId>com.alibaba</groupId>
65   - <artifactId>druid</artifactId>
66   - <version>1.0.15</version>
67   - </dependency>
  141 + <dependency>
  142 + <groupId>org.igniterealtime.smack</groupId>
  143 + <artifactId>smack-extensions</artifactId>
  144 + <version>4.1.3</version>
  145 + </dependency>
  146 + <!-- postgresql jdbc driver -->
  147 + <dependency>
  148 + <groupId>org.postgresql</groupId>
  149 + <artifactId>postgresql</artifactId>
  150 + <version>9.4-1202-jdbc42</version>
  151 + </dependency>
  152 + </dependencies>
  153 + </dependencyManagement>
  154 + <dependencies>
68 155 <dependency>
69   - <groupId>org.apache.cxf</groupId>
70   - <artifactId>cxf-rt-frontend-jaxws</artifactId>
71   - <version>3.1.5</version>
  156 + <groupId>commons-httpclient</groupId>
  157 + <artifactId>commons-httpclient</artifactId>
72 158 </dependency>
73 159 <dependency>
74   - <groupId>org.apache.cxf</groupId>
75   - <artifactId>cxf-rt-transports-http</artifactId>
76   - <version>3.1.5</version>
  160 + <groupId>com.alibaba</groupId>
  161 + <artifactId>druid</artifactId>
77 162 </dependency>
78 163 <dependency>
79   - <groupId>org.apache.cxf</groupId>
80   - <artifactId>cxf-rt-transports-http-jetty</artifactId>
81   - <version>3.1.5</version>
82   - </dependency>
83   - <dependency>
84   - <groupId>org.apache.cxf</groupId>
85   - <artifactId>cxf-rt-ws-security</artifactId>
86   - <version>3.1.5</version>
87   - </dependency>
88   -
89   - <dependency>
90 164 <groupId>org.springframework.data</groupId>
91 165 <artifactId>spring-data-mongodb</artifactId>
92 166 <version>${org.spring.data-mongodb}</version>
93 167 </dependency>
94   - <dependency>
95   - <groupId>org.springframework</groupId>
96   - <artifactId>spring-aop</artifactId>
97   - <version>${org.springframework.version}</version>
98   - </dependency>
99   - <dependency>
100   - <groupId>org.springframework</groupId>
101   - <artifactId>spring-aspects</artifactId>
102   - <version>${org.springframework.version}</version>
103   - </dependency>
104   - <dependency>
105   - <groupId>org.springframework</groupId>
106   - <artifactId>spring-beans</artifactId>
107   - <version>${org.springframework.version}</version>
108   - </dependency>
109   - <dependency>
110   - <groupId>org.springframework</groupId>
111   - <artifactId>spring-context</artifactId>
112   - <version>${org.springframework.version}</version>
113   - </dependency>
114   - <dependency>
115   - <groupId>org.springframework</groupId>
116   - <artifactId>spring-context-support</artifactId>
117   - <version>${org.springframework.version}</version>
118   - </dependency>
119   - <dependency>
120   - <groupId>org.springframework</groupId>
121   - <artifactId>spring-core</artifactId>
122   - <version>${org.springframework.version}</version>
123   - </dependency>
124   - <dependency>
125   - <groupId>org.springframework</groupId>
126   - <artifactId>spring-expression</artifactId>
127   - <version>${org.springframework.version}</version>
128   - </dependency>
129   - <dependency>
130   - <groupId>org.springframework</groupId>
131   - <artifactId>spring-instrument</artifactId>
132   - <version>${org.springframework.version}</version>
133   - </dependency>
134   - <dependency>
135   - <groupId>org.springframework</groupId>
136   - <artifactId>spring-instrument-tomcat</artifactId>
137   - <version>${org.springframework.version}</version>
138   - </dependency>
139   - <dependency>
140   - <groupId>org.springframework</groupId>
141   - <artifactId>spring-jdbc</artifactId>
142   - <version>${org.springframework.version}</version>
143   - </dependency>
144   - <dependency>
145   - <groupId>org.springframework</groupId>
146   - <artifactId>spring-jms</artifactId>
147   - <version>${org.springframework.version}</version>
148   - </dependency>
149   - <dependency>
150   - <groupId>org.springframework</groupId>
151   - <artifactId>spring-orm</artifactId>
152   - <version>${org.springframework.version}</version>
153   - </dependency>
154   - <dependency>
155   - <groupId>org.springframework</groupId>
156   - <artifactId>spring-oxm</artifactId>
157   - <version>${org.springframework.version}</version>
158   - </dependency>
159   -
160   - <dependency>
161   - <groupId>org.springframework</groupId>
162   - <artifactId>spring-test</artifactId>
163   - <version>${org.springframework.version}</version>
164   - <scope>test</scope>
165   - </dependency>
166   - <dependency>
167   - <groupId>org.springframework</groupId>
168   - <artifactId>spring-tx</artifactId>
169   - <version>${org.springframework.version}</version>
170   - </dependency>
171   - <dependency>
172   - <groupId>org.springframework</groupId>
173   - <artifactId>spring-web</artifactId>
174   - <version>${org.springframework.version}</version>
175   - </dependency>
176   - <dependency>
177   - <groupId>org.springframework</groupId>
178   - <artifactId>spring-webmvc</artifactId>
179   - <version>${org.springframework.version}</version>
180   - </dependency>
181   - <dependency>
182   - <groupId>org.springframework</groupId>
183   - <artifactId>spring-webmvc-portlet</artifactId>
184   - <version>${org.springframework.version}</version>
185   - </dependency>
  168 + <dependency>
  169 + <groupId>org.springframework</groupId>
  170 + <artifactId>spring-aop</artifactId>
  171 + <version>${org.springframework.version}</version>
  172 + </dependency>
  173 + <dependency>
  174 + <groupId>org.springframework</groupId>
  175 + <artifactId>spring-aspects</artifactId>
  176 + <version>${org.springframework.version}</version>
  177 + </dependency>
  178 + <dependency>
  179 + <groupId>org.springframework</groupId>
  180 + <artifactId>spring-beans</artifactId>
  181 + <version>${org.springframework.version}</version>
  182 + </dependency>
  183 + <dependency>
  184 + <groupId>org.springframework</groupId>
  185 + <artifactId>spring-context</artifactId>
  186 + <version>${org.springframework.version}</version>
  187 + </dependency>
  188 + <dependency>
  189 + <groupId>org.springframework</groupId>
  190 + <artifactId>spring-context-support</artifactId>
  191 + <version>${org.springframework.version}</version>
  192 + </dependency>
  193 + <dependency>
  194 + <groupId>org.springframework</groupId>
  195 + <artifactId>spring-core</artifactId>
  196 + <version>${org.springframework.version}</version>
  197 + </dependency>
  198 + <dependency>
  199 + <groupId>org.springframework</groupId>
  200 + <artifactId>spring-expression</artifactId>
  201 + <version>${org.springframework.version}</version>
  202 + </dependency>
  203 + <dependency>
  204 + <groupId>org.springframework</groupId>
  205 + <artifactId>spring-instrument</artifactId>
  206 + <version>${org.springframework.version}</version>
  207 + </dependency>
  208 + <dependency>
  209 + <groupId>org.springframework</groupId>
  210 + <artifactId>spring-instrument-tomcat</artifactId>
  211 + <version>${org.springframework.version}</version>
  212 + </dependency>
  213 + <dependency>
  214 + <groupId>org.springframework</groupId>
  215 + <artifactId>spring-jdbc</artifactId>
  216 + <version>${org.springframework.version}</version>
  217 + </dependency>
  218 + <dependency>
  219 + <groupId>org.springframework</groupId>
  220 + <artifactId>spring-jms</artifactId>
  221 + <version>${org.springframework.version}</version>
  222 + </dependency>
  223 + <dependency>
  224 + <groupId>org.springframework</groupId>
  225 + <artifactId>spring-orm</artifactId>
  226 + <version>${org.springframework.version}</version>
  227 + </dependency>
  228 + <dependency>
  229 + <groupId>org.springframework</groupId>
  230 + <artifactId>spring-oxm</artifactId>
  231 + <version>${org.springframework.version}</version>
  232 + </dependency>
186 233  
  234 + <dependency>
  235 + <groupId>org.springframework</groupId>
  236 + <artifactId>spring-test</artifactId>
  237 + <version>${org.springframework.version}</version>
  238 + <scope>test</scope>
  239 + </dependency>
  240 + <dependency>
  241 + <groupId>org.springframework</groupId>
  242 + <artifactId>spring-tx</artifactId>
  243 + <version>${org.springframework.version}</version>
  244 + </dependency>
  245 + <dependency>
  246 + <groupId>org.springframework</groupId>
  247 + <artifactId>spring-web</artifactId>
  248 + <version>${org.springframework.version}</version>
  249 + </dependency>
  250 + <dependency>
  251 + <groupId>org.springframework</groupId>
  252 + <artifactId>spring-webmvc</artifactId>
  253 + <version>${org.springframework.version}</version>
  254 + </dependency>
  255 + <dependency>
  256 + <groupId>org.springframework</groupId>
  257 + <artifactId>spring-webmvc-portlet</artifactId>
  258 + <version>${org.springframework.version}</version>
  259 + </dependency>
  260 +
187 261 <!-- Mybatis Dependencies -->
188 262 <dependency>
189 263 <groupId>org.mybatis</groupId>
... ... @@ -204,13 +278,6 @@
204 278 <version>5.1.34</version>
205 279 </dependency>
206 280  
207   - <!-- postgresql jdbc driver -->
208   - <dependency>
209   - <groupId>org.postgresql</groupId>
210   - <artifactId>postgresql</artifactId>
211   - <version>9.4-1202-jdbc42</version>
212   - </dependency>
213   -
214 281 <!-- Others -->
215 282 <dependency>
216 283 <groupId>javax.servlet</groupId>
217 284  
... ... @@ -283,17 +350,8 @@
283 350 <artifactId>c3p0</artifactId>
284 351 <version>0.9.2-pre5</version>
285 352 </dependency>
  353 +
286 354 <dependency>
287   - <groupId>org.apache.velocity</groupId>
288   - <artifactId>velocity</artifactId>
289   - <version>1.7</version>
290   - </dependency>
291   - <dependency>
292   - <groupId>org.apache.velocity</groupId>
293   - <artifactId>velocity-tools</artifactId>
294   - <version>2.0</version>
295   - </dependency>
296   - <dependency>
297 355 <groupId>org.codehaus.jackson</groupId>
298 356 <artifactId>jackson-core-asl</artifactId>
299 357 <version>1.9.7</version>
300 358  
... ... @@ -335,13 +393,13 @@
335 393 <artifactId>pinyin4j</artifactId>
336 394 <version>2.5.0</version>
337 395 </dependency>
338   -
  396 + <!--
339 397 <dependency>
340 398 <groupId>org.apache.shiro</groupId>
341 399 <artifactId>shiro-all</artifactId>
342 400 <version>1.2.1</version>
343 401 </dependency>
344   - <!-- encache -->
  402 +
345 403 <dependency>
346 404 <groupId>net.sf.ehcache</groupId>
347 405 <artifactId>ehcache</artifactId>
... ... @@ -351,7 +409,7 @@
351 409 <groupId>com.googlecode.ehcache-spring-annotations</groupId>
352 410 <artifactId>ehcache-spring-annotations</artifactId>
353 411 <version>1.2.0</version>
354   - </dependency>
  412 + </dependency>-->
355 413  
356 414 <dependency>
357 415 <groupId>org.bouncycastle</groupId>
358 416  
... ... @@ -373,12 +431,8 @@
373 431 <artifactId>jaxrpc</artifactId>
374 432 <version>1.1</version>
375 433 </dependency>
  434 +
376 435 <dependency>
377   - <groupId>commons-httpclient</groupId>
378   - <artifactId>commons-httpclient</artifactId>
379   - <version>3.1</version>
380   - </dependency>
381   - <dependency>
382 436 <groupId>org.quartz-scheduler</groupId>
383 437 <artifactId>quartz</artifactId>
384 438 <version>1.8.4</version>
... ... @@ -405,49 +459,6 @@
405 459 <version>5.1.3.Final</version>
406 460 </dependency>
407 461  
408   -
409   - <dependency>
410   - <groupId>wsdl4j</groupId>
411   - <artifactId>wsdl4j</artifactId>
412   - <version>1.6.3</version>
413   - </dependency>
414   -
415   - <dependency>
416   - <groupId>org.igniterealtime.smack</groupId>
417   - <artifactId>smack-core</artifactId>
418   - <version>4.1.3</version>
419   - </dependency>
420   - <dependency>
421   - <groupId>org.igniterealtime.smack</groupId>
422   - <artifactId>smack-debug</artifactId>
423   - <version>4.1.3</version>
424   - </dependency>
425   - <dependency>
426   - <groupId>org.igniterealtime.smack</groupId>
427   - <artifactId>smack-tcp</artifactId>
428   - <version>4.1.3</version>
429   - </dependency>
430   - <dependency>
431   - <groupId>org.igniterealtime.smack</groupId>
432   - <artifactId>smack-java7</artifactId>
433   - <version>4.1.3</version>
434   - </dependency>
435   - <dependency>
436   - <groupId>org.igniterealtime.smack</groupId>
437   - <artifactId>smack-resolver-javax</artifactId>
438   - <version>4.1.3</version>
439   - </dependency>
440   - <dependency>
441   - <groupId>org.igniterealtime.smack</groupId>
442   - <artifactId>smack-resolver-dnsjava</artifactId>
443   - <version>4.1.3</version>
444   - </dependency>
445   -
446   - <dependency>
447   - <groupId>org.igniterealtime.smack</groupId>
448   - <artifactId>smack-extensions</artifactId>
449   - <version>4.1.3</version>
450   - </dependency>
451 462 <dependency>
452 463 <groupId>com.qiniu</groupId>
453 464 <artifactId>qiniu-java-sdk</artifactId>