From 1cfbd2d5593eec051012bac45c9e51aa2007610e Mon Sep 17 00:00:00 2001 From: yeungchihang <842328916@qq.com> Date: Sat, 7 Jan 2023 15:45:20 +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=A7springboot=E7=89=88=E6=9C=AC=E5=92=8C=E5=85=B6?= =?UTF-8?q?=E4=B8=AD=E7=9A=84hikar=E8=BF=9E=E6=8E=A5=E6=B1=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-native.yml | 1 - .../business/config/ElasticsearchConfig.java | 50 +++++- .../elasticsearch/ElasticsearchClientV2.java | 3 +- .../ElasticsearchRestClient.java | 3 +- .../business/service/room/RoomPKService.java | 4 +- .../src/main/resources/application-native.yml | 3 +- .../src/main/resources/scheduler-native.yml | 12 ++ pom.xml | 4 +- .../src/test/resources/logback-spring.xml | 144 ------------------ .../src/test/resources/mybatis-config.xml | 24 --- 10 files changed, 64 insertions(+), 184 deletions(-) create mode 100644 accompany-scheduler/accompany-scheduler-web/src/main/resources/scheduler-native.yml diff --git a/accompany-admin/accompany-admin-web/src/main/resources/application-native.yml b/accompany-admin/accompany-admin-web/src/main/resources/application-native.yml index 0fa2dd51d..41fa78170 100644 --- a/accompany-admin/accompany-admin-web/src/main/resources/application-native.yml +++ b/accompany-admin/accompany-admin-web/src/main/resources/application-native.yml @@ -12,7 +12,6 @@ spring: connection-test-query: select 1 max-lifetime: 0 connection-timeout: 30000 - data: mongodb: host: 118.194.255.128 port: 27017 diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ElasticsearchConfig.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ElasticsearchConfig.java index f67aefa62..00ceb8565 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ElasticsearchConfig.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/config/ElasticsearchConfig.java @@ -2,10 +2,20 @@ package com.accompany.business.config; import com.accompany.business.elasticsearch.ElasticsearchClientV2; import com.accompany.business.elasticsearch.ElasticsearchRestClient; +import org.apache.commons.lang3.StringUtils; +import org.apache.http.HttpHost; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.elasticsearch.client.RestClient; +import org.elasticsearch.client.RestClientBuilder; +import org.elasticsearch.client.RestHighLevelClient; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; +import org.springframework.context.annotation.DependsOn; +import org.springframework.context.annotation.Primary; @Configuration @ConfigurationProperties(prefix = "elasticsearch") @@ -60,14 +70,40 @@ public class ElasticsearchConfig { this.password = password; } - @Bean(initMethod = "init",name = "elasticsearchRestClient") - public ElasticsearchRestClient elasticsearchRestClient(ElasticsearchConfig elasticsearchConfig) { - return new ElasticsearchRestClient(elasticsearchConfig); + @Bean + public RestClient restClient(){ + final CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); + if (StringUtils.isNotEmpty(username) && StringUtils.isNotEmpty(password)) { + credentialsProvider.setCredentials(AuthScope.ANY, + new UsernamePasswordCredentials(username, password)); + } + return RestClient.builder(new HttpHost(hostName, port)) + .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider)).build(); } - @Bean(initMethod = "init",name = "elasticsearchClientV2") - public ElasticsearchClientV2 elasticsearchClientV2(ElasticsearchConfig elasticsearchConfig) { - return new ElasticsearchClientV2(elasticsearchConfig); + @Bean + public RestHighLevelClient restHighLevelClient(){ + final CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); + if (StringUtils.isNotEmpty(username) && StringUtils.isNotEmpty(password)) { + credentialsProvider.setCredentials(AuthScope.ANY, + new UsernamePasswordCredentials(username, password)); + } + RestClientBuilder restClientBuilder = RestClient.builder(new HttpHost(hostName, port)) + .setHttpClientConfigCallback(httpClientBuilder -> httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider)); + return new RestHighLevelClient(restClientBuilder); + } + + @Primary + @Bean("elasticsearchRestClient") + @DependsOn("restClient") + public ElasticsearchRestClient elasticsearchRestClient(ElasticsearchConfig elasticsearchConfig, RestClient restClient) { + return new ElasticsearchRestClient(elasticsearchConfig, restClient); + } + + @Bean("elasticsearchClientV2") + @DependsOn("restHighLevelClient") + public ElasticsearchClientV2 elasticsearchClientV2(ElasticsearchConfig elasticsearchConfig, RestHighLevelClient restHighLevelClient) { + return new ElasticsearchClientV2(elasticsearchConfig, restHighLevelClient); } public String getUserIndex() { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchClientV2.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchClientV2.java index 369c763a2..68dc79104 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchClientV2.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchClientV2.java @@ -35,8 +35,9 @@ public class ElasticsearchClientV2 { private final Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").create(); private final String ES_LINE_BREAK = "\n"; - public ElasticsearchClientV2(ElasticsearchConfig elasticsearchConfig){ + public ElasticsearchClientV2(ElasticsearchConfig elasticsearchConfig, RestHighLevelClient restHighLevelClient){ this.elasticsearchConfig = elasticsearchConfig; + this.restClient = restHighLevelClient; } public void init(){ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchRestClient.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchRestClient.java index 7bc436938..72c7f59ce 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchRestClient.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/elasticsearch/ElasticsearchRestClient.java @@ -44,8 +44,9 @@ public class ElasticsearchRestClient { private final Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").create(); private final String ES_LINE_BREAK = "\n"; - public ElasticsearchRestClient(ElasticsearchConfig elasticsearchConfig){ + public ElasticsearchRestClient(ElasticsearchConfig elasticsearchConfig, RestClient restClient){ this.elasticsearchConfig = elasticsearchConfig; + this.restClient = restClient; } public void init(){ diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java index 04e669c96..2a719421a 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomPKService.java @@ -571,7 +571,7 @@ public class RoomPKService extends BaseService { //查询最新一条的PK模式 Query query = new Query(); query.addCriteria(Criteria.where("roomUid").is(roomUid)) - .with(new Sort(Sort.Direction.DESC,"createTime")); + .with(Sort.by(Sort.Direction.DESC, "createTime")); query.skip(0).limit(1); List list = roomPkDAO.findByQuery(query); @@ -609,7 +609,7 @@ public class RoomPKService extends BaseService { pkStatus.add(Constant.RoomPKStatus.FINISH); pkStatus.add(Constant.RoomPKStatus.FORCE_FINISH); query.addCriteria(Criteria.where("roomUid").is(roomUid).and("endTime").lt(System.currentTimeMillis()).and("pkStatus").in(pkStatus)) - .with(new Sort(Sort.Direction.DESC,"createTime")); + .with(Sort.by(Sort.Direction.DESC, "createTime")); long count = roomPkDAO.count(query); query.skip(start).limit(pageSize); List list = roomPkDAO.findByQuery(query); 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 298f82e43..7ab834cc8 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,12 +5,11 @@ spring: username: root password: anan@dev## driver-class-name: com.mysql.cj.jdbc.Driver + type: com.zaxxer.hikari.HikariDataSource hikari: minimum-idle: 10 maximum-pool-size: 20 connection-test-query: select 1 - max-lifetime: 0 - connection-timeout: 30000 data: mongodb: host: 118.194.255.128 diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/resources/scheduler-native.yml b/accompany-scheduler/accompany-scheduler-web/src/main/resources/scheduler-native.yml new file mode 100644 index 000000000..d25f0351c --- /dev/null +++ b/accompany-scheduler/accompany-scheduler-web/src/main/resources/scheduler-native.yml @@ -0,0 +1,12 @@ +task: + checkUserTime: 0/30 * * * * ? + beforeDay: 30 + size: 5 + startTime: 2019-03-01 00:00:00 + updatePrizeTime: 0/5 * * * * ? + prizeSize: 50 + updateHotValueTime: 0/5 * * * * ? + updateLimit: 20 + updateAuditCount: 0/30 * * * * ? + sumPurseTime: 0/30 * * * * ? + financeTime: 0/30 * * * * ? \ No newline at end of file diff --git a/pom.xml b/pom.xml index f8f09589a..56f6e290a 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.1.RELEASE + 2.3.12.RELEASE @@ -53,7 +53,7 @@ 3.3.2 2.4.2 2.0.8 - Greenwich.SR2 + Hoxton.SR12 7.6.0 0.2.2.RELEASE 3.10.0 diff --git a/xuanyin-game-match/src/test/resources/logback-spring.xml b/xuanyin-game-match/src/test/resources/logback-spring.xml index d1e20fec3..e69de29bb 100644 --- a/xuanyin-game-match/src/test/resources/logback-spring.xml +++ b/xuanyin-game-match/src/test/resources/logback-spring.xml @@ -1,144 +0,0 @@ - - - - - - - - - - - ${CONSOLE_LOG_PATTERN} - - - - - - - - - - ${LOG_HOME}/web_info.log - - INFO - - - ${LOG_HOME}/rolling/web_info.%d{yyyy-MM-dd}.%i.log.gz - - 90 - true - - 256MB - - - - UTF-8 - %date [%thread] [%file:%line] [%level %logger{0}] - %msg%n - - - - - - ${LOG_HOME}/web_warn.log - - WARN - - - ${LOG_HOME}/rolling/web_warn_.%d{yyyy-MM-dd}.%i.log.gz - - 90 - true - - 256MB - - - - UTF-8 - %date [%thread] [%file:%line] [%level %logger{0}] - %msg%n - - - - - - ${LOG_HOME}/web_error.log - - ERROR - - - ${LOG_HOME}/rolling/web_error_.%d{yyyy-MM-dd}.%i.log.gz - - 90 - true - - 256MB - - - - UTF-8 - %date [%thread] [%file:%line] [%level %logger{0}] - %msg%n - - - - - - - - - 12 - 512 - - - - - - - 12 - 512 - false - - - - - 12 - 512 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/xuanyin-game-match/src/test/resources/mybatis-config.xml b/xuanyin-game-match/src/test/resources/mybatis-config.xml index a6c5a368b..e69de29bb 100644 --- a/xuanyin-game-match/src/test/resources/mybatis-config.xml +++ b/xuanyin-game-match/src/test/resources/mybatis-config.xml @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file