Merge branch 'dev' of chenweida/jkzl-start into master

common-async-starter/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.yihu.base.async.AsyncExecutorUtils

common-data-es-starter/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.yihu.base.es.config.ElastricSearchHelper

common-data-fastdfs-starter/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.yihu.base.config.FastDFSConfig

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

@@ -2,20 +2,18 @@ package com.yihu.base.hbase;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.security.UserGroupInformation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.hadoop.hbase.HbaseTemplate;
import java.io.IOException;
/**
 * @author hzp
 * @created 2017.05.03
 */
public class AbstractHBaseClient {
    @Autowired
    public AbstractHBaseClient(HbaseTemplate hbaseTemplate) {
        this.hbaseTemplate = hbaseTemplate;
    }
    protected HbaseTemplate hbaseTemplate;

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

@@ -2,19 +2,16 @@ package com.yihu.base.hbase;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.base.hbase.AbstractHBaseClient;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.hadoop.hbase.util.Bytes;
import org.springframework.data.hadoop.hbase.HbaseTemplate;
import org.springframework.data.hadoop.hbase.TableCallback;
import org.springframework.stereotype.Service;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -22,9 +19,12 @@ import java.util.List;
 * @author hzp
 * @created 2017.05.03
 */
@Service
public class HBaseAdmin extends AbstractHBaseClient {
    public HBaseAdmin(HbaseTemplate hbaseTemplate) {
        super(hbaseTemplate);
    }
    /**
     * 判断表是否存在
     */

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

@@ -7,22 +7,22 @@ import org.apache.hadoop.hbase.filter.CompareFilter;
import org.apache.hadoop.hbase.filter.RegexStringComparator;
import org.apache.hadoop.hbase.filter.RowFilter;
import org.apache.hadoop.hbase.util.Bytes;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.hadoop.hbase.HbaseTemplate;
import org.springframework.data.hadoop.hbase.RowMapper;
import org.springframework.data.hadoop.hbase.TableCallback;
import org.springframework.stereotype.Service;
import java.io.IOException;
import java.util.*;
/**
 * 数据增删改查
 */
@Service
public class HBaseHelper extends AbstractHBaseClient {
    @Autowired
    ObjectMapper objectMapper;
    ObjectMapper objectMapper=new ObjectMapper();
    public HBaseHelper(HbaseTemplate hbaseTemplate) {
        super(hbaseTemplate);
    }
    /**
     *模糊匹配rowkey

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

@@ -1,11 +1,10 @@
package com.yihu.base.hbase.config;
import com.yihu.base.hbase.HBaseHelper;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.*;
import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.security.UserGroupInformation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@@ -15,7 +14,10 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.data.hadoop.hbase.HbaseTemplate;
import org.springframework.data.hadoop.hbase.TableCallback;
import java.util.*;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
/**
 * @author Sand
@@ -24,11 +26,11 @@ import java.util.*;
 */
@Configuration
@ConfigurationProperties(prefix = "hadoop")
public class HbaseConfig{
public class HbaseConfig {
    private static Logger logger = LoggerFactory.getLogger(HbaseConfig.class);
    private Map<String, String> hbaseProperties = new HashMap<>();
    public Map<String, String> getHbaseProperties(){
    public Map<String, String> getHbaseProperties() {
        return this.hbaseProperties;
    }
@@ -38,7 +40,7 @@ public class HbaseConfig{
    @Bean
    public org.apache.hadoop.conf.Configuration configuration() {
        Set<String> keys = new HashSet<>(hbaseProperties.keySet());
        for (String key : keys){
        for (String key : keys) {
            String value = hbaseProperties.remove(key);
            key = key.replaceAll("^\\d{1,2}\\.", "");
@@ -54,25 +56,23 @@ public class HbaseConfig{
    }
    @Bean
    public HbaseTemplate hbaseTemplate(org.apache.hadoop.conf.Configuration configuration){
    public HbaseTemplate hbaseTemplate(org.apache.hadoop.conf.Configuration configuration) {
        HbaseTemplate hbaseTemplate = new HbaseTemplate();
        hbaseTemplate.setConfiguration(configuration);
        try
        {
            logger.info("set System property for hbase ---",user);
        try {
            logger.info("set System property for hbase ---", user);
            System.setProperty("HADOOP_USER_NAME", user);
            String tableName = "HealthProfile";
            //覆盖默认的配置文件
            org.apache.hadoop.conf.Configuration.addDefaultResource("core-site.xml");
            org.apache.hadoop.conf.Configuration.addDefaultResource("hbase-site.xml");
            Connection connection = ConnectionFactory.createConnection(configuration);
            logger.info("Hbase createConnection finished---",connection.getConfiguration());
            logger.info("Hbase createConnection finished---", connection.getConfiguration());
            Admin admin = connection.getAdmin();
            boolean ex = admin.tableExists(TableName.valueOf(tableName));
            //判断是否存在
            if(ex)
            {
            if (ex) {
                hbaseTemplate.execute(tableName, new TableCallback<Object>() {
                    @Override
                    public Object doInTable(HTableInterface table) throws Throwable {
@@ -85,12 +85,16 @@ public class HbaseConfig{
            }
            admin.close();
            connection.close();
        }
        catch (Exception ex)
        {
            logger.info("Hbase createConnection failure",ex.getMessage());
        } catch (Exception ex) {
            logger.info("Hbase createConnection failure", ex.getMessage());
        }
        return hbaseTemplate;
    }
    @Bean
    public HBaseHelper hBaseHelper(HbaseTemplate hbaseTemplate) {
        HBaseHelper hBaseHelper = new HBaseHelper(hbaseTemplate);
        return hBaseHelper;
    }
}

common-data-hbase-starter/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.yihu.base.hbase.config.HbaseConfig

common-data-mysql-starter/pom.xml

@@ -14,14 +14,6 @@
    <version>1.0.0</version>
    <dependencies>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-util</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-rest-model</artifactId>
        </dependency>
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>

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

@@ -1,7 +1,7 @@
package com.yihu.base.mysql.query;
import com.yihu.jw.restmodel.common.PageArg;
import com.yihu.jw.util.spring.SpringContext;
import com.yihu.base.mysql.query.model.PageArg;
import com.yihu.base.mysql.query.util.SpringContext;
import org.hibernate.Query;
import org.hibernate.Session;
import org.springframework.beans.BeanUtils;

common-data-mysql-starter/src/main/java/com/yihu/base/mysql/query/model/PageArg.java

@@ -0,0 +1,14 @@
package com.yihu.base.mysql.query.model;
/**
 * @author Sand
 * @version 1.0
 * @created 2016.02.14 17:47
 */
public class PageArg {
    public static final Integer DefaultPage = 1;
    public static final Integer DefaultSize = 15;
    public static final String DefaultPageS = "1";
    public static final String DefaultSizeS = "15";
}

common-data-mysql-starter/src/main/java/com/yihu/base/mysql/query/util/SpringContext.java

@@ -0,0 +1,132 @@
package com.yihu.base.mysql.query.util;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
import org.springframework.util.ClassUtils;
/**
 * Spring上下文管理器。
 *
 * @author Sand
 * @version 1.0
 * @created 12-05-2015 17:47:55
 */
@Component
public class SpringContext implements ApplicationContextAware {
    private static ApplicationContext springContext = null;
    /**
     * 获取Spring应用上下文环境。
     *
     * @return
     */
    public static ApplicationContext getApplicationContext() {
        return springContext;
    }
    @Override
    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
        springContext = applicationContext;
    }
    /**
     * 获取服务。
     *
     * @param serviceName
     * @param <T>
     * @return
     */
    public static <T> T getService(String serviceName) {
        return (T) springContext.getBean(serviceName);
    }
    public static <T> T getService(Class<T> beanCls) {
        return (T) springContext.getBean(beanCls);
    }
    /**
     * 获取服务，并用参数初始化对象。
     *
     * @param serviceName
     * @param args
     * @param <T>
     * @return
     */
    public static <T> T getService(String serviceName, Object... args) {
        T ref = (T)springContext.getBean(serviceName, args);
        if (ref == null) return null;
        return ref;
    }
    public static <T> T getService(Class<T> beanCls, Object... args){
        T ref = (T)springContext.getBean(beanCls, args);
        if (ref == null) return null;
        return ref;
    }
    /**
     * 获取平台支持的所有服务名称。
     *
     * @return
     */
    public static String[] getAvailableServiceNames() {
        String[] serviceNames = springContext.getBeanDefinitionNames();
        return serviceNames;
    }
    /**
     * 判断是否支持特定服务。
     *
     * @param serviceName
     * @return
     */
    public static boolean isServiceSupported(String serviceName) {
        return springContext.containsBeanDefinition(serviceName);
    }
    /**
     * 获取服务的实现类。
     *
     * @param serviceName
     * @return
     */
    public static Class getServiceType(String serviceName) {
        return springContext.getType(serviceName);
    }
    /**
     * 判断服务是否为单例模式。
     *
     * @param serviceName
     * @return
     */
    public static boolean isSingleton(String serviceName) {
        return springContext.isSingleton(serviceName);
    }
    /**
     * 手动装配Bean
     * @param bean
     */
    public static void autowiredBean(Object bean) {
        autowiredBean(bean, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE);
    }
    /**
     * 指定模式，手动装配Bean
     * @param bean
     * @param autowireMode
     */
    public static void autowiredBean(Object bean, int autowireMode) {
        String beanName = ClassUtils.getUserClass(bean).getName();
        AutowireCapableBeanFactory factory = springContext.getAutowireCapableBeanFactory();
        factory.autowireBeanProperties(bean, autowireMode, false);
        factory.initializeBean(bean, beanName);
    }
}

common-data-mysql-starter/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  com.yihu.base.mysql.query.util.SpringContext,\
  com.yihu.base.mysql.query.BaseJpaService

common-quartz-starter/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,4 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
  com.yihu.base.config.quartz.DefaultSchedulerConfig,\
  com.yihu.base.config.quartz.QuartzHelper,\
  com.yihu.base.config.quartz.DefaultJobFactory