feat($Starter): integrate RabbitMQ

[skip ci]
johnnymillergh · Mar 9, 2021 · 9022f77 · 9022f77
1 parent 414880d
commit 9022f77
Show file tree

Hide file tree

Showing 35 changed files with 174 additions and 33 deletions.
diff --git a/api-gateway/src/main/resources/application-development-docker.yml b/api-gateway/src/main/resources/application-development-docker.yml
@@ -6,4 +6,4 @@ spring:
   redis:
     host: maf.redis.development-docker
     port: 6379
-    password: 123456
+    password: maf@redis
diff --git a/api-gateway/src/main/resources/application-development-local.yml b/api-gateway/src/main/resources/application-development-local.yml
@@ -6,4 +6,4 @@ spring:
   redis:
     host: localhost
     port: 6379
-    password: 123456
+    password: maf@redis
diff --git a/api-gateway/src/main/resources/application-production.yml b/api-gateway/src/main/resources/application-production.yml
@@ -6,4 +6,4 @@ spring:
   redis:
     host: maf.redis.production
     port: 6379
-    password: 123456
+    password: maf@redis
diff --git a/api-gateway/src/main/resources/application-stage.yml b/api-gateway/src/main/resources/application-stage.yml
@@ -6,4 +6,4 @@ spring:
   redis:
     host: maf.redis.stage
     port: 6379
-    password: 123456
+    password: maf@redis
diff --git a/api-gateway/src/main/resources/application-test.yml b/api-gateway/src/main/resources/application-test.yml
@@ -6,4 +6,4 @@ spring:
   redis:
     host: maf.redis.test
     port: 6379
-    password: 123456
+    password: maf@redis
diff --git a/auth-center/src/main/resources/application-development-docker.yml b/auth-center/src/main/resources/application-development-docker.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.development-docker
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.development-docker
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/auth-center/src/main/resources/application-development-local.yml b/auth-center/src/main/resources/application-development-local.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: localhost
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: localhost
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 logging:
   # Configure logging level for SFTP/JSCH

