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

hos-broker/src/main/java/com/yihu/hos/broker/services/camel/CamelStartBoot.java

@@ -19,7 +19,7 @@ import java.util.concurrent.SynchronousQueue;
 */
@Component
public class CamelStartBoot {
    private static Logger logger = LogManager.getLogger(ESBCamelService.class);
    private static Logger logger = LogManager.getLogger(CamelStartBoot.class);
    private BrokerServerService brokerServerService;

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

@@ -94,42 +94,4 @@ hos:
    user: root
    password: ceshi
---
spring:
  profiles: prod
  activemq:
      broker-url: tcp://activemq:61616
      user: admin
      password: admin
  data:
    mongodb:
      host: mongodb
      port: 27017
      username: esb
      password: esb
      authenticationDatabase: admin
      database: log
      gridFsDatabase: dfs
  camel.gateway:
    ip: localhost
    port: 8066
hos:
  esb:
    rest-url: http://172.17.110.202:8080/esb
  arbiter:
    enable: true
    url: http://arbiter:10135
  rest:
    url: http://rest:8088
  timer:
      period: 10000
  tenant:
    name: jkzl
  mycat:
    path: /opt/mycat/   ##mycat的安装目录
  #jcraft shell操作
  jcraft:
    host: 172.17.110.202
    port: 22
    user: root
    password: ceshi

hos-parent/pom.xml

@@ -113,6 +113,14 @@
        <pluginManagement>
            <plugins>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-war-plugin</artifactId>
                    <version>2.4</version>
                    <configuration>
                        <failOnMissingWebXml>false</failOnMissingWebXml>
                    </configuration>
                </plugin>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-compiler-plugin</artifactId>

pom.xml

@@ -151,6 +151,16 @@
            <artifactId>zbus</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.security</groupId>
            <artifactId>spring-security-web</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-admin-gateway-model</artifactId>
            <version>1.1.2</version>
        </dependency>
        <!-- test start -->
        <dependency>
            <groupId>org.springframework.boot</groupId>

src/main/java/com/yihu/hos/common/CommonPageController.java

@@ -5,7 +5,7 @@ import com.yihu.ehr.agModel.app.AppFeatureModel;
import com.yihu.hos.common.constants.ContextAttributes;
import com.yihu.hos.core.http.HTTPResponse;
import com.yihu.hos.core.http.HttpClientKit;
import com.yihu.hos.remoteManage.service.RemoteShellService;
import com.yihu.hos.remotemanage.service.RemoteShellService;
import com.yihu.hos.system.model.SystemUser;
import com.yihu.hos.tenant.model.TenantSession;
import com.yihu.hos.tenant.service.AuthenticateService;