Browse Source

arbiter 消息转发请求bug修复

demon 8 years ago
parent
commit
54114a7114

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

@ -7,6 +7,8 @@ import com.yihu.hos.core.http.HTTPResponse;
import com.yihu.hos.core.http.HttpClientKit;
import com.yihu.hos.web.framework.constant.ServiceFlowConstant;
import com.yihu.hos.web.framework.model.bo.ServiceFlow;
import org.apache.camel.Body;
import org.apache.camel.Headers;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@ -17,6 +19,7 @@ import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Service;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -341,10 +344,13 @@ public class ServiceFlowService {
     * @param header 消息头部信息
     * @param msg    消息
     */
    public void proxy(Map<String, String> header, String msg) {
    public void proxy(@Headers Map<String, String> header, @Body String msg) {
        String tenant = header.get("tenant");
        String event = header.get("event");
        ArbiterServer arbiterServer = arbiterServerService.get(tenant);
        header.remove("tenant");
        header = new HashMap<>();
        header.put("event",event);
        HttpClientKit.post(arbiterServer.getUrl() + "/proxy", msg, header);
    }

+ 1 - 1
hos-broker/src/main/resources/log4j.properties

@ -31,7 +31,7 @@ log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
log4j.appender.jms=com.yihu.hos.broker.common.log.JMSAppender
log4j.appender.jms.InitialContextFactoryName=org.apache.activemq.jndi.ActiveMQInitialContextFactory
log4j.appender.jms.ProviderURL=tcp://172.19.103.86:61616
log4j.appender.jms.ProviderURL=tcp://172.19.103.57:61616
log4j.appender.jms.TopicBindingName=logTopic
log4j.appender.jms.TopicConnectionFactoryBindingName=ConnectionFactory
log4j.appender.jms.userName=admin

+ 1 - 1
src/main/java/com/yihu/hos/tenant/service/AuthenticateService.java

@ -58,7 +58,7 @@ public class AuthenticateService {
//        if (userModel == null || !password.equals(userModel.getPassword())) {
//            return "User Auth Failed";
//        }
        LocalContext.getContext().setAttachment(ContextAttributes.TENANT_NAME,tenantModel.getName());
        LocalContext.getContext().setAttachment(ContextAttributes.TENANT_NAME,tenantModel.getLoginName());
        httpSession.setAttribute(ContextAttributes.TENANT_SESSION, new TenantSession(tenantModel.getLoginName(), tenantModel.getSchema()));
        return true;
    }