diff --git a/pom.xml b/pom.xml index 0bd791d..1aae661 100644 --- a/pom.xml +++ b/pom.xml @@ -3,47 +3,50 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + net.risesoft + demo01 + jar + 1.0 + demo01 + org.springframework.boot spring-boot-starter-parent 3.2.0 - net.risesoft - demo01 - 1.0 - demo01 - Demo project for Spring Boot - - - - spring-snapshots - https://repo.spring.io/snapshot - true - - - spring-milestones - https://repo.spring.io/milestone - - - - - spring-snapshots - https://repo.spring.io/snapshot - - - spring-milestones - https://repo.spring.io/milestone - - + + + spring-snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + https://repo.spring.io/milestone + + + + + + spring-snapshots + https://repo.spring.io/snapshot + + + spring-milestones + https://repo.spring.io/milestone + + 21 - 2023.0.0-RC1 + 2023.0.0 - + @@ -64,6 +67,12 @@ org.springframework.boot spring-boot-starter-web + @@ -98,9 +107,19 @@ org.springframework.cloud spring-cloud-starter-consul-discovery - 4.0.3 + + jakarta.servlet + jakarta.servlet-api + provided + + + + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5d96e45..fac6c86 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,7 +7,7 @@ management: exposure: include: '*' server: - port: 7055 + port: 7099 servlet: context-path: /demo01 encoding: @@ -33,7 +33,7 @@ spring: compatibility-verifier: enabled: false consul: - host: host.docker.internal + host: localhost port: 8500 discovery: register-health-check: true @@ -46,7 +46,7 @@ spring: tags: test,y9 datasource: driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://host.docker.internal:3306/y9_public?serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&useCompression=true&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://localhost:3306/y9_public?serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=utf-8&rewriteBatchedStatements=true&useCompression=true&useSSL=false&allowPublicKeyRetrieval=true username: root password: '12345678' hikari: @@ -68,7 +68,7 @@ spring: allow-circular-references: false docker: compose: - enabled: true + enabled: false file: compose-dev.yml readiness: #wait: NEVER