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 9bbee1b69..6002e34db 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_ISSUE_SERVER = "epdc-issue-server";
+ String EPDC_ISSUE_SERVER = "epdc-events-server";
/**
* 生活服务模块
*/
diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index 6717d02d5..e65419204 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -96,8 +96,8 @@
lb://epdc-news-server
lb://epdc-oss-server
- lb://epdc-issue-server
-
+ lb://epdc-events-server
+
lb://epdc-services-server
@@ -133,7 +133,7 @@
lb://epdc-neighbor-server
lb://epdc-news-server
lb://epdc-oss-server
- lb://epdc-issue-server
+ lb://epdc-events-server
lb://epdc-services-server
lb://epdc-user-server
lb://epdc-demo-server
@@ -168,7 +168,7 @@
lb://epdc-neighbor-server
lb://epdc-news-server
lb://epdc-oss-server
- lb://epdc-issue-server
+ lb://epdc-events-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 5bcdacdd7..667a89c9a 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-issue-server
- uri: @gateway.routes.epdc-issue-server.uri@
+ - id: epdc-events-server
+ uri: @gateway.routes.epdc-events-server.uri@
order: 11
predicates:
- - Path=/issue/**
+ - Path=/events/**
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 317158413..2b9c90eb5 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-issue-client
+ epdc-events-client
1.0.0
@@ -50,4 +50,4 @@
-
\ No newline at end of file
+
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-client/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml
similarity index 80%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-client/pom.xml
rename to esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml
index 8326823a8..7e5ea539d 100644
--- a/esua-epdc/epdc-module/epdc-issue/epdc-issue-client/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml
@@ -3,14 +3,14 @@
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-issue
+ epdc-events
com.esua.epdc
1.0.0
4.0.0
- epdc-issue-client
+ epdc-events-client
jar
-
\ No newline at end of file
+
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
similarity index 100%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
rename to esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
similarity index 97%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/pom.xml
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
index 0770eac63..bca64010c 100644
--- a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-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-issue
+ epdc-events
com.esua.epdc
1.0.0
4.0.0
- epdc-issue-server
+ epdc-events-server
jar
com.esua.epdc
- epdc-issue-client
+ epdc-events-client
1.0.0
@@ -143,4 +143,4 @@
-
\ No newline at end of file
+
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/IssueApplication.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java
similarity index 86%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/IssueApplication.java
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java
index 5094f5232..9da702350 100644
--- a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/IssueApplication.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/EventsApplication.java
@@ -22,10 +22,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableDiscoveryClient
@EnableFeignClients
-public class IssueApplication {
+public class EventsApplication {
public static void main(String[] args) {
- SpringApplication.run(IssueApplication.class, args);
+ SpringApplication.run(EventsApplication.class, args);
}
}
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
similarity index 100%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
similarity index 93%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/application.yml
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
index 4f17b8847..5fbb1cb04 100644
--- a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
@@ -1,11 +1,11 @@
server:
port: @server.port@
servlet:
- context-path: /issue
+ context-path: /events
spring:
application:
- name: epdc-issue-server
+ name: epdc-events-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-issue-server-fescar-service-group
+ tx-service-group: epdc-events-server-fescar-service-group
datasource:
druid:
driver-class-name: com.mysql.jdbc.Driver
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/messages.properties
similarity index 100%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages.properties
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/messages.properties
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/messages_en_US.properties
similarity index 100%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_en_US.properties
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/messages_en_US.properties
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/messages_zh_CN.properties
similarity index 100%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_CN.properties
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/messages_zh_CN.properties
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/messages_zh_TW.properties
similarity index 100%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_TW.properties
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/messages_zh_TW.properties
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/validation.properties
similarity index 100%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation.properties
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/validation.properties
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/validation_en_US.properties
similarity index 100%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_en_US.properties
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/validation_en_US.properties
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/validation_zh_CN.properties
similarity index 100%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_CN.properties
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/validation_zh_CN.properties
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/validation_zh_TW.properties
similarity index 100%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_TW.properties
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/i18n/validation_zh_TW.properties
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml
similarity index 99%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/logback-spring.xml
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml
index 205095d2f..79a7dad72 100644
--- a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/logback-spring.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/logback-spring.xml
@@ -2,7 +2,7 @@
-
+
-
\ No newline at end of file
+
diff --git a/esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf
similarity index 100%
rename from esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/registry.conf
rename to esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/registry.conf
diff --git a/esua-epdc/epdc-module/epdc-issue/pom.xml b/esua-epdc/epdc-module/epdc-events/pom.xml
similarity index 78%
rename from esua-epdc/epdc-module/epdc-issue/pom.xml
rename to esua-epdc/epdc-module/epdc-events/pom.xml
index 65faf1ba4..7a601facc 100644
--- a/esua-epdc/epdc-module/epdc-issue/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/pom.xml
@@ -9,12 +9,12 @@
4.0.0
- epdc-issue
+ epdc-events
pom
- epdc-issue-client
- epdc-issue-server
+ epdc-events-client
+ epdc-events-server
-
\ No newline at end of file
+
diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml
index 3897c8f95..68c359200 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-issue
+ epdc-events
epdc-neighbor
epdc-services
epdc-app