From e6c71612aac59c0827c954ea9ba6e6396bb353a1 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Wed, 14 Jun 2023 11:41:01 +0800
Subject: [PATCH] [Octopus] modify project to SpringBoot version ok

---
 server/src/main/resources/application.yml       | 16 ++++++++--------
 .../{bootstrap.yml => bootstrap.yml-back}       |  0
 .../source/octopus/run-enviroment-compose.yaml  |  4 ++--
 .../wdd/source/octopus/simple-middleware.yaml   | 17 +++++++++++++++++
 4 files changed, 27 insertions(+), 10 deletions(-)
 rename server/src/main/resources/{bootstrap.yml => bootstrap.yml-back} (100%)

diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index ce2cee7..e1c8ba9 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -6,10 +6,10 @@ spring:
     allow-circular-references: true
     allow-bean-definition-overriding: true
   rabbitmq:
-    host: 150.230.198.103
+    host: 42.192.52.227
     port: 20672
     username: boge
-    password: boge14@Level5
+    password: boge8tingH
     virtual-host: /
     listener:
       simple:
@@ -21,10 +21,10 @@ spring:
           max-interval: 65000
           initial-interval: 65000
   redis:
-    host: 146.56.147.12
+    host: 42.192.52.227
     port: 21370
     database: 0
-    password: boge14@Level5
+    password: boge8tingH
       # cluster:
       #   nodes:
       #     - 43.154.83.213:21370
@@ -34,7 +34,7 @@ spring:
       #     - 43.154.83.213:21374
       #     - 43.154.83.213:21375
       # # 获取失败 最大重定向次数
-      # max-redirects: 3
+    # max-redirects: 3
     # timeout: 50000
     #如果用以前的jedis，可以把下面的lettuce换成jedis即可
     lettuce:
@@ -50,9 +50,9 @@ spring:
         time-between-eviction-runs: 50000
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://140.238.63.37:21306/wdd_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
-    username: root
-    password: boge14@Level5
+    url: jdbc:mysql://42.192.52.227:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+    username: boge
+    password: boge8tingH
     type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 3
diff --git a/server/src/main/resources/bootstrap.yml b/server/src/main/resources/bootstrap.yml-back
similarity index 100%
rename from server/src/main/resources/bootstrap.yml
rename to server/src/main/resources/bootstrap.yml-back
diff --git a/source/src/main/java/io/wdd/source/octopus/run-enviroment-compose.yaml b/source/src/main/java/io/wdd/source/octopus/run-enviroment-compose.yaml
index 107a94e..2bb7487 100644
--- a/source/src/main/java/io/wdd/source/octopus/run-enviroment-compose.yaml
+++ b/source/src/main/java/io/wdd/source/octopus/run-enviroment-compose.yaml
@@ -24,13 +24,13 @@ services:
       interval: 15s
       timeout: 5s
       retries: 6
-  redis-master:
+  redis:
     # https://hub.docker.com/r/bitnami/redis
     image: bitnami/redis:6.2.11-debian-11-r1
     networks:
       - app-tier
     environment:
-      - REDIS_PASSWORD=Superwmm.23
+      - REDIS_PASSWORD=boge8tingH
       # Redis 6.0 features a new multi-threading model
       - REDIS_IO_THREADS=4
       - REDIS_IO_THREADS_DO_READS=yes
diff --git a/source/src/main/java/io/wdd/source/octopus/simple-middleware.yaml b/source/src/main/java/io/wdd/source/octopus/simple-middleware.yaml
index 8934227..8b422b4 100644
--- a/source/src/main/java/io/wdd/source/octopus/simple-middleware.yaml
+++ b/source/src/main/java/io/wdd/source/octopus/simple-middleware.yaml
@@ -46,6 +46,23 @@ services:
       - RABBITMQ_MANAGEMENT_PORT_NUMBER=15672
     volumes:
       - 'rabbitmq_data:/bitnami/rabbitmq/mnesia'
+  redis:
+    # https://hub.docker.com/r/bitnami/redis
+    image: bitnami/redis:6.2.11-debian-11-r1
+    networks:
+      - app-tier
+    environment:
+      - REDIS_PASSWORD=boge8tingH
+      # Redis 6.0 features a new multi-threading model
+      - REDIS_IO_THREADS=4
+      - REDIS_IO_THREADS_DO_READS=yes
+      - REDIS_PORT_NUMBER=6379
+      - REDIS_REPLICATION_MODE=master
+      #- REDIS_DISABLE_COMMANDS=FLUSHDB,FLUSHALL
+    ports:
+      - '21370:6379'
+    volumes:
+      - 'redis_data:/bitnami/redis/data'
 
 volumes:
   mysql_data: