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

hos-arbiter/src/main/java/com/yihu/hos/arbiter/configuration/ArbiterServerConfiguration.java

@@ -54,7 +54,11 @@ public class ArbiterServerConfiguration {
    @Bean
    public ZbusBroker getZbusBroker() {
        try {
            zbusBroker = new ZbusBroker(this.centralUrl);
            if (isCentral()){
                zbusBroker = new ZbusBroker(this.terminalUrl);
            }else {
                zbusBroker = new ZbusBroker(this.centralUrl);
            }
            return zbusBroker;
        } catch (IOException e) {
            e.printStackTrace();

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

@@ -357,7 +357,9 @@ public class ServiceFlowService {
            Producer producer = new Producer(zbusBroker, ServiceFlowConstant.SSH + "@" + header.get("tenant"));
            producer.createMQ();    //确定为创建消息队列需要显示调用
            Message message = new Message();
            message.setHead(header);
            message.setHead("event", header.get("event"));
            message.setHead("tenant", header.get("tenant"));
//            message.setHead(header);
            message.setMethod("POST");
            message.setBody(msg);
            message = producer.sendSync(message);

hos-arbiter/src/main/resources/application.yml

@@ -26,7 +26,7 @@ arbiter:
    port: 15555
    store: ./store
  terminal:
    url: http://192.168.131.119:10135
    url: 192.168.131.119:15555
  tenant:
    name: jkzl
---

src/main/webapp/WEB-INF/ehr/jsp/common/indexJs.jsp

@@ -62,7 +62,7 @@
            $(".l-layout-left").css({background: "#dce6f0"})
            var tenantManager ;
            var tenantManager = {} ;
            var userRole = localStorage.getItem("userRole");
            if(userRole=="admin"){
                //是管理中心用户，则添加租户管理模块
@@ -104,7 +104,6 @@
                {id: 37, pid: 3, text: '维度类别配置', url: '${contextRoot}/dimension/dimensioncatetory'},
                //用户安全中心
                {id: 7, text: '用户安全', icon: '${staticRoot}/images/index/menu5_icon.png'},
                tenantManager,
                {id: 71, pid: 7, text: '机构管理', url: '${contextRoot}/org/initial'},
                {id: 72, pid: 7, text: '用户管理', url: '${contextRoot}/user/initial'},
                {id: 73, pid: 7, text: '角色管理', url: '${contextRoot}/role/initial'},