Merge branch 'master' of http://192.168.1.220:10080/esb/esb

# Conflicts:
#	src/main/java/com/yihu/hos/system/service/FlowManager.java

hos-camel2/src/main/java/api1/processor/ApiProcessor.java

@@ -0,0 +1,14 @@
package api1.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
public class ApiProcessor implements Processor {
    public void process(Exchange exchange) throws Exception {
        Message outMessage = exchange.getOut();
        System.out.println("测试，helloWorld 打印camel接口");
        outMessage.setBody("hello,api1xxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
    }
}

hos-camel2/src/main/java/api1/route/ApiRouteBulider.java

@@ -0,0 +1,13 @@
package api1.route;
import api1.processor.ApiProcessor;
import org.apache.camel.builder.RouteBuilder;
public class ApiRouteBulider extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("jetty:http://0.0.0.0:9097/api/v7").routeId("api1")
                .process(new ApiProcessor()).log("servers: 0,code: ,order: 0").log("servers: 0,code: ,order: 0");
    }
}

hos-camel2/src/main/java/api7/processor/ApiProcessor.java

@@ -0,0 +1,14 @@
package api7.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
public class ApiProcessor implements Processor {
    public void process(Exchange exchange) throws Exception {
        Message outMessage = exchange.getOut();
        System.out.println("测试，helloWorld 打印camel接口");
        outMessage.setBody("hello,api7xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
    }
}

hos-camel2/src/main/java/api7/route/ApiRouteBulider.java

@@ -0,0 +1,13 @@
package api7.route;
import api7.processor.ApiProcessor;
import org.apache.camel.builder.RouteBuilder;
public class ApiRouteBulider extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("jetty:http://0.0.0.0:9097/api/v1").routeId("api7")
                .process(new ApiProcessor()).log("servers: 0,code: ,order: 0").log("servers: 0,code: ,order: 0");
    }
}

