Merge branch 'dev' of chenweida/jw2.0 into dev

base/common-data-es/src/main/java/com/yihu/base/es/config/ElasticFactory.java

@@ -1,4 +1,4 @@
package com.yihu.jw.es.config;
package com.yihu.base.es.config;
import io.searchbox.client.JestClient;
import io.searchbox.client.JestClientFactory;

base/common-data-es/src/main/java/com/yihu/base/es/config/ElastricSearchSave.java

@@ -1,7 +1,7 @@
package com.yihu.jw.es.config;
package com.yihu.base.es.config;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.es.config.model.SaveModel;
import com.yihu.base.es.config.model.SaveModel;
import io.searchbox.client.JestClient;
import io.searchbox.core.*;
import org.slf4j.Logger;

base/common-data-es/src/main/java/com/yihu/base/es/config/model/SaveModel.java

@@ -1,4 +1,4 @@
package com.yihu.jw.es.config.model;
package com.yihu.base.es.config.model;
import io.searchbox.annotations.JestId;

base/common-data-fastdfs/pom.xml

@@ -31,8 +31,7 @@
        </dependency>
        <dependency>
            <groupId>org.csource</groupId>
            <artifactId>fastdfs-client-java</artifactId>
            <version>1.0</version>
            <artifactId>fastdfs_lib</artifactId>
        </dependency>
    </dependencies>

base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/BaseJpaService.java

@@ -1,4 +1,4 @@
package com.yihu.jw.mysql.query;
package com.yihu.base.mysql.query;
import com.yihu.jw.restmodel.common.PageArg;
import com.yihu.jw.util.spring.SpringContext;

base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/FieldCondition.java

@@ -1,4 +1,4 @@
package com.yihu.jw.mysql.query;
package com.yihu.base.mysql.query;
import org.springframework.util.StringUtils;

base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/ReturnIdPstCreator.java

@@ -1,4 +1,4 @@
package com.yihu.jw.mysql.query;
package com.yihu.base.mysql.query;
import org.springframework.jdbc.core.PreparedStatementCreator;

base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/URLHqlQueryParser.java

@@ -1,4 +1,4 @@
package com.yihu.jw.mysql.query;
package com.yihu.base.mysql.query;
import javafx.util.Pair;
import org.hibernate.Criteria;

base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/URLQueryParser.java

@@ -1,4 +1,4 @@
package com.yihu.jw.mysql.query;
package com.yihu.base.mysql.query;
import com.yihu.jw.util.date.DateUtil;
import javafx.util.Pair;

base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/UpdatePstCallback.java

@@ -1,4 +1,4 @@
package com.yihu.jw.mysql.query;
package com.yihu.base.mysql.query;
import javafx.util.Pair;
import org.springframework.dao.DataAccessException;

svr-lib-parent-pom/pom.xml

@@ -85,7 +85,8 @@
        <version.spring-data-hadoop>2.3.0.RELEASE</version.spring-data-hadoop>
        <version.joda-time>2.8.2</version.joda-time>
        <version.solr>5.5.1</version.solr>
       <version.spring-data.solr>2.1.8.RELEASE</version.spring-data.solr>
        <version.spring-data.solr>2.1.8.RELEASE</version.spring-data.solr>
        <version.fastdfs>1.25</version.fastdfs>
    </properties>
    <!--dependencyManagement作用子配置不写版本默认继承父配置-->
    <dependencyManagement>
@@ -450,6 +451,16 @@
                <version>${version.hibernate-jpa}</version>
            </dependency>
            <!--hibernate end-->
            <!--fastdfs start-->
            <dependency>
                <groupId>org.csource</groupId>
                <artifactId>fastdfs_lib</artifactId>
                <version>${version.fastdfs}</version>
            </dependency>
            <!--fastdfs end-->
            <!--servlet api-->
            <dependency>