From 8ef2c2d1dc5f0a4ac727fe98cbb222bdc3cd56ae Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Fri, 4 Aug 2023 15:52:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/master/docker-compose.yaml                    |  2 ++
 .../java/cn/lihongjie/coal/config/DruidConfig.java   | 12 +++---------
 ...{application-dev.yaml => application-master.yaml} |  0
 3 files changed, 5 insertions(+), 9 deletions(-)
 rename src/main/resources/{application-dev.yaml => application-master.yaml} (100%)

diff --git a/docker/master/docker-compose.yaml b/docker/master/docker-compose.yaml
index f783c327..a2b76372 100644
--- a/docker/master/docker-compose.yaml
+++ b/docker/master/docker-compose.yaml
@@ -37,6 +37,8 @@ services:
       - spring_data:/data
     ports:
       - "7456:7456"
+    command:
+      - --spring.profiles.active=master
 
 networks:
   dn:
diff --git a/src/main/java/cn/lihongjie/coal/config/DruidConfig.java b/src/main/java/cn/lihongjie/coal/config/DruidConfig.java
index 89e16d8d..78927fb7 100644
--- a/src/main/java/cn/lihongjie/coal/config/DruidConfig.java
+++ b/src/main/java/cn/lihongjie/coal/config/DruidConfig.java
@@ -2,13 +2,12 @@ package cn.lihongjie.coal.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.p6spy.engine.spy.P6DataSource;
-import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;
 
 import javax.sql.DataSource;
@@ -29,18 +28,13 @@ public class DruidConfig {
 
     @Bean
     @Primary
+    @Profile({"dev", "master"})
     public DataSource p6DataSource() {
 
-        DataSource dataSource = druidDataSource();
 
-        if (ArrayUtils.contains(environment.getActiveProfiles(), "dev")) {
+        return new P6DataSource(druidDataSource());
 
 
-            return new P6DataSource(dataSource);
-        } else {
-            return dataSource;
-        }
-
     }
 
 
diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-master.yaml
similarity index 100%
rename from src/main/resources/application-dev.yaml
rename to src/main/resources/application-master.yaml