发布配置修改，部分非profile文件暂不上传

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

@@ -33,14 +33,14 @@ spring:
  profiles: test
  data:
    mongodb:
      host: 172.19.103.57
      host: mongodb
      port: 27017
      username: esb
      password: esb
      authenticationDatabase: admin
      database: runtime
  activemq:
    broker-url: tcp://172.19.103.57:61616
    broker-url: tcp://activemq:61616
    user: admin
    password: admin
arbiter:
@@ -48,12 +48,14 @@ arbiter:
    period: 10000
  central:
    url:
    port: 15555
    store: ./store
  terminal:
    url: 192.168.131.119:15555
    url: 172.19.103.70:15555
  tenant:
    name: jkzl
  mycat:
    name: mycat192.168.75.128    ##mycat 服务器标识，规则：“mycat"+ 本机IP
    name: mycat172.19.103.67    ##mycat 服务器标识，规则：“mycat"+ 本机IP
---
spring:
  profiles: prod

hos-broker/src/main/java/com/yihu/hos/broker/controllers/ESBCamelController.java

@@ -21,8 +21,8 @@ public class ESBCamelController {
    @RequestMapping(value = "/heartbeat", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ApiOperation(value = "测试服务器可以正常连接", produces = "application/json", notes = "测试服务器可以正常连接")
    public void heartbeat() {
//        System.out.println("test");
    public String heartbeat() {
        return "test";
    }
    @RequestMapping(value = "/serviceFlow", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)

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

@@ -70,26 +70,26 @@ hos:
---
spring:
  profiles: test
#  datasource:
#      driverClassName: com.mysql.jdbc.Driver
#      url: jdbc:mysql://192.168.1.220:8066/hos1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
#      username: hos
#      password: 123456
#      test-on-borrow: true
#      validation-query: SELECT 1
#      test-while-idle: true
#      max-active: 30
#      default-auto-commit: true
#      max-idle: 30
#      min-idle: 10
#      initial-size: 10
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    url: jdbc:mysql://mysql:3306/hos1?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
    username: hos
    password: 123456
    test-on-borrow: true
    validation-query: SELECT 1
    test-while-idle: true
    max-active: 30
    default-auto-commit: true
    max-idle: 30
    min-idle: 10
    initial-size: 10
  activemq:
      broker-url: tcp://172.19.103.58:61616
      broker-url: tcp://activemq:61616
      user: admin
      password: admin
  data:
    mongodb:
      host: 172.19.103.57
      host: mongodb
      port: 27017
      username: esb
      password: esb
@@ -101,15 +101,24 @@ spring:
    port: 8066
hos:
  esb:
    rest-url: http://192.168.131.119:8080/esb
    rest-url: http://172.19.103.67:8080/esb
  arbiter:
    enable: false
    url: http://172.19.103.57:10135
    enable: true
    url: http://arbiter:10135
  rest:
    url: http://localhost:8088
    url: http://rest:8088
  timer:
      period: 10000
  tenant:
    name: jkzl
  mycat:
    path: /usr/local/mycat/   ##mycat的安装目录
  #jcraft shell操作
  jcraft:
    host: 172.19.103.67
    port: 22
    user: root
    password: ceshi
---
spring:
  profiles: lfq

hos-rest/src/main/java/com/yihu/hos/rest/controllers/CrawlerController.java

@@ -45,6 +45,11 @@ public class CrawlerController {
    @Resource(name = AdapterSchemeService.BEAN_ID)
    private AdapterSchemeService adapterSchemeService;
    @RequestMapping(value = "/test", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ApiOperation(value = "测试服务器可以正常连接", produces = "application/json", notes = "测试服务器可以正常连接")
    public String test() {
        return "test";
    }
    /**
    任务编排
    */

hos-web-framework-dependencies/pom.xml

@@ -60,12 +60,6 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-starter-logging</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>

src/main/resources/application.yml

@@ -67,10 +67,11 @@ hos:
---
spring:
  profiles: test
  administrators: jkzl
  #SAAS管理员账号,暂时配置在此处
  datasource:
      driverClassName: com.mysql.jdbc.Driver
      url: jdbc:mysql://192.168.1.220:8066/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      url: jdbc:mysql://mysql:3306/global_db?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
      username: hos
      password: 123456
      test-on-borrow: true
@@ -89,26 +90,26 @@ spring:
    show-sql: false
  data:
    mongodb:
      host: 172.19.103.57
      host: mongodb
      port: 27017
      username: esb
      password: esb
      authenticationDatabase: admin
      gridFsDatabase: dfs
      database: runtime
#  activemq:
#    broker-url: tcp://172.19.103.57:61616?wireFormat.maxInactivityDuration=0
#    user: admin
#    password: admin
#    pooled: false
  activemq:
    broker-url: tcp://activemq:61616?wireFormat.maxInactivityDuration=0
    user: admin
    password: admin
    pooled: false
  aop:
    proxy-target-class: true
hos:
  zbus:
    url: 172.19.103.67:15555
    port: 15555
    store: ./store
  mysql:
    filePath: e://learn.sql   #租户基础表 sql文件位置
    filePath: /usr/local/esb/esb.sql   #租户基础表 sql文件位置
---
spring: