去除zbus的一些无用配置

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

@@ -45,7 +45,7 @@ public class ProxyService {
    }
    public void start() {
        new ServiceFlow().server();
        new ServiceFlow().start();
        new Mycat().start();
        new Shell().start();
        new EndPoint().start();
@@ -62,7 +62,7 @@ public class ProxyService {
            producerTemplate.sendBodyAndHeaders(ServiceFlowConstant.CAMEL_ENDPOINT, message.getBodyString(), header);
        }
        public void server() {
        public void start() {
            if (zbusBroker == null) {
                logger.error("zbusBroker is null");
                return;

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

@@ -98,11 +98,11 @@ arbiter:
  timer:
      period: 10000
  central:
    url: 192.168.131.119:15555
    url: 192.168.131.38:15555
  terminal:
    url: 192.168.131.38:15555
  tenant:
    name: yichang
    name: jkzl
  mycat:
    name: mycat192.168.131.38    ##mycat 服务器标识，规则：“mycat"+ 本机IP
#jcraft shell操作

src/main/java/com/yihu/hos/config/BeanConfig.java

@@ -40,8 +40,6 @@ public class BeanConfig {
    @Autowired
    BasicDataSource dataSource;
    @Value("${hos.zbus.url}")
    private String zbusUrl;
    @Value("${hos.zbus.port}")
    private Integer zbusPort;
    @Value("${hos.zbus.store}")
@@ -52,7 +50,7 @@ public class BeanConfig {
    @Bean
    public ZbusBroker getZbusBroker() {
        try {
            zbusBroker = new ZbusBroker(this.zbusUrl);
            zbusBroker = new ZbusBroker("127.0.0.1:" + zbusPort);
            return zbusBroker;
        } catch (IOException e) {
            e.printStackTrace();
@@ -60,10 +58,6 @@ public class BeanConfig {
        return null;
    }
    public String getZbusUrl() {
        return zbusUrl;
    }
    public Integer getZbusPort() {
        return zbusPort;
    }
@@ -72,16 +66,6 @@ public class BeanConfig {
        return zbusStore;
    }
    @Override
    protected void finalize() throws Throwable {
        if (zbusBroker != null) {
            zbusBroker.close();
        }
        super.finalize();
    }
    @Bean
    public LocalSessionFactoryBean sessionFactory() {
        LocalSessionFactoryBean localSessionFactoryBean = new LocalSessionFactoryBean();
@@ -100,6 +84,15 @@ public class BeanConfig {
        return localSessionFactoryBean;
    }
    //txManager事务开启
    @Bean
    public HibernateTransactionManager txManager() throws SQLException {
        HibernateTransactionManager hibernateTransactionManager = new HibernateTransactionManager();
        LocalSessionFactoryBean sessionFactoryBean = this.sessionFactory();
        hibernateTransactionManager.setSessionFactory(sessionFactoryBean.getObject());
        return hibernateTransactionManager;
    }
//    @Bean( destroyMethod = "close")
//    public BasicDataSource dataSource() {
//        if (StringUtils.isEmpty(datasourcePropertyResolver.get("url").toString())) {
@@ -123,15 +116,6 @@ public class BeanConfig {
//        return dataSource;
//    }
    //txManager事务开启
    @Bean
    public HibernateTransactionManager txManager() throws SQLException {
        HibernateTransactionManager hibernateTransactionManager = new HibernateTransactionManager();
        LocalSessionFactoryBean sessionFactoryBean = this.sessionFactory();
        hibernateTransactionManager.setSessionFactory(sessionFactoryBean.getObject());
        return hibernateTransactionManager;
    }
    //文经上传
    @Bean
    public CommonsMultipartResolver multipartResolver() {
@@ -147,7 +131,6 @@ public class BeanConfig {
        return messageSource;
    }
    @Bean
    public CookieLocaleResolver localeResolver() {
        CookieLocaleResolver localeResolver = new CookieLocaleResolver();
@@ -188,4 +171,13 @@ public class BeanConfig {
        return new AuditInterceptor();
    }
    @Override
    protected void finalize() throws Throwable {
        if (zbusBroker != null) {
            zbusBroker.close();
        }
        super.finalize();
    }
}

src/main/java/com/yihu/hos/remoteManage/service/RemoteShellService.java

@@ -7,7 +7,6 @@ import com.yihu.hos.services.ServiceShellEventService;
import com.yihu.hos.web.framework.constant.ServiceFlowConstant;
import com.yihu.hos.web.framework.model.bo.ServiceShell;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.zbus.broker.ZbusBroker;
import org.zbus.mq.Consumer;
@@ -28,8 +27,6 @@ import java.util.Map;
public class RemoteShellService {
    public static final String BEAN_ID = "RemoteShellService";
    @Value("${hos.zbus.url}")
    private String zbusUrl;
    @Autowired
    private ServiceShellEventService serviceShellEventService;
    private ZbusBroker zbusBroker;

src/main/java/com/yihu/hos/system/service/AppManager.java

@@ -51,6 +51,7 @@ public class AppManager {
    private ZbusBroker zbusBroker;
    @Autowired
    public void setZbusBroker(ZbusBroker zbusBroker) {
        this.zbusBroker = zbusBroker;
    }
@@ -121,25 +122,26 @@ public class AppManager {
    @Transactional
    public Result updateAppService(SystemServiceEndpoint obj) throws Exception {
        SystemServiceEndpoint systemApp = appServiceDao.getEntity(SystemServiceEndpoint.class, obj.getId());
        systemApp.setName(obj.getName());
        systemApp.setCode(obj.getCode());
        systemApp.setValid(obj.getValid());
        systemApp.setVersion(obj.getVersion());
        systemApp.setDescription(obj.getDescription());
        systemApp.setEndpoint(obj.getEndpoint());
        systemApp.setRequesModule(obj.getRequesModule());
        systemApp.setRequestProtocol(obj.getRequestProtocol());
        systemApp.setResponeError(obj.getResponeError());
        systemApp.setResponeResult(obj.getResponeResult());
        systemApp.setRequestMethod(obj.getRequestMethod());
        systemApp.setRequestParameterList(obj.getRequestParameterList());
        systemApp.setHealthEndpoint(obj.getHealthEndpoint());
        systemApp.setHealthReportType(obj.getHealthReportType());
        systemApp.setMetricsEndpoint(obj.getMetricsEndpoint());
        systemApp.setMetricsReportType(obj.getMetricsReportType());
        systemApp.setAppId(obj.getAppId());
        systemApp.setRequestFormat(obj.getRequestFormat());
        SystemServiceEndpoint endpoint = appServiceDao.getEntity(SystemServiceEndpoint.class, obj.getId());
        endpoint.setName(obj.getName());
        endpoint.setCode(obj.getCode());
        endpoint.setValid(obj.getValid());
        endpoint.setVersion(obj.getVersion());
        endpoint.setDescription(obj.getDescription());
        endpoint.setEndpoint(obj.getEndpoint());
        endpoint.setRequesModule(obj.getRequesModule());
        endpoint.setRequestProtocol(obj.getRequestProtocol());
        endpoint.setResponeError(obj.getResponeError());
        endpoint.setResponeResult(obj.getResponeResult());
        endpoint.setRequestMethod(obj.getRequestMethod());
        endpoint.setRequestParameterList(obj.getRequestParameterList());
        endpoint.setHealthEndpoint(obj.getHealthEndpoint());
        endpoint.setHealthReportType(obj.getHealthReportType());
        endpoint.setMetricsEndpoint(obj.getMetricsEndpoint());
        endpoint.setMetricsReportType(obj.getMetricsReportType());
        endpoint.setAppId(obj.getAppId());
        endpoint.setRequestFormat(obj.getRequestFormat());
        this.sendMsg(EndPointConstant.ADD_ENDPOINT, endpoint);
        return Result.success("更新成功");
    }

src/main/resources/application.yml

@@ -49,6 +49,7 @@ spring:
      password: esb
      authenticationDatabase: admin
      gridFsDatabase: dfs
      database: runtime
#  activemq:
#    broker-url: tcp://172.19.103.57:61616?wireFormat.maxInactivityDuration=0
#    user: admin
@@ -58,7 +59,6 @@ spring:
    proxy-target-class: true
hos:
  zbus:
    url: 192.168.131.119:15555
    port: 15555
    store: ./store
  mysql:
@@ -95,6 +95,7 @@ spring:
      password: esb
      authenticationDatabase: admin
      gridFsDatabase: dfs
      database: runtime
#  activemq:
#    broker-url: tcp://172.19.103.57:61616?wireFormat.maxInactivityDuration=0
#    user: admin
@@ -102,6 +103,13 @@ spring:
#    pooled: false
  aop:
    proxy-target-class: true
hos:
  zbus:
    port: 15555
    store: ./store
  mysql:
    filePath: e://learn.sql   #租户基础表 sql文件位置
---
spring:
  #SAAS管理员账号,暂时配置在此处
@@ -135,6 +143,7 @@ spring:
      password: esb
      authenticationDatabase: admin
      gridFsDatabase: dfs
      database: runtime
#  activemq:
#    broker-url: tcp://172.19.103.57:61616?wireFormat.maxInactivityDuration=0
#    user: admin
@@ -144,7 +153,6 @@ spring:
    proxy-target-class: true
hos:
  zbus:
    url: 192.168.131.119:15555
    port: 15555
    store: ./store
  mysql: