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

base/common-data-fastdfs/src/main/java/com/yihu/base/config/FastDFSConfig.java

@@ -1,7 +1,7 @@
package com.yihu.base.config;
import com.yihu.base.fastdfs.FastDFSClientPool;
import com.yihu.base.fastdfs.FastDFSUtil;
import com.yihu.base.fastdfs.FastDFSHelper;
import org.csource.common.MyException;
import org.csource.fastdfs.ClientGlobal;
import org.csource.fastdfs.TrackerGroup;
@@ -110,8 +110,8 @@ public class FastDFSConfig {
    }
    @Bean
    public FastDFSUtil fastDFSUtil(){
        FastDFSUtil util = new FastDFSUtil();
    public FastDFSHelper fastDFSUtil(){
        FastDFSHelper util = new FastDFSHelper();
        return util;
    }
}

base/common-data-fastdfs/src/main/java/com/yihu/base/fastdfs/FastDFSUtil.java

@@ -19,8 +19,8 @@ import java.net.InetSocketAddress;
 * @author szx
 * @author Sand
 */
public class FastDFSUtil {
    private Logger logger= LoggerFactory.getLogger(FastDFSUtil.class);
public class FastDFSHelper {
    private Logger logger= LoggerFactory.getLogger(FastDFSHelper.class);
    public final static String GroupField = "groupName";
    public final static String RemoteFileField = "remoteFileName";
    public final static String FileIdField = "fid";

base/common-data-hbase/src/main/java/com/yihu/base/hbase/AbstractHBaseClient.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.hbase;
package com.yihu.base.hbase;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;

base/common-data-hbase/src/main/java/com/yihu/base/hbase/HBaseAdmin.java

@@ -1,8 +1,8 @@
package com.yihu.ehr.hbase;
package com.yihu.base.hbase;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.ehr.hbase.AbstractHBaseClient;
import com.yihu.base.hbase.AbstractHBaseClient;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;

base/common-data-hbase/src/main/java/com/yihu/base/hbase/HBaseDao.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.hbase;
package com.yihu.base.hbase;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.hadoop.hbase.Cell;
@@ -19,7 +19,7 @@ import java.util.*;
 * 数据增删改查
 */
@Service
public class HBaseDao extends AbstractHBaseClient {
public class HBaseHelper extends AbstractHBaseClient {
    @Autowired
    ObjectMapper objectMapper;

base/common-data-hbase/src/main/java/com/yihu/base/hbase/TableBundle.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.hbase;
package com.yihu.base.hbase;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

base/common-data-hbase/src/main/java/com/yihu/base/hbase/config/HbaseConfig.java

@@ -1,4 +1,4 @@
package com.yihu.ehr.hbase.config;
package com.yihu.base.hbase.config;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.TableName;

base/common-data-solr/src/main/java/com/yihu/base/SolrUtil.java

@@ -26,7 +26,7 @@ import java.util.Map;
 */
@Service
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
public class SolrUtil {
public class SolrHelper {
    @Autowired
    SolrPool pool;
    private final static String ASC = "asc";