diff --git a/auth-center/src/main/resources/application-production.yml b/auth-center/src/main/resources/application-production.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.production
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.production
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/auth-center/src/main/resources/application-stage.yml b/auth-center/src/main/resources/application-stage.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.stage
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.stage
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/auth-center/src/main/resources/application-test.yml b/auth-center/src/main/resources/application-test.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.test
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.test
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/auth-center/src/main/resources/application.yml b/auth-center/src/main/resources/application.yml
@@ -82,7 +82,7 @@ spring:
         url-pattern: /druid/*
         reset-enable: false
         login-username: root
-        login-password: 123456
+        login-password: maf_druid_password
         allow:
   redis:
     database: 0

diff --git a/docker/.env b/docker/.env
@@ -64,3 +64,5 @@ MAF_MYSQL_USER=maf_mysql_rw
 MAF_MYSQL_PASSWORD=maf@mysql
 MAF_ELASTICSEARCH_PASSWORD=maf@elasticsearch
 MAF_TIMEZONE=Asia/Hong_Kong
+MAF_RABBITMQ_USER=maf_rabbitmq_su
+MAF_RABBITMQ_PASSWORD=maf@rabbitmq
diff --git a/docker/config/redis/redis.conf b/docker/config/redis/redis.conf
@@ -787,7 +787,7 @@ acllog-max-len 128
 # AUTH <password> as usually, or more explicitly with AUTH default <password>
 # if they follow the new protocol: both will work.
 #
-requirepass 123456
+requirepass maf@redis
 
 # Command renaming (DEPRECATED).
 #

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -67,8 +67,8 @@ services:
       - ./plugin/rabbitmq/rabbitmq_delayed_message_exchange-3.8.9-0199d11c.ez:/plugins/rabbitmq_delayed_message_exchange-3.8.9-0199d11c.ez
       - ./plugin/rabbitmq/enabled_plugins:/etc/rabbitmq/enabled_plugins
     environment:
-      RABBITMQ_DEFAULT_USER: rabbitmq_su
-      RABBITMQ_DEFAULT_PASS: rabbitmq_password
+      RABBITMQ_DEFAULT_USER: ${MAF_RABBITMQ_USER}
+      RABBITMQ_DEFAULT_PASS: ${MAF_RABBITMQ_PASSWORD}
     networks:
       muscle_and_fitness_network:
 

diff --git a/exercise-mis/src/main/resources/application-development-docker.yml b/exercise-mis/src/main/resources/application-development-docker.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.development-docker
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.development-docker
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/exercise-mis/src/main/resources/application-development-local.yml b/exercise-mis/src/main/resources/application-development-local.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: localhost
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: localhost
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/exercise-mis/src/main/resources/application-production.yml b/exercise-mis/src/main/resources/application-production.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.production
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.production
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/exercise-mis/src/main/resources/application-stage.yml b/exercise-mis/src/main/resources/application-stage.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.stage
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.stage
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/exercise-mis/src/main/resources/application-test.yml b/exercise-mis/src/main/resources/application-test.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.test
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.test
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/exercise-mis/src/main/resources/application.yml b/exercise-mis/src/main/resources/application.yml
@@ -84,7 +84,7 @@ spring:
         url-pattern: /druid/*
         reset-enable: false
         login-username: root
-        login-password: 123456
+        login-password: maf_druid_password
         allow:
   redis:
     database: 0

diff --git a/muscle-mis/src/main/resources/application-development-docker.yml b/muscle-mis/src/main/resources/application-development-docker.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.development-docker
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.development-docker
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/muscle-mis/src/main/resources/application-development-local.yml b/muscle-mis/src/main/resources/application-development-local.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: localhost
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: localhost
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 logging:
   level:

diff --git a/muscle-mis/src/main/resources/application-production.yml b/muscle-mis/src/main/resources/application-production.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.production
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.production
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/muscle-mis/src/main/resources/application-stage.yml b/muscle-mis/src/main/resources/application-stage.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.stage
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.stage
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/muscle-mis/src/main/resources/application-test.yml b/muscle-mis/src/main/resources/application-test.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.test
     port: 6379
-    password: 123456
+    password: maf@redis
+  rabbitmq:
+    host: maf.rabbitmq.test
+    port: 5672
+    username: maf_rabbitmq_su
+    password: maf@rabbitmq
 
 sftp:
   client:

diff --git a/muscle-mis/src/main/resources/application.yml b/muscle-mis/src/main/resources/application.yml
@@ -72,7 +72,7 @@ spring:
         url-pattern: /druid/*
         reset-enable: false
         login-username: root
-        login-password: 123456
+        login-password: maf_druid_password
         allow:
   redis:
     database: 0

diff --git a/spring-boot-admin/src/main/resources/application-development-docker.yml b/spring-boot-admin/src/main/resources/application-development-docker.yml
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.development-docker
     port: 6379
-    password: 123456
+    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
@@ -10,7 +10,12 @@ spring:
   redis:
     host: localhost
     port: 6379
-    password: 123456
+    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
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.production
     port: 6379
-    password: 123456
+    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
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.stage
     port: 6379
-    password: 123456
+    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
@@ -10,7 +10,12 @@ spring:
   redis:
     host: maf.redis.test
     port: 6379
-    password: 123456
+    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
@@ -77,7 +77,7 @@ spring:
         url-pattern: /druid/*
         reset-enable: false
         login-username: root
-        login-password: 123456
+        login-password: maf_druid_password
         allow:
   redis:
     database: 0

diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml
@@ -41,6 +41,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.amqp</groupId>
+            <artifactId>spring-rabbit-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>

diff --git a/...oud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/MafAutoConfiguration.java b/...oud-starter/src/main/java/com/jmsoftware/maf/springcloudstarter/MafAutoConfiguration.java
@@ -55,7 +55,8 @@
         SftpConfiguration.class,
         WebSecurityConfiguration.class,
         RestTemplateConfiguration.class,
-        AsyncConfiguration.class
+        AsyncConfiguration.class,
+        RabbitmqConfiguration.class
 })
 public class MafAutoConfiguration {
     @PostConstruct