ソースを参照

移除es的包;简化配置中心配置项;

lixing 3 年 前
コミット
d5f697d4d2

+ 4 - 21
pom.xml

@@ -102,32 +102,15 @@
     </dependency>
 
     <dependency>
-        <groupId>org.elasticsearch</groupId>
-        <artifactId>elasticsearch</artifactId>
-        <version>7.13.2</version>
-    </dependency>
-
-    <dependency>
-        <groupId>org.elasticsearch.client</groupId>
-        <artifactId>elasticsearch-rest-high-level-client</artifactId>
-        <version>7.13.2</version>
-    </dependency>
-    <dependency>
-        <groupId>org.elasticsearch.client</groupId>
-        <artifactId>elasticsearch-rest-client</artifactId>
-        <version>7.13.2</version>
-    </dependency>
-
-    <dependency>
         <groupId>com.persagy</groupId>
         <artifactId>apm-mybatis</artifactId>
     </dependency>
 
     <!-- actuator:查询项目状态;项目上线需要把这个包注释掉,不然会有安全风险 -->
-    <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-actuator</artifactId>
-    </dependency>
+<!--    <dependency>-->
+<!--        <groupId>org.springframework.boot</groupId>-->
+<!--        <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!--    </dependency>-->
 
     <dependency>
         <groupId>com.persagy.apm</groupId>

+ 0 - 45
src/main/java/com/persagy/apm/alarmservice/common/configuration/ElasticSearchConfig.java

@@ -1,45 +0,0 @@
-package com.persagy.apm.alarmservice.common.configuration;
-
-import org.apache.http.HttpHost;
-import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestHighLevelClient;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author 易涛
- * @version 1.0
- * @date 2021/9/7 18:05
- */
-@Configuration
-public class ElasticSearchConfig {
-
-    @Value("${elasticsearch.host}")
-    private String host;
-
-    @Value("${energy.es.port}")
-    private int port;
-
-    @Value("${elasticsearch.connectTimeout:15000}")
-    private int connectTimeout;
-
-    @Value("${elasticsearch.socketTimeout:15000}")
-    private int socketTimeout;
-
-    @Value("${elasticsearch.connectionRequestTimeout:15000}")
-    private int connectionRequestTimeout;
-
-    @Bean(destroyMethod = "close",name = "client")
-    public RestHighLevelClient restHighLevelClient() {
-        return new RestHighLevelClient(
-                RestClient.builder(
-                        new HttpHost(host, port, "http")
-                ).setRequestConfigCallback(requestConfigBuilder->requestConfigBuilder
-                 .setConnectTimeout(connectTimeout)
-                 .setSocketTimeout(socketTimeout)
-                 .setConnectionRequestTimeout(connectionRequestTimeout))
-        );
-    }
-
-}

+ 0 - 2
src/main/java/com/persagy/apm/alarmservice/group/management/service/impl/GroupManagementServiceImpl.java

@@ -18,10 +18,8 @@ import com.persagy.apm.common.model.vo.SimpleObjVO;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.UrlParamDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 

+ 46 - 5
src/main/resources/bootstrap.yml

@@ -5,8 +5,51 @@ server:
 spring:
   application:
     name: energy-alarm-service
+  jackson:
+    serialization:
+      # 统一将时间都转为时间戳
+      write-dates-as-timestamps: true
+    # 设置时间戳的时区
+    time-zone: Asia/Shanghai
+  datasource:
+    dynamic:
+      primary: master
+      strict: false
+      datasource:
+        master:
+          schema: classpath*:db/init/table.sql
+          data: classpath*:db/init/data_dev.sql
+          continue-on-error: true
+          url: jdbc:mysql://${mysql.ip}:${mysql.port}/energy_alarm_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+          username: ${mysql.username}
+          password: ${mysql.password}
+          driver-class-name: com.mysql.cj.jdbc.Driver
 
-EUREKA_CLIENT_DEFAULT_ZONE: http://frame:123456@develop.persagy.com/integrated-eureka/eureka/
+
+feign:
+  compression:
+    response:
+      # feign返回结果不压缩
+      enabled: false
+    request:
+      # feign请求参数不压缩
+      enabled: false
+
+integrated:
+  swagger:
+    # 接口文档版本
+    version: v1.0.0
+    # 接口访问地址
+    termsOfServiceUrl: localhost
+    # 作者信息
+    contact:
+      name: lixing
+    # 只展示com.persagy包下的接口, 不展示swagger默认的接口
+    basePackage: com.persagy
+    # 接口文档简介
+    description: --
+    # 接口文档名称
+    title: energy-alarm-service 接口文档
 
 # 不打印sql
 mybatis-plus:
@@ -14,15 +57,13 @@ mybatis-plus:
     log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
-
 eureka:
-#  instance:
-#    prefer-ip-address: true
   client:
-    register-with-eureka: ${register-with-eureka}
+    register-with-eureka: ${register-with-eureka}:true
 
 # com.persagy包的日志等级为info
 logging:
+  config: classpath:logback-spring.xml
   level:
     com:
       persagy: info