diff --git a/pom.xml b/pom.xml index 5eeb873..3f2c967 100644 --- a/pom.xml +++ b/pom.xml @@ -9,20 +9,81 @@ inspect-simulator 1.8 + 2021.0.1 + 2021.1 + 3.1.1 + 2.0.4 UTF-8 UTF-8 - 2.6.13 + 2.3.4.RELEASE com.inspect.simulator.InspectSimulatorApplication - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-web - + + + + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.cloud + spring-cloud-starter-bootstrap + ${spring.cloud.bootstrap.version} + + + com.alibaba.nacos + nacos-client + ${nacos.client.version} + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + ${spring.cloud.alibaba.version} + + + com.alibaba.nacos + nacos-api + + + com.alibaba.nacos + nacos-client + + + com.alibaba.nacos + nacos-common + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + ${spring.cloud.alibaba.version} + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + ${spring.cloud.alibaba.version} + + + com.alibaba.cloud + spring-cloud-alibaba-sentinel-gateway + ${spring.cloud.alibaba.version} + + org.springframework.boot spring-boot-starter-test diff --git a/src/main/java/com/inspect/simulator/InspectSimulatorApplication.java b/src/main/java/com/inspect/simulator/InspectSimulatorApplication.java index 16c1ca3..3c138f3 100644 --- a/src/main/java/com/inspect/simulator/InspectSimulatorApplication.java +++ b/src/main/java/com/inspect/simulator/InspectSimulatorApplication.java @@ -6,13 +6,14 @@ import okhttp3.Request; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableScheduling; import retrofit2.Retrofit; import retrofit2.converter.jackson.JacksonConverterFactory; import retrofit2.converter.scalars.ScalarsConverterFactory; -@SpringBootApplication +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) @EnableScheduling public class InspectSimulatorApplication { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml deleted file mode 100644 index 7aa6bad..0000000 --- a/src/main/resources/application-dev.yml +++ /dev/null @@ -1,50 +0,0 @@ -server: - port: 18530 - -spring: - application: - name: inspect-simulator-senior - - servlet: - multipart: - max-file-size: 20MB - max-request-size: 60MB - datasource: - druid: - stat-view-servlet: - enabled: true - loginUsername: admin - loginPassword: 123456 - dynamic: - druid: - initial-size: 5 - min-idle: 5 - maxActive: 20 - maxWait: 60000 - timeBetweenEvictionRunsMillis: 60000 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - filters: stat,slf4j - connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 - datasource: - master: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/dliip?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: atia2018 -analysis: - api: - url: http://192.168.1.116:9911 - token: 01234567890 - -upper: - api: - url: http://20.148.0.4:40029 - -platform: - url: http://192.168.1.116:18530 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml deleted file mode 100644 index 3dc8ded..0000000 --- a/src/main/resources/application-prod.yml +++ /dev/null @@ -1,51 +0,0 @@ -server: - port: 18530 - -spring: - application: - name: inspect-simulator-senior - - servlet: - multipart: - max-file-size: 20MB - max-request-size: 60MB - datasource: - druid: - stat-view-servlet: - enabled: true - loginUsername: admin - loginPassword: 123456 - dynamic: - druid: - initial-size: 5 - min-idle: 5 - maxActive: 20 - maxWait: 60000 - timeBetweenEvictionRunsMillis: 60000 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - filters: stat,slf4j - connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 - datasource: - master: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://172.21.101.112:4406/dliip?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - username: root - password: 123456 -analysis: - api: - url: http://192.168.1.116:9911 - token: 01234567890 - -upper: - api: - url: http://20.148.0.4:40029 - -platform: - url: http://192.168.1.116:18530 - diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml deleted file mode 100644 index 1f70509..0000000 --- a/src/main/resources/application-test.yml +++ /dev/null @@ -1,51 +0,0 @@ -server: - port: 18530 - -spring: - application: - name: inspect-simulator-senior - - servlet: - multipart: - max-file-size: 20MB - max-request-size: 60MB - datasource: - druid: - stat-view-servlet: - enabled: true - loginUsername: admin - loginPassword: 123456 - dynamic: - druid: - initial-size: 5 - min-idle: 5 - maxActive: 20 - maxWait: 60000 - timeBetweenEvictionRunsMillis: 60000 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxPoolPreparedStatementPerConnectionSize: 20 - filters: stat,slf4j - connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 - datasource: - master: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.1.116:4406/inspect-milestone?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - username: root - password: atia2018 -analysis: - api: - url: http://192.168.1.116:9911 - token: 01234567890 - -upper: - api: - url: http://20.148.0.4:40029 - -platform: - url: http://192.168.1.116:18530 - diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml deleted file mode 100644 index ad9a171..0000000 --- a/src/main/resources/application.yml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - profiles: - active: dev - diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..5b7742c --- /dev/null +++ b/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ + +server: + port: 18530 + +spring: + application: + name: inspect-simulator + profiles: + active: test + cloud: + nacos: + discovery: + server-addr: http://192.168.1.116:8848 + namespace: aea23d4f-1dbd-4089-9e80-e2803fb37ffe + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + namespace: ${spring.cloud.nacos.discovery.namespace} + file-extension: yml + group: DEFAULT_GROUP + timeout: 5000 + config-long-poll-timeout: 10000 + max-retry: 10 + shared-configs: + - inspect-simulator-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + + main: + allow-bean-definition-overriding: true + allow-circular-references: true diff --git a/src/test/java/com/inspect/simulator/InspectSimulatorApplicationTests.java b/src/test/java/com/inspect/simulator/InspectSimulatorApplicationTests.java deleted file mode 100644 index 8aa555f..0000000 --- a/src/test/java/com/inspect/simulator/InspectSimulatorApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.inspect.simulator; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class InspectSimulatorApplicationTests { - - @Test - void contextLoads() { - } - -}