hos-camel2/src/main/java/camel/gateway/processor/GatewayProcessor.java

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.core.http.HTTPResponse;
import com.yihu.hos.core.http.HttpClientKit;
import org.apache.camel.Body;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
@@ -26,22 +25,24 @@ public class GatewayProcessor implements Processor {
    public void process(Exchange exchange) throws Exception {
        Message inMessage = exchange.getIn();
        String appKey = exchange.getIn().getHeaders().get("appKey").toString();
        String secret = getSecret(appKey);
        exchange.setOut(inMessage);
        exchange.getOut().setHeader("secret", secret);
    }
        Map<String, Object> headers = exchange.getIn().getHeaders();
//        exchange.setOut(inMessage);
        exchange.getOut().setHeader("api", headers.get("api"));
        exchange.getOut().setHeader("param", headers.get("param"));
        exchange.getOut().setHeader("timestamp", headers.get("timestamp"));
        exchange.getOut().setHeader("v", headers.get("v"));
        exchange.getOut().setHeader("appKey", headers.get("appKey"));
        exchange.getOut().setHeader("sign", headers.get("sign"));
    public String secret(@Body String body, Exchange exchange) throws IOException, ParseException {
        System.out.println(body);
        String appKey = exchange.getIn().getHeaders().get("appKey").toString();
        return "restlet:"+ agUrl + "/api/v1.0/admin/apps/" + appKey;
    }
    public String route(Exchange exchange) throws IOException, ParseException {
//        body = URLDecoder.decode(body, "UTF-8");
        Map<String, Object> params = exchange.getIn().getHeaders();
        String secret = params.get("secret").toString();
        String appKey = params.get("appKey").toString();
        String secret = getSecret(appKey);
        if (secret.equals("")) {
            return "jetty:http://0.0.0.0:9999/error/paramError";    //TODO:
        }
@@ -96,8 +97,8 @@ public class GatewayProcessor implements Processor {
        Calendar date = Calendar.getInstance();
        long timeInMillis = date.getTimeInMillis();
        java.util.Date min = new java.util.Date(timeInMillis - 5 * ONE_MIN);
        java.util.Date max = new java.util.Date(timeInMillis + 5 * ONE_MIN);
        java.util.Date min = new java.util.Date(timeInMillis - 30 * ONE_MIN);
        java.util.Date max = new java.util.Date(timeInMillis + 30 * ONE_MIN);
        return ts.after(min) && ts.before(max);
@@ -194,6 +195,7 @@ public class GatewayProcessor implements Processor {
            if (body[0].length() != 0) {
                exchange.getOut().setHeader(Exchange.REST_HTTP_QUERY, body[0].substring(1));
            }
//            exchange.getOut().setBody(null);
            return endPoint[0];
        } catch (IOException e) {
            e.printStackTrace();

hos-camel2/src/main/java/camel/gateway/route/GatewayRouterBuilder.java

@@ -40,6 +40,8 @@ public class GatewayRouterBuilder extends RouteBuilder {
        from("jetty:http://0.0.0.0:9999/sign").routeId("sign")
        .process(new SignProcessor());
        from("jetty:http://0.0.0.0:9999/rest").routeId("restTest")
        .to("restlet:http://192.168.1.221:10000/api/v1.0/admin/doctors/admin/13?autoCloseStream=true");
    }
}

hos-web-framework/src/main/java/com/yihu/hos/web/framework/dao/SQLGeneralDAO.java

@@ -3,7 +3,6 @@ package com.yihu.hos.web.framework.dao;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeType;
import com.yihu.hos.core.datatype.CollectionUtil;
import com.yihu.hos.core.datatype.NumberUtil;
import com.yihu.hos.core.datatype.StringUtil;
import com.yihu.hos.core.log.Logger;
@@ -16,7 +15,6 @@ import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.hibernate.jdbc.Work;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -28,9 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.IOException;
import java.io.Serializable;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Collection;
import java.util.Iterator;
@@ -421,30 +417,11 @@ public class SQLGeneralDAO implements XSQLGeneralDAO {
    }
    public void insertBatch(final List<String> insertSqlList) {
        Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession();
        session.doWork(new Work() {
            public void execute(Connection connection) throws SQLException {
                if (!CollectionUtil.isEmpty(insertSqlList)) {
                    Statement stmt = connection.createStatement();
                    connection.setAutoCommit(false);
                    Iterator ex = insertSqlList.iterator();
                    while (ex.hasNext()) {
                        String sql = (String) ex.next();
                        stmt.addBatch(sql);
                    }
                    try {
                        stmt.executeBatch();
                    } catch (Exception var5) {
                        logger.error("insertBatch-ERROR: ", var5);
                    }
//        Session session = this.getHibernateTemplate().getSessionFactory().getCurrentSession();
        String[] sqlStr = new String[insertSqlList.size()];
        String[] sqlArr = insertSqlList.toArray(sqlStr);
        this.jdbcTemplate.batchUpdate(sqlArr);
                    stmt.close();
                }
            }
        });
    }
    public Session openSession() {

src/main/java/com/yihu/hos/interceptor/JdbcTemplateAdvice.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
@Component
public class JdbcTemplateAdvice {
    @Around("execution(* org.springframework.jdbc.core.JdbcTemplate.query*(..)) || execution(* org.springframework.jdbc.core.JdbcTemplate.execute*(..))")
    @Around("execution(* org.springframework.jdbc.core.JdbcTemplate.batchUpdate*(..)) || execution(* org.springframework.jdbc.core.JdbcTemplate.query*(..)) || execution(* org.springframework.jdbc.core.JdbcTemplate.execute*(..))")
    public Object process(ProceedingJoinPoint point) throws Throwable {
        String schemaName = getSchema();
        //访问目标方法的参数：
@@ -29,6 +29,15 @@ public class JdbcTemplateAdvice {
                completeSql = myCatAnnotation + completeSql;
            }
            args[0]=completeSql;
        }else  if (args != null && args.length > 0 && args[0].getClass() == String[].class) {
            String[] sqls = (String[]) args[0];
            if (StringUtils.isNotEmpty(schemaName)) {
                for (int i=0;i<sqls.length;i++){
                    String myCatAnnotation = "/*#mycat:schema=" + schemaName + "*/ ";
                    sqls[i] = myCatAnnotation + sqls[i];
                }
            }
            args[0]=sqls;
        }
        //用改变后的参数执行目标方法
        Object returnValue = point.proceed(args);