diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java index 6b412005b..9bbee1b69 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java @@ -54,7 +54,7 @@ public interface ServiceConstant { /** * 党群议事模块 */ - String EPDC_PARTY_SERVER = "epdc-party-server"; + String EPDC_ISSUE_SERVER = "epdc-issue-server"; /** * 生活服务模块 */ diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index af24ad60b..53b172ddd 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -97,8 +97,8 @@ lb://epdc-news-server lb://epdc-oss-server - lb://epdc-party-server - + lb://epdc-issue-server + lb://epdc-services-server lb://epdc-user-server @@ -134,7 +134,7 @@ lb://epdc-neighbor-server lb://epdc-news-server lb://epdc-oss-server - lb://epdc-party-server + lb://epdc-issue-server lb://epdc-services-server lb://epdc-user-server lb://epdc-demo-server @@ -169,7 +169,7 @@ lb://epdc-neighbor-server lb://epdc-news-server lb://epdc-oss-server - lb://epdc-party-server + lb://epdc-issue-server lb://epdc-services-server lb://epdc-user-server lb://epdc-demo-server diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index 0ed1c0785..5bcdacdd7 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -96,11 +96,11 @@ spring: filters: - StripPrefix=0 #党群议事模块 - - id: epdc-party-server - uri: @gateway.routes.epdc-party-server.uri@ + - id: epdc-issue-server + uri: @gateway.routes.epdc-issue-server.uri@ order: 11 predicates: - - Path=/party/** + - Path=/issue/** filters: - StripPrefix=0 #生活服务模块 diff --git a/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml b/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml index 22167de71..317158413 100644 --- a/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml +++ b/esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml @@ -35,7 +35,7 @@ com.esua.epdc - epdc-party-client + epdc-issue-client 1.0.0 diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-client/pom.xml b/esua-epdc/epdc-module/epdc-issue/epdc-issue-client/pom.xml similarity index 81% rename from esua-epdc/epdc-module/epdc-party/epdc-party-client/pom.xml rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-client/pom.xml index 75c2202d2..8326823a8 100644 --- a/esua-epdc/epdc-module/epdc-party/epdc-party-client/pom.xml +++ b/esua-epdc/epdc-module/epdc-issue/epdc-issue-client/pom.xml @@ -3,13 +3,13 @@ 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"> - epdc-party + epdc-issue com.esua.epdc 1.0.0 4.0.0 - epdc-party-client + epdc-issue-client jar diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-issue/epdc-issue-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep similarity index 100% rename from esua-epdc/epdc-module/epdc-party/epdc-party-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/pom.xml similarity index 97% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/pom.xml index 221135bbd..0770eac63 100644 --- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/pom.xml @@ -3,19 +3,19 @@ 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"> - epdc-party + epdc-issue com.esua.epdc 1.0.0 4.0.0 - epdc-party-server + epdc-issue-server jar com.esua.epdc - epdc-party-client + epdc-issue-client 1.0.0 diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/PartyApplication.java b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/IssueApplication.java similarity index 87% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/PartyApplication.java rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/IssueApplication.java index a44f0107d..5094f5232 100644 --- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/PartyApplication.java +++ b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/IssueApplication.java @@ -22,10 +22,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients -public class PartyApplication { +public class IssueApplication { public static void main(String[] args) { - SpringApplication.run(PartyApplication.class, args); + SpringApplication.run(IssueApplication.class, args); } } diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java similarity index 95% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java index 5cac77f6e..2746a1d64 100644 --- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java +++ b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java @@ -21,6 +21,6 @@ import org.springframework.stereotype.Service; public class ModuleConfigImpl implements ModuleConfig { @Override public String getName() { - return "party"; + return "issue"; } } diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/application.yml similarity index 93% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/application.yml index a9bbe39ff..4f17b8847 100644 --- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/application.yml @@ -1,11 +1,11 @@ server: port: @server.port@ servlet: - context-path: /party + context-path: /issue spring: application: - name: epdc-party-server + name: epdc-issue-server # 环境 dev|test|prod profiles: active: @spring.profiles.active@ @@ -28,7 +28,7 @@ spring: register-enabled: @nacos.register-enabled@ alibaba: seata: - tx-service-group: epdc-party-server-fescar-service-group + tx-service-group: epdc-issue-server-fescar-service-group datasource: druid: driver-class-name: com.mysql.jdbc.Driver diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages.properties similarity index 100% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages.properties rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages.properties diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_en_US.properties rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_en_US.properties diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_CN.properties rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_CN.properties diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_TW.properties similarity index 100% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_TW.properties rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_TW.properties diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation.properties similarity index 100% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation.properties rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation.properties diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_en_US.properties similarity index 100% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_en_US.properties rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_en_US.properties diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_CN.properties similarity index 100% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_CN.properties rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_CN.properties diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_TW.properties similarity index 100% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_TW.properties rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_TW.properties diff --git a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/logback-spring.xml similarity index 99% rename from esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/logback-spring.xml rename to esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/logback-spring.xml index 712dc98d5..205095d2f 100644 --- a/esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/logback-spring.xml @@ -2,7 +2,7 @@ - + 4.0.0 - epdc-party + epdc-issue pom - epdc-party-client - epdc-party-server + epdc-issue-client + epdc-issue-server diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml index 30c4c6923..3897c8f95 100644 --- a/esua-epdc/epdc-module/pom.xml +++ b/esua-epdc/epdc-module/pom.xml @@ -21,7 +21,7 @@ epdc-api epdc-heart epdc-news - epdc-party + epdc-issue epdc-neighbor epdc-services epdc-app