From 9306f6dbe4e01efda3ad060e88019766b4aeb38e Mon Sep 17 00:00:00 2001
From: yeungchihang <842328916@qq.com>
Date: Fri, 6 Jan 2023 20:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96-=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7quartz=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accompany-business-service/pom.xml        | 13 ++++----
 .../src/main/resources/application-native.yml | 16 ----------
 .../accompany-oauth2-service/pom.xml          |  5 ----
 .../oauth2/config/DataSourceConfig.java       | 30 -------------------
 .../src/main/resources/application-native.yml | 16 ----------
 .../accompany-scheduler-service/pom.xml       | 14 ---------
 .../src/main/resources/application-native.yml | 22 ++------------
 accompany-scheduler/pom.xml                   | 11 -------
 8 files changed, 8 insertions(+), 119 deletions(-)
 delete mode 100644 accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/config/DataSourceConfig.java

diff --git a/accompany-business/accompany-business-service/pom.xml b/accompany-business/accompany-business-service/pom.xml
index cec654464..126402ae1 100644
--- a/accompany-business/accompany-business-service/pom.xml
+++ b/accompany-business/accompany-business-service/pom.xml
@@ -30,30 +30,27 @@
             <artifactId>accompany-payment</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>com.accompany</groupId>
-            <artifactId>accompany-business-world</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.accompany</groupId>
             <artifactId>accompany-sharding</artifactId>
             <version>${revision}</version>
         </dependency>
-
         <dependency>
             <groupId>com.accompany</groupId>
             <artifactId>accompany-sms</artifactId>
             <version>${revision}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.accompany</groupId>
+            <artifactId>accompany-business-world</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <dependency>
             <groupId>com.accompany</groupId>
             <artifactId>accompany-business-community</artifactId>
             <version>${revision}</version>
         </dependency>
-
         <dependency>
             <groupId>com.accompany</groupId>
             <artifactId>xuanyin-game-match</artifactId>
diff --git a/accompany-business/accompany-business-web/src/main/resources/application-native.yml b/accompany-business/accompany-business-web/src/main/resources/application-native.yml
index fa4922e04..066d2a446 100644
--- a/accompany-business/accompany-business-web/src/main/resources/application-native.yml
+++ b/accompany-business/accompany-business-web/src/main/resources/application-native.yml
@@ -5,22 +5,6 @@ spring:
     username: root
     password: anan@dev##
     driver-class-name: com.mysql.cj.jdbc.Driver
-    druid:
-      initial-size: 5
-      max-active: 120
-      min-idle: 5
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      pool-prepared-statements: true
-      max-pool-prepared-statement-per-connection-size: 50
-      filters: stat,wall
-      connection-properties=druid.stat.mergeSql: true;druid.stat.slowSqlMillis=500
-      use-global-data-source-stat: true
     hikari:
       minimum-idle: 10
       maximum-pool-size: 20
diff --git a/accompany-oauth2/accompany-oauth2-service/pom.xml b/accompany-oauth2/accompany-oauth2-service/pom.xml
index 5e8aba68f..68e67b635 100644
--- a/accompany-oauth2/accompany-oauth2-service/pom.xml
+++ b/accompany-oauth2/accompany-oauth2-service/pom.xml
@@ -42,11 +42,6 @@
             <artifactId>spring-security-oauth2-autoconfigure</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.2.14</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-spring</artifactId>
diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/config/DataSourceConfig.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/config/DataSourceConfig.java
deleted file mode 100644
index 49a61f7f3..000000000
--- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/config/DataSourceConfig.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.accompany.oauth2.config;
-
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-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.stereotype.Component;
-
-import javax.sql.DataSource;
-
-/**
- * @Author yubin
- * @Description //TODO
- * @Date 2019-04-02 14:08
- */
-@Configuration
-@Component
-public class DataSourceConfig {
-
-    @ConfigurationProperties(prefix = "spring.datasource")
-    @Primary
-    @Bean(name = "dataSource")
-    public DataSource getDataSource() {
-        return DruidDataSourceBuilder
-                .create()
-                .build();
-
-    }
-}
diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/resources/application-native.yml b/accompany-oauth2/accompany-oauth2-web/src/main/resources/application-native.yml
index dd40fd5cc..4527837b2 100644
--- a/accompany-oauth2/accompany-oauth2-web/src/main/resources/application-native.yml
+++ b/accompany-oauth2/accompany-oauth2-web/src/main/resources/application-native.yml
@@ -5,22 +5,6 @@ spring:
     username: root
     password: anan@dev##
     driver-class-name: com.mysql.cj.jdbc.Driver
-    druid:
-      initial-size: 5
-      max-active: 120
-      min-idle: 5
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      pool-prepared-statements: true
-      max-pool-prepared-statement-per-connection-size: 50
-      filters: stat,wall
-      connection-properties=druid.stat.mergeSql: true;druid.stat.slowSqlMillis=500
-      use-global-data-source-stat: true
     hikari:
       minimum-idle: 10
       maximum-pool-size: 20
diff --git a/accompany-scheduler/accompany-scheduler-service/pom.xml b/accompany-scheduler/accompany-scheduler-service/pom.xml
index 0d07a1e54..b163fa6de 100644
--- a/accompany-scheduler/accompany-scheduler-service/pom.xml
+++ b/accompany-scheduler/accompany-scheduler-service/pom.xml
@@ -18,23 +18,9 @@
             <artifactId>accompany-business-service</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.1.20</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>sharding-jdbc-core</artifactId>
-            <version>4.0.0-RC2</version>
-        </dependency>
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson-spring-data-20</artifactId>
-        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/resources/application-native.yml b/accompany-scheduler/accompany-scheduler-web/src/main/resources/application-native.yml
index dd40fd5cc..298f82e43 100644
--- a/accompany-scheduler/accompany-scheduler-web/src/main/resources/application-native.yml
+++ b/accompany-scheduler/accompany-scheduler-web/src/main/resources/application-native.yml
@@ -5,22 +5,6 @@ spring:
     username: root
     password: anan@dev##
     driver-class-name: com.mysql.cj.jdbc.Driver
-    druid:
-      initial-size: 5
-      max-active: 120
-      min-idle: 5
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      pool-prepared-statements: true
-      max-pool-prepared-statement-per-connection-size: 50
-      filters: stat,wall
-      connection-properties=druid.stat.mergeSql: true;druid.stat.slowSqlMillis=500
-      use-global-data-source-stat: true
     hikari:
       minimum-idle: 10
       maximum-pool-size: 20
@@ -50,10 +34,10 @@ spring:
         singleServerConfig:
           address: redis://118.194.255.128:6200
           password: anan@dev@redis@#!
-          connectionMinimumIdleSize: 8
+          connectionMinimumIdleSize: 4
           timeout: 10000
-        threads: 16
-        nettyThreads: 32
+        threads: 8
+        nettyThreads: 16
         codec: !<org.redisson.codec.JsonJacksonCodec> {}
         transportMode: "NIO"
 
diff --git a/accompany-scheduler/pom.xml b/accompany-scheduler/pom.xml
index 36f8b7347..c7f55b8f2 100644
--- a/accompany-scheduler/pom.xml
+++ b/accompany-scheduler/pom.xml
@@ -29,17 +29,6 @@
             <version>${revision}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.zaxxer</groupId>
-                    <artifactId>HikariCP-java6</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-quartz</artifactId>