From bb2adedd695694272dbac81b635d0ac2fab7d3e0 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Tue, 14 Nov 2023 14:51:11 +0800 Subject: [PATCH] =?UTF-8?q?nacos=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-dev.properties | 7 ++++--- .../src/main/resources/bootstrap-pre.properties | 4 ++++ .../src/main/resources/bootstrap-test.properties | 3 --- .../src/main/resources/bootstrap.properties | 2 +- .../src/main/resources/logback-spring.xml | 6 +++--- .../src/main/resources/bootstrap-dev.properties | 7 ++++--- .../src/main/resources/bootstrap-pre.properties | 4 ++++ .../src/main/resources/bootstrap-test.properties | 3 --- .../src/main/resources/logback-spring.xml | 6 +++--- 9 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 coolstore-partner-webb/src/main/resources/bootstrap-pre.properties delete mode 100644 coolstore-partner-webb/src/main/resources/bootstrap-test.properties create mode 100644 coolstore-partner-webc/src/main/resources/bootstrap-pre.properties delete mode 100644 coolstore-partner-webc/src/main/resources/bootstrap-test.properties diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties b/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties index e20af0316..04a4e67af 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap-dev.properties @@ -1,3 +1,4 @@ -spring.cloud.nacos.discovery.server-addr=121.41.41.92 -spring.cloud.nacos.config.server-addr=121.41.41.92 -spring.cloud.nacos.config.file-extension=properties \ No newline at end of file +spring.cloud.nacos.discovery.server-addr=192.168.1.202 +spring.cloud.nacos.config.server-addr=192.168.1.202 +spring.cloud.nacos.config.file-extension=properties +spring.cloud.nacos.config.namespace=80efeafb-563c-4acf-a6dd-23c3ed2b849a \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties b/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties new file mode 100644 index 000000000..24adb07b5 --- /dev/null +++ b/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties @@ -0,0 +1,4 @@ +spring.cloud.nacos.discovery.server-addr=120.92.151.10:8848 +spring.cloud.nacos.config.server-addr=120.92.151.10:8848 +spring.cloud.nacos.config.file-extension=properties +spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-test.properties b/coolstore-partner-webb/src/main/resources/bootstrap-test.properties deleted file mode 100644 index e793965bb..000000000 --- a/coolstore-partner-webb/src/main/resources/bootstrap-test.properties +++ /dev/null @@ -1,3 +0,0 @@ -spring.cloud.nacos.discovery.server-addr=10.7.54.16:8848 -spring.cloud.nacos.config.server-addr=10.7.54.16:8848 -spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap.properties b/coolstore-partner-webb/src/main/resources/bootstrap.properties index e8cb5a145..fd6fa0390 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-webb -spring.profiles.active=dev +spring.profiles.active=pre server.port=31000 server.servlet.context-path=/partner/pc diff --git a/coolstore-partner-webb/src/main/resources/logback-spring.xml b/coolstore-partner-webb/src/main/resources/logback-spring.xml index 7e3e7bfeb..104360a65 100644 --- a/coolstore-partner-webb/src/main/resources/logback-spring.xml +++ b/coolstore-partner-webb/src/main/resources/logback-spring.xml @@ -42,14 +42,14 @@ - - + + - + diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties b/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties index e20af0316..04a4e67af 100644 --- a/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties +++ b/coolstore-partner-webc/src/main/resources/bootstrap-dev.properties @@ -1,3 +1,4 @@ -spring.cloud.nacos.discovery.server-addr=121.41.41.92 -spring.cloud.nacos.config.server-addr=121.41.41.92 -spring.cloud.nacos.config.file-extension=properties \ No newline at end of file +spring.cloud.nacos.discovery.server-addr=192.168.1.202 +spring.cloud.nacos.config.server-addr=192.168.1.202 +spring.cloud.nacos.config.file-extension=properties +spring.cloud.nacos.config.namespace=80efeafb-563c-4acf-a6dd-23c3ed2b849a \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties b/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties new file mode 100644 index 000000000..24adb07b5 --- /dev/null +++ b/coolstore-partner-webc/src/main/resources/bootstrap-pre.properties @@ -0,0 +1,4 @@ +spring.cloud.nacos.discovery.server-addr=120.92.151.10:8848 +spring.cloud.nacos.config.server-addr=120.92.151.10:8848 +spring.cloud.nacos.config.file-extension=properties +spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/bootstrap-test.properties b/coolstore-partner-webc/src/main/resources/bootstrap-test.properties deleted file mode 100644 index e793965bb..000000000 --- a/coolstore-partner-webc/src/main/resources/bootstrap-test.properties +++ /dev/null @@ -1,3 +0,0 @@ -spring.cloud.nacos.discovery.server-addr=10.7.54.16:8848 -spring.cloud.nacos.config.server-addr=10.7.54.16:8848 -spring.cloud.nacos.config.file-extension=properties \ No newline at end of file diff --git a/coolstore-partner-webc/src/main/resources/logback-spring.xml b/coolstore-partner-webc/src/main/resources/logback-spring.xml index 97e76bc84..18c7dec14 100644 --- a/coolstore-partner-webc/src/main/resources/logback-spring.xml +++ b/coolstore-partner-webc/src/main/resources/logback-spring.xml @@ -42,14 +42,14 @@ - - + + - +