diff --git a/.gitignore b/.gitignore index ceb8f86..1e16a38 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,7 @@ target/ *.iml .DS_Store + +# Local service configuration +patbond-*/src/main/resources/application.yml +!patbond-*/src/main/resources/application.yml.sample diff --git a/Readme.md b/Readme.md index cdaca08..e6e9199 100644 --- a/Readme.md +++ b/Readme.md @@ -10,7 +10,7 @@ Patbond API is a Spring Cloud microservice project. ## Technology Stack -- Java 8 +- Java 17 - Spring Boot 2.7.18 - Spring Cloud 2021.0.9 - Spring Cloud Alibaba 2021.0.6.0 diff --git a/patbond-auth/src/main/resources/application.yml b/patbond-auth/src/main/resources/application.yml deleted file mode 100644 index f0d9afd..0000000 --- a/patbond-auth/src/main/resources/application.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: - port: 8081 - -spring: - config: - import: "optional:nacos:patbond-auth.yml" - application: - name: patbond-auth - cloud: - nacos: - discovery: - server-addr: 132.232.242.77:8848 - config: - server-addr: 132.232.242.77:8848 diff --git a/patbond-auth/src/main/resources/application.yml.sample b/patbond-auth/src/main/resources/application.yml.sample new file mode 100644 index 0000000..2ed0f96 --- /dev/null +++ b/patbond-auth/src/main/resources/application.yml.sample @@ -0,0 +1,16 @@ +server: + port: 8081 + +spring: + config: + import: "optional:nacos:patbond-auth.yml" + application: + name: patbond-auth + cloud: + nacos: + discovery: + server-addr: ${NACOS_SERVER_ADDR:127.0.0.1:8848} + register-enabled: ${NACOS_REGISTER_ENABLED:true} + fail-fast: ${NACOS_DISCOVERY_FAIL_FAST:false} + config: + server-addr: ${NACOS_SERVER_ADDR:127.0.0.1:8848} diff --git a/patbond-user/src/main/resources/application.yml b/patbond-user/src/main/resources/application.yml deleted file mode 100644 index 949f3cf..0000000 --- a/patbond-user/src/main/resources/application.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: - port: 8082 - -spring: - config: - import: "optional:nacos:patbond-user.yml" - application: - name: patbond-user - cloud: - nacos: - discovery: - server-addr: 132.232.242.77:8848 - config: - server-addr: 132.232.242.77:8848 diff --git a/patbond-user/src/main/resources/application.yml.sample b/patbond-user/src/main/resources/application.yml.sample new file mode 100644 index 0000000..19705b3 --- /dev/null +++ b/patbond-user/src/main/resources/application.yml.sample @@ -0,0 +1,16 @@ +server: + port: 8082 + +spring: + config: + import: "optional:nacos:patbond-user.yml" + application: + name: patbond-user + cloud: + nacos: + discovery: + server-addr: ${NACOS_SERVER_ADDR:127.0.0.1:8848} + register-enabled: ${NACOS_REGISTER_ENABLED:true} + fail-fast: ${NACOS_DISCOVERY_FAIL_FAST:false} + config: + server-addr: ${NACOS_SERVER_ADDR:127.0.0.1:8848} diff --git a/pom.xml b/pom.xml index 1639262..82071d6 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ - 1.8 + 17 UTF-8 UTF-8