Browse Source

查询大小写问题

huangzhiyong 8 years ago
parent
commit
6dfa7b6625

+ 1 - 1
hos-arbiter/src/main/java/com/yihu/hos/arbiter/services/ServiceFlowService.java

@ -142,7 +142,7 @@ public class ServiceFlowService {
        try {
            ServiceFlow serviceFlow = getServiceFlow(msg);
            serviceFlow = this.save(serviceFlow);
            System.out.println("流程添加serviceFlowAdd开始!");
            boolean one = ServiceFlowConstant.JAVA.equals(serviceFlow.getFlowType());//java类型为采集任务
            if (one) {
                BrokerServer brokerServer = brokerServerService.get();

+ 2 - 0
hos-broker/src/main/java/com/yihu/hos/broker/services/camel/ESBCamelService.java

@ -60,6 +60,7 @@ public class ESBCamelService {
    public Result onServiceFlowAdd(String msg) {
        try {
            System.out.println("hos-broker 流程添加开始,onServiceFlowModifyAdd");
            ServiceFlowValid serviceFlowValid = new ServiceFlowValid(msg).invoke();
            if (serviceFlowValid.is()) return Result.error("必要的入参数据不正确,请检查!");
@ -123,6 +124,7 @@ public class ESBCamelService {
     */
    public Result onServiceFlowModifyAdd(String msg) {
        try {
            System.out.println("hos-broker 流程修改开始,onServiceFlowModifyAdd");
            ServiceFlowValid serviceFlowValid = new ServiceFlowValid(msg).invoke();
            if (serviceFlowValid.is()) return Result.error("必要的入参数据不正确,请检查!");
            List<Route> routes = SystemCamelContext.getContext().getRoutes();

+ 1 - 1
hos-camel2/src/main/java/camel/collect/processor/CollectProcessor0.java

@ -10,6 +10,6 @@ import org.apache.camel.Processor;
public class CollectProcessor0 implements Processor {
    public void process(Exchange exchange) throws Exception {
        Message outMessage = exchange.getOut();
        outMessage.setHeader(Exchange.HTTP_QUERY, "jobId=5ad5c11655d443c30155d477a6b10000");
        outMessage.setHeader(Exchange.HTTP_QUERY, "jobId=jobId");
    }
}

+ 14 - 13
hos-rest/src/main/java/com/yihu/hos/rest/services/crawler/DatacollectService.java

@ -99,19 +99,20 @@ public class DatacollectService {
                        String type = ds.getType();
                        String message = "";
                        logStr.append(DateConvert.toString(new Date(), dateFormat) + " " + ds.getJobDatasetName());
                        if (type != null) {
                            if (type.equals("1")) //Web Service
                            {
                                message = collectWebservice(ds, schemeVersion, logId) + "\n";
                            } else if (type.equals("2"))//文件系统
                            {
                                message = "文件系统采集。\n";
                            } else { //数据库
                                message = collectTable(ds, schemeVersion, logId) + "\n";
                            }
                        } else {
                            message = ds.getJobDatasetName() + "未关联数据源!\n";
                        }
//                        if (type != null) {
//                            if (type.equals("1")) //Web Service
//                            {
//                                message = collectWebservice(ds, schemeVersion, logId) + "\n";
//                            } else if (type.equals("2"))//文件系统
//                            {
//                                message = "文件系统采集。\n";
//                            } else { //数据库
//                                message = collectTable(ds, schemeVersion, logId) + "\n";
//                            }
//                        } else {
//                            message = ds.getJobDatasetName() + "未关联数据源!\n";
//                        }
                        message = collectTable(ds, schemeVersion, logId) + "\n";
                        logger.info(message); //文本日志

+ 4 - 4
hos-rest/src/main/resources/config/dbhelper.properties

@ -1,7 +1,7 @@
defaultName = hos-mysql
defaultUri = jdbc:mysql://172.19.103.57:3306/esb?useUnicode=true&characterEncoding=UTF-8
defaultUser = hos
defaultPassword = hos
defaultUri = jdbc:mysql://172.19.103.42:3306/esb?useUnicode=true&characterEncoding=UTF-8
defaultUser = esb
defaultPassword = esb
mongodbUri=mongodb://esb:esb@172.19.103.57:27017/?authSource=admin
mongodbUri=mongodb://esb:esb@172.19.103.42:27017/?authSource=admin
mongodbName=hos

+ 1 - 1
hos-rest/src/main/resources/config/sys.config.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<config>
    <temp_file>D:\temp</temp_file>
    <temp_file>/usr/local/esb/temp</temp_file>
    <ehr_version>
        <org_code code="jkzl">
            <version>56395d75b854</version>

+ 1 - 1
hos-rest/src/main/resources/spring/applicationContext.xml

@ -24,7 +24,7 @@
    <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
        <property name="url" value="jdbc:mysql://172.19.103.57:8066/hos2?useUnicode=true&amp;characterEncoding=UTF-8"/>
        <property name="url" value="jdbc:mysql://172.19.103.42:8066/hos2?useUnicode=true&amp;characterEncoding=UTF-8"/>
        <property name="username" value="hos"/>
        <property name="password" value="123456"/>
        <property name="initialSize" value="1"/>

+ 1 - 1
src/main/java/com/yihu/hos/system/dao/BaseDictDao.java

@ -95,7 +95,7 @@ public class BaseDictDao extends SQLGeneralDAO {
        else{
            sql+=",'' as extend";
        }
        sql += " from "+tableName;
        sql += " from "+tableName.toLowerCase();
        if(!StringUtil.isEmpty(Where))
        {
            sql +=" where " + Where;