diff --git a/spring-boot-admin/pom.xml b/spring-boot-admin/pom.xml index 5645785e..68990edf 100644 --- a/spring-boot-admin/pom.xml +++ b/spring-boot-admin/pom.xml @@ -85,6 +85,48 @@ com.jmsoftware.maf spring-cloud-starter + + + org.springframework.boot + spring-boot-starter-data-redis + + + org.springframework.boot + spring-boot-starter-amqp + + + org.springframework.integration + spring-integration-sftp + + + de.codecentric + spring-boot-admin-starter-client + + + com.baomidou + mybatis-plus-boot-starter + + + com.baomidou + dynamic-datasource-spring-boot-starter + + + mysql + mysql-connector-java + + + com.alibaba + druid-spring-boot-starter + + + org.apache.poi + poi + + + org.apache.poi + poi-ooxml + + diff --git a/spring-boot-admin/src/main/resources/application-development-docker.yml b/spring-boot-admin/src/main/resources/application-development-docker.yml index d19ec0bd..1717113c 100644 --- a/spring-boot-admin/src/main/resources/application-development-docker.yml +++ b/spring-boot-admin/src/main/resources/application-development-docker.yml @@ -3,19 +3,6 @@ spring: add-properties: true zipkin: base-url: http://maf-zipkin-development-docker:9411 - datasource: - url: jdbc:mysql://maf-mysql-server-master-development-docker:3306/muscle_and_fitness?useSSL=true&useUnicode=true - username: maf_mysql_rw - password: maf@mysql - redis: - host: maf-redis-development-docker - port: 6379 - password: maf@redis - rabbitmq: - host: maf-rabbitmq-development-docker - port: 5672 - username: maf_rabbitmq_su - password: maf@rabbitmq maf: configuration: diff --git a/spring-boot-admin/src/main/resources/application-development-local.yml b/spring-boot-admin/src/main/resources/application-development-local.yml index 787df80f..29c613f3 100644 --- a/spring-boot-admin/src/main/resources/application-development-local.yml +++ b/spring-boot-admin/src/main/resources/application-development-local.yml @@ -3,19 +3,6 @@ spring: add-properties: true zipkin: base-url: http://localhost:9411 - datasource: - url: jdbc:mysql://localhost:3306/muscle_and_fitness?useSSL=true&useUnicode=true - username: maf_mysql_rw - password: maf@mysql - redis: - host: localhost - port: 6379 - password: maf@redis - rabbitmq: - host: localhost - port: 5672 - username: maf_rabbitmq_su - password: maf@rabbitmq maf: configuration: diff --git a/spring-boot-admin/src/main/resources/application-production.yml b/spring-boot-admin/src/main/resources/application-production.yml index 2b594ddc..393995e2 100644 --- a/spring-boot-admin/src/main/resources/application-production.yml +++ b/spring-boot-admin/src/main/resources/application-production.yml @@ -3,19 +3,6 @@ spring: add-properties: false zipkin: base-url: http://maf-zipkin-production:9411 - datasource: - url: jdbc:mysql://maf-mysql-server-master-production:3306/muscle_and_fitness?useSSL=true&useUnicode=true - username: maf_mysql_rw - password: maf@mysql - redis: - host: maf-redis-production - port: 6379 - password: maf@redis - rabbitmq: - host: maf-rabbitmq-production - port: 5672 - username: maf_rabbitmq_su - password: maf@rabbitmq maf: configuration: diff --git a/spring-boot-admin/src/main/resources/application-stage.yml b/spring-boot-admin/src/main/resources/application-stage.yml index 38349997..05e461ba 100644 --- a/spring-boot-admin/src/main/resources/application-stage.yml +++ b/spring-boot-admin/src/main/resources/application-stage.yml @@ -3,19 +3,6 @@ spring: add-properties: false zipkin: base-url: http://maf-zipkin-stage:9411 - datasource: - url: jdbc:mysql://maf-mysql-server-master-stage:3306/muscle_and_fitness?useSSL=true&useUnicode=true - username: maf_mysql_rw - password: maf@mysql - redis: - host: maf-redis-stage - port: 6379 - password: maf@redis - rabbitmq: - host: maf-rabbitmq-stage - port: 5672 - username: maf_rabbitmq_su - password: maf@rabbitmq maf: configuration: diff --git a/spring-boot-admin/src/main/resources/application-test.yml b/spring-boot-admin/src/main/resources/application-test.yml index b38aca99..07a7e92b 100644 --- a/spring-boot-admin/src/main/resources/application-test.yml +++ b/spring-boot-admin/src/main/resources/application-test.yml @@ -3,19 +3,6 @@ spring: add-properties: false zipkin: base-url: http://maf-zipkin-test:9411 - datasource: - url: jdbc:mysql://maf-mysql-server-master-test:3306/muscle_and_fitness?useSSL=true&useUnicode=true - username: maf_mysql_rw - password: maf@mysql - redis: - host: maf-redis-test - port: 6379 - password: maf@redis - rabbitmq: - host: maf-rabbitmq-test - port: 5672 - username: maf_rabbitmq_su - password: maf@rabbitmq maf: configuration: diff --git a/spring-boot-admin/src/main/resources/application.yml b/spring-boot-admin/src/main/resources/application.yml index cabecbad..76717b92 100644 --- a/spring-boot-admin/src/main/resources/application.yml +++ b/spring-boot-admin/src/main/resources/application.yml @@ -34,61 +34,6 @@ spring: prefer-ip-address: true ip-address: ${spring.cloud.client.ip-address} health-check-critical-timeout: 15s - datasource: - name: muscle_and_fitness - type: com.alibaba.druid.pool.DruidDataSource - druid: - driver-class-name: com.mysql.cj.jdbc.Driver - initial-size: 5 - minIdle: 10 - max-active: 20 - max-wait: 60000 - min-evictable-idle-time-millis: 600000 - max-evictable-idle-time-millis: 900000 - validation-query: SELECT 1 - test-while-idle: true - test-on-borrow: false - test-on-return: false - pool-prepared-statements: true - max-open-prepared-statements: 20 - keep-alive: true - filters: stat,wall,log4j2 - filter: - stat: - enabled: true - db-type: mysql - log-slow-sql: true - slow-sql-millis: 2000 - slf4j: - enabled: true - statement-log-error-enabled: true - statement-create-after-log-enabled: false - statement-close-after-log-enabled: false - result-set-open-after-log-enabled: false - result-set-close-after-log-enabled: false - web-stat-filter: - enabled: true - url-pattern: /* - exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*" - session-stat-enable: true - session-stat-max-count: 1000 - stat-view-servlet: - enabled: true - url-pattern: /druid/* - reset-enable: false - login-username: root - login-password: maf_druid_password - allow: - redis: - database: 0 - timeout: 10000ms - client-type: LETTUCE - lettuce: - pool: - max-active: 20 - max-idle: 10 - max-wait: -1ms - min-idle: 0 management: endpoints: