From 8cabbe6b122075dddb8092716900c08dd7b9e4c6 Mon Sep 17 00:00:00 2001 From: liuxuewen Date: Wed, 24 Mar 2021 15:21:35 +0800 Subject: [PATCH] change MongoClientInit and fix some bug. --- .../1195786afcb95315b3ec156ea91e7166c2c2cf10 | 0 .../14399913ca07717830f9b08ee87644884fc2959a | 0 .../157e0e9285b69e300624f35e79300c0ed6098936 | 0 .../1759e0760a24aae1fd0b2b5d7d8622112c621b0e | 0 .../19affac2f7e5749f37c36532ef281eec1befbd05 | 0 .../1c4b500508bae883bea47d0637c267e8c57d7580 | 0 .../21fd7f9a07ee140f9ce9ae11bbe161bdd456cbc8 | 0 .../2b5e0787fcb106c7e2c215b9201949810fe97d18 | 0 .../416390ba57649e9f4e6365934e9a6827cca3ffed | 0 .../490c965ee8a02ce158895987485283bb4b666ab6 | 0 .../4a24c23f6158d7abc5657040e232691adcee44ac | 0 .../4ffd3a6de814df96de78c74e6c16f964b4fe9a03 | 0 .../644b718a1d63acca44c411c399624e16ce98e11c | 0 .../65fb0f3f093182fd2ca42f4eb1116d36adc8a868 | 0 .../6b5bb34dca0a1a09968bad0dc5ab4ad5434df80e | 0 .../74438aca9f4a48488fe204b00a7429cabb247abb | 0 .../776a6d7b367518db3108c641270f9c6311fa1150 | 0 .../80bf55a45d89443866509f377d2b4f56db7fda1b | 0 .../82864735cd8af377e6ad061ae189505a1e3e9d7c | 0 .../899c5b5653c6a42950622470eb34ab3cd5851009 | 0 .../9f5f569cdcb2cd35235adfef521ccd334b295f84 | 0 .../a43b6e3feeba3336586237a758acfa97b791be5b | 0 .../b28def072d697c755d8047d7c4fc36e92d284e43 | 0 .../bb173f9557479135e0f1bcd9c6c5f7b4ae5f77e8 | 0 .../bc46480ac8ea27c54208391c0607483f70591f52 | 0 .../c131e8dffaaace66f248f9071023b60be7b277a4 | 0 .../cd089ae45ce870c45e434019e8f1ed4f066cd425 | 0 .../df021943680d67b4f49e98599f4bb0e86803c590 | 2 + .../e00232faab93cb27b9940f780c75123903d70b1c | 0 .../e7ba402f75a71f1f452cbf16986ed26aa0c6f1b5 | 0 .../eaa75651d9d6785c2bd75843529d61a722450af5 | 0 .../eaaa4be2d68e0a2d603579b394cb7c0ee6bb6df5 | 0 .../fc37a8cb3cd4e86789b6dcadf3271e6894269266 | 0 .../fdadf7a612307c5bb8e90739949b439a1891d886 | 0 .idea/workspace.xml | 80 ++++++++++++++----- .../cnkj/common/config/MongoClientConfig.java | 60 +++++--------- 36 files changed, 79 insertions(+), 63 deletions(-) create mode 100644 .idea/sonarlint/issuestore/1/1/1195786afcb95315b3ec156ea91e7166c2c2cf10 create mode 100644 .idea/sonarlint/issuestore/1/4/14399913ca07717830f9b08ee87644884fc2959a create mode 100644 .idea/sonarlint/issuestore/1/5/157e0e9285b69e300624f35e79300c0ed6098936 create mode 100644 .idea/sonarlint/issuestore/1/7/1759e0760a24aae1fd0b2b5d7d8622112c621b0e create mode 100644 .idea/sonarlint/issuestore/1/9/19affac2f7e5749f37c36532ef281eec1befbd05 create mode 100644 .idea/sonarlint/issuestore/1/c/1c4b500508bae883bea47d0637c267e8c57d7580 create mode 100644 .idea/sonarlint/issuestore/2/1/21fd7f9a07ee140f9ce9ae11bbe161bdd456cbc8 create mode 100644 .idea/sonarlint/issuestore/2/b/2b5e0787fcb106c7e2c215b9201949810fe97d18 create mode 100644 .idea/sonarlint/issuestore/4/1/416390ba57649e9f4e6365934e9a6827cca3ffed create mode 100644 .idea/sonarlint/issuestore/4/9/490c965ee8a02ce158895987485283bb4b666ab6 create mode 100644 .idea/sonarlint/issuestore/4/a/4a24c23f6158d7abc5657040e232691adcee44ac create mode 100644 .idea/sonarlint/issuestore/4/f/4ffd3a6de814df96de78c74e6c16f964b4fe9a03 create mode 100644 .idea/sonarlint/issuestore/6/4/644b718a1d63acca44c411c399624e16ce98e11c create mode 100644 .idea/sonarlint/issuestore/6/5/65fb0f3f093182fd2ca42f4eb1116d36adc8a868 create mode 100644 .idea/sonarlint/issuestore/6/b/6b5bb34dca0a1a09968bad0dc5ab4ad5434df80e create mode 100644 .idea/sonarlint/issuestore/7/4/74438aca9f4a48488fe204b00a7429cabb247abb create mode 100644 .idea/sonarlint/issuestore/7/7/776a6d7b367518db3108c641270f9c6311fa1150 create mode 100644 .idea/sonarlint/issuestore/8/0/80bf55a45d89443866509f377d2b4f56db7fda1b create mode 100644 .idea/sonarlint/issuestore/8/2/82864735cd8af377e6ad061ae189505a1e3e9d7c create mode 100644 .idea/sonarlint/issuestore/8/9/899c5b5653c6a42950622470eb34ab3cd5851009 create mode 100644 .idea/sonarlint/issuestore/9/f/9f5f569cdcb2cd35235adfef521ccd334b295f84 create mode 100644 .idea/sonarlint/issuestore/a/4/a43b6e3feeba3336586237a758acfa97b791be5b create mode 100644 .idea/sonarlint/issuestore/b/2/b28def072d697c755d8047d7c4fc36e92d284e43 create mode 100644 .idea/sonarlint/issuestore/b/b/bb173f9557479135e0f1bcd9c6c5f7b4ae5f77e8 create mode 100644 .idea/sonarlint/issuestore/b/c/bc46480ac8ea27c54208391c0607483f70591f52 create mode 100644 .idea/sonarlint/issuestore/c/1/c131e8dffaaace66f248f9071023b60be7b277a4 create mode 100644 .idea/sonarlint/issuestore/c/d/cd089ae45ce870c45e434019e8f1ed4f066cd425 create mode 100644 .idea/sonarlint/issuestore/d/f/df021943680d67b4f49e98599f4bb0e86803c590 create mode 100644 .idea/sonarlint/issuestore/e/0/e00232faab93cb27b9940f780c75123903d70b1c create mode 100644 .idea/sonarlint/issuestore/e/7/e7ba402f75a71f1f452cbf16986ed26aa0c6f1b5 create mode 100644 .idea/sonarlint/issuestore/e/a/eaa75651d9d6785c2bd75843529d61a722450af5 create mode 100644 .idea/sonarlint/issuestore/e/a/eaaa4be2d68e0a2d603579b394cb7c0ee6bb6df5 create mode 100644 .idea/sonarlint/issuestore/f/c/fc37a8cb3cd4e86789b6dcadf3271e6894269266 create mode 100644 .idea/sonarlint/issuestore/f/d/fdadf7a612307c5bb8e90739949b439a1891d886 diff --git a/.idea/sonarlint/issuestore/1/1/1195786afcb95315b3ec156ea91e7166c2c2cf10 b/.idea/sonarlint/issuestore/1/1/1195786afcb95315b3ec156ea91e7166c2c2cf10 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/1/4/14399913ca07717830f9b08ee87644884fc2959a b/.idea/sonarlint/issuestore/1/4/14399913ca07717830f9b08ee87644884fc2959a new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/1/5/157e0e9285b69e300624f35e79300c0ed6098936 b/.idea/sonarlint/issuestore/1/5/157e0e9285b69e300624f35e79300c0ed6098936 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/1/7/1759e0760a24aae1fd0b2b5d7d8622112c621b0e b/.idea/sonarlint/issuestore/1/7/1759e0760a24aae1fd0b2b5d7d8622112c621b0e new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/1/9/19affac2f7e5749f37c36532ef281eec1befbd05 b/.idea/sonarlint/issuestore/1/9/19affac2f7e5749f37c36532ef281eec1befbd05 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/1/c/1c4b500508bae883bea47d0637c267e8c57d7580 b/.idea/sonarlint/issuestore/1/c/1c4b500508bae883bea47d0637c267e8c57d7580 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/2/1/21fd7f9a07ee140f9ce9ae11bbe161bdd456cbc8 b/.idea/sonarlint/issuestore/2/1/21fd7f9a07ee140f9ce9ae11bbe161bdd456cbc8 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/2/b/2b5e0787fcb106c7e2c215b9201949810fe97d18 b/.idea/sonarlint/issuestore/2/b/2b5e0787fcb106c7e2c215b9201949810fe97d18 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/4/1/416390ba57649e9f4e6365934e9a6827cca3ffed b/.idea/sonarlint/issuestore/4/1/416390ba57649e9f4e6365934e9a6827cca3ffed new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/4/9/490c965ee8a02ce158895987485283bb4b666ab6 b/.idea/sonarlint/issuestore/4/9/490c965ee8a02ce158895987485283bb4b666ab6 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/4/a/4a24c23f6158d7abc5657040e232691adcee44ac b/.idea/sonarlint/issuestore/4/a/4a24c23f6158d7abc5657040e232691adcee44ac new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/4/f/4ffd3a6de814df96de78c74e6c16f964b4fe9a03 b/.idea/sonarlint/issuestore/4/f/4ffd3a6de814df96de78c74e6c16f964b4fe9a03 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/6/4/644b718a1d63acca44c411c399624e16ce98e11c b/.idea/sonarlint/issuestore/6/4/644b718a1d63acca44c411c399624e16ce98e11c new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/6/5/65fb0f3f093182fd2ca42f4eb1116d36adc8a868 b/.idea/sonarlint/issuestore/6/5/65fb0f3f093182fd2ca42f4eb1116d36adc8a868 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/6/b/6b5bb34dca0a1a09968bad0dc5ab4ad5434df80e b/.idea/sonarlint/issuestore/6/b/6b5bb34dca0a1a09968bad0dc5ab4ad5434df80e new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/7/4/74438aca9f4a48488fe204b00a7429cabb247abb b/.idea/sonarlint/issuestore/7/4/74438aca9f4a48488fe204b00a7429cabb247abb new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/7/7/776a6d7b367518db3108c641270f9c6311fa1150 b/.idea/sonarlint/issuestore/7/7/776a6d7b367518db3108c641270f9c6311fa1150 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/8/0/80bf55a45d89443866509f377d2b4f56db7fda1b b/.idea/sonarlint/issuestore/8/0/80bf55a45d89443866509f377d2b4f56db7fda1b new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/8/2/82864735cd8af377e6ad061ae189505a1e3e9d7c b/.idea/sonarlint/issuestore/8/2/82864735cd8af377e6ad061ae189505a1e3e9d7c new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/8/9/899c5b5653c6a42950622470eb34ab3cd5851009 b/.idea/sonarlint/issuestore/8/9/899c5b5653c6a42950622470eb34ab3cd5851009 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/9/f/9f5f569cdcb2cd35235adfef521ccd334b295f84 b/.idea/sonarlint/issuestore/9/f/9f5f569cdcb2cd35235adfef521ccd334b295f84 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/a/4/a43b6e3feeba3336586237a758acfa97b791be5b b/.idea/sonarlint/issuestore/a/4/a43b6e3feeba3336586237a758acfa97b791be5b new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/b/2/b28def072d697c755d8047d7c4fc36e92d284e43 b/.idea/sonarlint/issuestore/b/2/b28def072d697c755d8047d7c4fc36e92d284e43 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/b/b/bb173f9557479135e0f1bcd9c6c5f7b4ae5f77e8 b/.idea/sonarlint/issuestore/b/b/bb173f9557479135e0f1bcd9c6c5f7b4ae5f77e8 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/b/c/bc46480ac8ea27c54208391c0607483f70591f52 b/.idea/sonarlint/issuestore/b/c/bc46480ac8ea27c54208391c0607483f70591f52 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/c/1/c131e8dffaaace66f248f9071023b60be7b277a4 b/.idea/sonarlint/issuestore/c/1/c131e8dffaaace66f248f9071023b60be7b277a4 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/c/d/cd089ae45ce870c45e434019e8f1ed4f066cd425 b/.idea/sonarlint/issuestore/c/d/cd089ae45ce870c45e434019e8f1ed4f066cd425 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/d/f/df021943680d67b4f49e98599f4bb0e86803c590 b/.idea/sonarlint/issuestore/d/f/df021943680d67b4f49e98599f4bb0e86803c590 new file mode 100644 index 0000000..a191a95 --- /dev/null +++ b/.idea/sonarlint/issuestore/d/f/df021943680d67b4f49e98599f4bb0e86803c590 @@ -0,0 +1,2 @@ + + squid:S1697"~Either reverse the equality operator in the "propertiesPathPrefix" null test, or reverse the logical operator that follows it.(̚8ۅ. \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/e/0/e00232faab93cb27b9940f780c75123903d70b1c b/.idea/sonarlint/issuestore/e/0/e00232faab93cb27b9940f780c75123903d70b1c new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/e/7/e7ba402f75a71f1f452cbf16986ed26aa0c6f1b5 b/.idea/sonarlint/issuestore/e/7/e7ba402f75a71f1f452cbf16986ed26aa0c6f1b5 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/e/a/eaa75651d9d6785c2bd75843529d61a722450af5 b/.idea/sonarlint/issuestore/e/a/eaa75651d9d6785c2bd75843529d61a722450af5 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/e/a/eaaa4be2d68e0a2d603579b394cb7c0ee6bb6df5 b/.idea/sonarlint/issuestore/e/a/eaaa4be2d68e0a2d603579b394cb7c0ee6bb6df5 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/f/c/fc37a8cb3cd4e86789b6dcadf3271e6894269266 b/.idea/sonarlint/issuestore/f/c/fc37a8cb3cd4e86789b6dcadf3271e6894269266 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/f/d/fdadf7a612307c5bb8e90739949b439a1891d886 b/.idea/sonarlint/issuestore/f/d/fdadf7a612307c5bb8e90739949b439a1891d886 new file mode 100644 index 0000000..e69de29 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7e7e717..e62fdb0 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,13 +1,42 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -582,7 +611,7 @@ - + 1574320188766 @@ -773,14 +802,22 @@ - - + @@ -796,15 +833,16 @@ + - - + + - + @@ -813,7 +851,6 @@ - @@ -908,7 +945,8 @@ - @@ -1210,9 +1248,9 @@ - - - + + + diff --git a/src/main/java/site/cnkj/common/config/MongoClientConfig.java b/src/main/java/site/cnkj/common/config/MongoClientConfig.java index 9eeea09..6a4546a 100644 --- a/src/main/java/site/cnkj/common/config/MongoClientConfig.java +++ b/src/main/java/site/cnkj/common/config/MongoClientConfig.java @@ -1,20 +1,14 @@ package site.cnkj.common.config; -import com.mongodb.*; -import com.mongodb.selector.ServerSelector; +import com.mongodb.MongoClientOptions; import lombok.Setter; -import org.bson.UuidRepresentation; -import org.bson.codecs.configuration.CodecRegistry; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import site.cnkj.common.utils.data.MongoClientsInit; -import javax.net.ssl.SSLContext; -import java.util.Collections; import java.util.HashMap; -import java.util.List; /* * @author LXW @@ -31,43 +25,31 @@ public class MongoClientConfig { private HashMap uri = new HashMap<>(); - private String applicationName; - private List compressorList = Collections.emptyList(); - private ReadPreference readPreference = ReadPreference.primary(); - private WriteConcern writeConcern = WriteConcern.ACKNOWLEDGED; - private boolean retryWrites = true; - private boolean retryReads = true; - private ReadConcern readConcern = ReadConcern.DEFAULT; - private CodecRegistry codecRegistry = MongoClient.getDefaultCodecRegistry(); - private UuidRepresentation uuidRepresentation = UuidRepresentation.UNSPECIFIED; - private ServerSelector serverSelector; - private int minConnectionsPerHost; - private int maxConnectionsPerHost = 100; - private int serverSelectionTimeout = 1000 * 30; - private int maxWaitTime = 1000 * 60 * 2; - private int maxConnectionIdleTime; - private int maxConnectionLifeTime; - private int connectTimeout = 1000 * 10; - private int socketTimeout = 0; - private boolean sslEnabled = false; - private boolean sslInvalidHostNameAllowed = false; - private SSLContext sslContext; + private Boolean retryWrites = true; + private Boolean retryReads = true; + private Integer minConnectionsPerHost; + private Integer maxConnectionsPerHost = 100; + private Integer serverSelectionTimeout = 1000 * 30; + private Integer maxWaitTime = 1000 * 60 * 2; + private Integer maxConnectionIdleTime; + private Integer maxConnectionLifeTime; + private Integer connectTimeout = 1000 * 10; + private Integer socketTimeout = 0; + private Boolean sslEnabled = false; + private Boolean sslInvalidHostNameAllowed = false; - private int heartbeatFrequency = 10000; - private int minHeartbeatFrequency = 500; - private int heartbeatConnectTimeout = 20000; - private int heartbeatSocketTimeout = 20000; - private int localThreshold = 15; + private Integer heartbeatFrequency = 10000; + private Integer minHeartbeatFrequency = 500; + private Integer heartbeatConnectTimeout = 20000; + private Integer heartbeatSocketTimeout = 20000; + private Integer localThreshold = 15; private MongoClientOptions.Builder builder(){ //配制连接池 MongoClientOptions.Builder mongoClientBuilder = new MongoClientOptions.Builder(); mongoClientBuilder.applicationName(applicationName); - mongoClientBuilder.autoEncryptionSettings(AutoEncryptionSettings.builder().build()); - mongoClientBuilder.codecRegistry(codecRegistry); - mongoClientBuilder.compressorList(compressorList); mongoClientBuilder.connectionsPerHost(maxConnectionsPerHost); mongoClientBuilder.connectTimeout(connectTimeout); mongoClientBuilder.heartbeatConnectTimeout(heartbeatConnectTimeout); @@ -79,18 +61,12 @@ public class MongoClientConfig { mongoClientBuilder.maxWaitTime(maxWaitTime); mongoClientBuilder.minConnectionsPerHost(minConnectionsPerHost); mongoClientBuilder.minHeartbeatFrequency(minHeartbeatFrequency); - mongoClientBuilder.readConcern(readConcern); - mongoClientBuilder.readPreference(readPreference); mongoClientBuilder.retryReads(retryReads); mongoClientBuilder.retryWrites(retryWrites); mongoClientBuilder.serverSelectionTimeout(serverSelectionTimeout); - mongoClientBuilder.serverSelector(serverSelector); mongoClientBuilder.socketTimeout(socketTimeout); - mongoClientBuilder.sslContext(sslContext); mongoClientBuilder.sslEnabled(sslEnabled); mongoClientBuilder.sslInvalidHostNameAllowed(sslInvalidHostNameAllowed); - mongoClientBuilder.uuidRepresentation(uuidRepresentation); - mongoClientBuilder.writeConcern(writeConcern); return mongoClientBuilder; }