代码优化-升级quartz版本
This commit is contained in:
@@ -30,30 +30,27 @@
|
|||||||
<artifactId>accompany-payment</artifactId>
|
<artifactId>accompany-payment</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>com.accompany</groupId>
|
|
||||||
<artifactId>accompany-business-world</artifactId>
|
|
||||||
<version>${revision}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.accompany</groupId>
|
<groupId>com.accompany</groupId>
|
||||||
<artifactId>accompany-sharding</artifactId>
|
<artifactId>accompany-sharding</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.accompany</groupId>
|
<groupId>com.accompany</groupId>
|
||||||
<artifactId>accompany-sms</artifactId>
|
<artifactId>accompany-sms</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.accompany</groupId>
|
||||||
|
<artifactId>accompany-business-world</artifactId>
|
||||||
|
<version>${revision}</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.accompany</groupId>
|
<groupId>com.accompany</groupId>
|
||||||
<artifactId>accompany-business-community</artifactId>
|
<artifactId>accompany-business-community</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.accompany</groupId>
|
<groupId>com.accompany</groupId>
|
||||||
<artifactId>xuanyin-game-match</artifactId>
|
<artifactId>xuanyin-game-match</artifactId>
|
||||||
|
@@ -5,22 +5,6 @@ spring:
|
|||||||
username: root
|
username: root
|
||||||
password: anan@dev##
|
password: anan@dev##
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
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:
|
hikari:
|
||||||
minimum-idle: 10
|
minimum-idle: 10
|
||||||
maximum-pool-size: 20
|
maximum-pool-size: 20
|
||||||
|
@@ -42,11 +42,6 @@
|
|||||||
<artifactId>spring-security-oauth2-autoconfigure</artifactId>
|
<artifactId>spring-security-oauth2-autoconfigure</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.alibaba</groupId>
|
|
||||||
<artifactId>druid-spring-boot-starter</artifactId>
|
|
||||||
<version>1.2.14</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.activemq</groupId>
|
<groupId>org.apache.activemq</groupId>
|
||||||
<artifactId>activemq-spring</artifactId>
|
<artifactId>activemq-spring</artifactId>
|
||||||
|
@@ -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();
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
@@ -5,22 +5,6 @@ spring:
|
|||||||
username: root
|
username: root
|
||||||
password: anan@dev##
|
password: anan@dev##
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
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:
|
hikari:
|
||||||
minimum-idle: 10
|
minimum-idle: 10
|
||||||
maximum-pool-size: 20
|
maximum-pool-size: 20
|
||||||
|
@@ -18,23 +18,9 @@
|
|||||||
<artifactId>accompany-business-service</artifactId>
|
<artifactId>accompany-business-service</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</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>
|
<dependency>
|
||||||
<groupId>org.redisson</groupId>
|
<groupId>org.redisson</groupId>
|
||||||
<artifactId>redisson-spring-boot-starter</artifactId>
|
<artifactId>redisson-spring-boot-starter</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.redisson</groupId>
|
|
||||||
<artifactId>redisson-spring-data-20</artifactId>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
@@ -5,22 +5,6 @@ spring:
|
|||||||
username: root
|
username: root
|
||||||
password: anan@dev##
|
password: anan@dev##
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
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:
|
hikari:
|
||||||
minimum-idle: 10
|
minimum-idle: 10
|
||||||
maximum-pool-size: 20
|
maximum-pool-size: 20
|
||||||
@@ -50,10 +34,10 @@ spring:
|
|||||||
singleServerConfig:
|
singleServerConfig:
|
||||||
address: redis://118.194.255.128:6200
|
address: redis://118.194.255.128:6200
|
||||||
password: anan@dev@redis@#!
|
password: anan@dev@redis@#!
|
||||||
connectionMinimumIdleSize: 8
|
connectionMinimumIdleSize: 4
|
||||||
timeout: 10000
|
timeout: 10000
|
||||||
threads: 16
|
threads: 8
|
||||||
nettyThreads: 32
|
nettyThreads: 16
|
||||||
codec: !<org.redisson.codec.JsonJacksonCodec> {}
|
codec: !<org.redisson.codec.JsonJacksonCodec> {}
|
||||||
transportMode: "NIO"
|
transportMode: "NIO"
|
||||||
|
|
||||||
|
@@ -29,17 +29,6 @@
|
|||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.quartz-scheduler</groupId>
|
|
||||||
<artifactId>quartz</artifactId>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>com.zaxxer</groupId>
|
|
||||||
<artifactId>HikariCP-java6</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-quartz</artifactId>
|
<artifactId>spring-boot-starter-quartz</artifactId>
|
||||||
|
Reference in New Issue
Block a user