diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index d8f08c408..7930579ac 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -71,6 +71,30 @@ docker-maven-plugin + + ${project.basedir}/src/main/java + + + + true + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf index 9cfedf9cc..fb64abd71 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/registry.conf @@ -3,7 +3,7 @@ registry { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } @@ -14,7 +14,7 @@ config { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index fb400f50b..9dd4d6712 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -118,8 +118,8 @@ **/application*.yml **/*.properties - registry.conf logback-spring.xml + registry.conf @@ -149,7 +149,6 @@ false 47.104.224.45:8848 - 47.104.224.45 wx3ef8f2cd12a19fcb 948aa2f21dbaa3943288ea5b119ac6f2 @@ -181,7 +180,6 @@ true 47.104.224.45:8848 - 47.104.224.45 wx3ef8f2cd12a19fcb 948aa2f21dbaa3943288ea5b119ac6f2 @@ -213,7 +211,6 @@ true 172.31.171.61:9300 - 172.31.171.61 wx3ef8f2cd12a19fcb 948aa2f21dbaa3943288ea5b119ac6f2 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf index b413927df..bccc306f5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/registry.conf @@ -3,7 +3,7 @@ registry { type = "nacos" nacos { - serverAddr = @nacos.host@ + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } @@ -14,7 +14,7 @@ config { type = "nacos" nacos { - serverAddr = @nacos.host@ + serverAddr = "nacos.server-addr" namespace = "public" cluster = "default" } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index 437efb4d6..6d21ff31e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -72,6 +72,30 @@ docker-maven-plugin + + ${project.basedir}/src/main/java + + + + true + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf index 9cfedf9cc..fb64abd71 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf @@ -3,7 +3,7 @@ registry { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } @@ -14,7 +14,7 @@ config { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml index 7d34b8541..a913a8132 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml @@ -102,6 +102,30 @@ docker-maven-plugin + + ${project.basedir}/src/main/java + + + + true + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/registry.conf index 9cfedf9cc..fb64abd71 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/registry.conf @@ -3,7 +3,7 @@ registry { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } @@ -14,7 +14,7 @@ config { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml index c0c13a8d9..9f6046fb4 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml @@ -67,6 +67,30 @@ docker-maven-plugin + + ${project.basedir}/src/main/java + + + + true + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml index 88a3182c6..18e7e3584 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml @@ -3,44 +3,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/registry.conf index 9cfedf9cc..fb64abd71 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/registry.conf @@ -3,7 +3,7 @@ registry { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } @@ -14,7 +14,7 @@ config { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml index b368e2741..7b33f45a1 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml @@ -110,6 +110,30 @@ docker-maven-plugin + + ${project.basedir}/src/main/java + + + + true + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/registry.conf index 9cfedf9cc..fb64abd71 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/registry.conf @@ -3,7 +3,7 @@ registry { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } @@ -14,7 +14,7 @@ config { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml index 7765f05ba..bf187bdfc 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml @@ -66,6 +66,30 @@ docker-maven-plugin + + ${project.basedir}/src/main/java + + + + true + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/registry.conf index 9cfedf9cc..fb64abd71 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/registry.conf @@ -3,7 +3,7 @@ registry { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" } @@ -14,7 +14,7 @@ config { type = "nacos" nacos { - serverAddr = "47.104.224.45" + serverAddr = "@nacos.server-addr@" namespace = "public" cluster = "default" }