diff --git a/esua-epdc/epdc-commons/epdc-commons-api-version-control/pom.xml b/esua-epdc/epdc-commons/epdc-commons-api-version-control/pom.xml new file mode 100644 index 000000000..2881faa88 --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-api-version-control/pom.xml @@ -0,0 +1,51 @@ + + + + epdc-commons + com.esua.epdc + 1.0.0 + + 4.0.0 + + epdc-commons-api-version-control + jar + + + + org.springframework.boot + spring-boot-autoconfigure + + + + org.springframework.boot + spring-boot-starter-log4j2 + provided + + + + org.springframework.boot + spring-boot-starter-web + provided + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + com.vaadin.external.google + android-json + + + + + + + ${project.artifactId} + ${project.basedir}/src/main/java + + + \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiRequestMappingHandlerMapping.java b/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiRequestMappingHandlerMapping.java new file mode 100644 index 000000000..16cd859ed --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiRequestMappingHandlerMapping.java @@ -0,0 +1,42 @@ +package com.elink.esua.epdc.commons.api.version; + +import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.mvc.condition.RequestCondition; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; + +import java.lang.reflect.Method; + +/** + * @author rongchao + * @Date 18-11-24 + */ +public class ApiRequestMappingHandlerMapping extends RequestMappingHandlerMapping { + @Override + protected RequestCondition getCustomMethodCondition(Method method) { + return createCondition(method.getClass()); + } + + @Override + protected RequestCondition getCustomTypeCondition(Class handlerType) { + return createCondition(handlerType); + } + + private static RequestCondition createCondition(Class clazz) { + RequestMapping classRequestMapping = AnnotationUtils.findAnnotation(clazz, RequestMapping.class); + if (classRequestMapping == null) { + return null; + } + StringBuilder mappingUrlBuilder = new StringBuilder(); + if (classRequestMapping.value().length > 0) { + mappingUrlBuilder.append(classRequestMapping.value()[0]); + } + String mappingUrl = mappingUrlBuilder.toString(); + String mappingUrlVersion = "{version}"; + if (!mappingUrl.contains(mappingUrlVersion)) { + return null; + } + ApiVersion apiVersion = AnnotationUtils.findAnnotation(clazz, ApiVersion.class); + return apiVersion == null ? new ApiVersionCondition(1) : new ApiVersionCondition(apiVersion.value()); + } +} \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiVersion.java b/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiVersion.java new file mode 100644 index 000000000..c40e521f8 --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiVersion.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.commons.api.version; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @author rongchao + * @Date 18-11-24 + */ +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ApiVersion { + + /** + * 版本号 + * + * @return + */ + int value(); +} \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiVersionCondition.java b/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiVersionCondition.java new file mode 100644 index 000000000..8dcfc8e07 --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiVersionCondition.java @@ -0,0 +1,48 @@ +package com.elink.esua.epdc.commons.api.version; + +import org.springframework.web.servlet.mvc.condition.RequestCondition; + +import javax.servlet.http.HttpServletRequest; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * @author rongchao + * @Date 18-11-24 + */ +public class ApiVersionCondition implements RequestCondition { + private final static Pattern VERSION_PREFIX_PATTERN = Pattern.compile("/v(\\d+).*"); + + private int apiVersion; + + ApiVersionCondition(int apiVersion) { + this.apiVersion = apiVersion; + } + + public int getApiVersion() { + return apiVersion; + } + + + @Override + public ApiVersionCondition combine(ApiVersionCondition apiVersionCondition) { + return new ApiVersionCondition(apiVersionCondition.getApiVersion()); + } + + @Override + public ApiVersionCondition getMatchingCondition(HttpServletRequest httpServletRequest) { + Matcher m = VERSION_PREFIX_PATTERN.matcher(httpServletRequest.getRequestURI()); + if (m.find()) { + Integer version = Integer.valueOf(m.group(1)); + if (version >= this.apiVersion) { + return this; + } + } + return null; + } + + @Override + public int compareTo(ApiVersionCondition apiVersionCondition, HttpServletRequest httpServletRequest) { + return apiVersionCondition.getApiVersion() - this.apiVersion; + } +} diff --git a/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/config/WebMvcRegistrationsConfig.java b/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/config/WebMvcRegistrationsConfig.java new file mode 100644 index 000000000..0c9e46e1e --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/config/WebMvcRegistrationsConfig.java @@ -0,0 +1,19 @@ +package com.elink.esua.epdc.commons.api.version.config; + +import com.elink.esua.epdc.commons.api.version.ApiRequestMappingHandlerMapping; +import org.springframework.boot.autoconfigure.web.servlet.WebMvcRegistrations; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; + +/** + * @author rongchao + * @Date 18-11-24 + */ +@Configuration +public class WebMvcRegistrationsConfig implements WebMvcRegistrations { + + @Override + public RequestMappingHandlerMapping getRequestMappingHandlerMapping() { + return new ApiRequestMappingHandlerMapping(); + } +} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java index c45b047a8..715d723fe 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java @@ -44,7 +44,7 @@ public interface Constant { */ Long DICT_ROOT = 0L; /** - * 升序 + * 升序 */ String ASC = "asc"; /** @@ -96,4 +96,8 @@ public interface Constant { * 移动端用户标识 */ String APP_USER_FLAG = "APP_USER"; + /** + * 版本控制用 + */ + String VERSION_CONTROL = "/{version}"; } 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-commons/pom.xml b/esua-epdc/epdc-commons/pom.xml index f54acfdea..2755b9d7a 100644 --- a/esua-epdc/epdc-commons/pom.xml +++ b/esua-epdc/epdc-commons/pom.xml @@ -17,5 +17,6 @@ epdc-commons-tools epdc-commons-mybatis epdc-commons-dynamic-datasource + epdc-commons-api-version-control 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-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 33d4e2d05..1762d3b84 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 @@ -41,13 +41,18 @@ spring-boot-admin-starter-client ${spring.boot.admin.version} - com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery + + + com.esua.epdc + epdc-commons-api-version-control + ${project.version} + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/rest/v2/DemoV2Controller.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/rest/v2/DemoV2Controller.java new file mode 100644 index 000000000..b6d7d114f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/rest/v2/DemoV2Controller.java @@ -0,0 +1,18 @@ +package com.elink.esua.epdc.rest.v2; + +import com.elink.esua.epdc.commons.api.version.ApiVersion; +import com.elink.esua.epdc.commons.tools.constant.Constant; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/9/2 14:29 + */ +@ApiVersion(2) +@RestController("DemoControllerV2") +@RequestMapping("/demo" + Constant.VERSION_CONTROL) +public class DemoV2Controller { + +} 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-demo/epdc-demo-server/pom.xml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml index 1790121da..0f98272b1 100644 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml @@ -53,6 +53,11 @@ org.springframework.cloud spring-cloud-starter-zipkin + + net.rakugakibox.spring.boot + orika-spring-boot-starter + 1.8.0 + diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java index 7f0d7504d..2843c3c65 100644 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java @@ -22,7 +22,7 @@ import java.io.Serializable; @Data @TableName("demo") public class DemoEntity implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 8109944892257584088L; /** * 用户ID diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/TransforDemoEntity.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/TransforDemoEntity.java new file mode 100644 index 000000000..5d4b67809 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/TransforDemoEntity.java @@ -0,0 +1,18 @@ +package com.elink.esua.epdc.entity; +import lombok.Data; + +/** + * + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/9/2 13:54 + */ +@Data +public class TransforDemoEntity { + + private Long demoId; + + private String demoName; + + private int demoAge; +} diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/transfor/Demo2DemoTransforEntity.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/transfor/Demo2DemoTransforEntity.java new file mode 100644 index 000000000..3f355bdb7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/transfor/Demo2DemoTransforEntity.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.transfor; + +import com.elink.esua.epdc.entity.DemoEntity; +import com.elink.esua.epdc.entity.TransforDemoEntity; +import ma.glasnost.orika.MapperFactory; +import net.rakugakibox.spring.boot.orika.OrikaMapperFactoryConfigurer; +import org.springframework.stereotype.Component; + +/** + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/9/2 11:21 + */ +@Component +public class Demo2DemoTransforEntity implements OrikaMapperFactoryConfigurer { + + @Override + public void configure(MapperFactory orikaMapperFactory) { + orikaMapperFactory.classMap(DemoEntity.class, TransforDemoEntity.class) + .field("id", "demoId") + .field("name", "demoName") + .field("age", "demoAge") + .byDefault() + .register(); + } +} diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/test/java/com/elink/esua/epdc/OrikaTest.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/test/java/com/elink/esua/epdc/OrikaTest.java new file mode 100644 index 000000000..c28272ad7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/test/java/com/elink/esua/epdc/OrikaTest.java @@ -0,0 +1,38 @@ +package com.elink.esua.epdc; + +import com.alibaba.fastjson.JSON; +import com.elink.esua.epdc.entity.DemoEntity; +import com.elink.esua.epdc.entity.TransforDemoEntity; +import ma.glasnost.orika.MapperFacade; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +/** + * 实体映射测试类 + * + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/9/2 13:25 + */ +@RunWith(SpringRunner.class) +@SpringBootTest +public class OrikaTest { + + @Autowired + private MapperFacade orikaMapper; + + @Test + public void Test() { + DemoEntity demoEntity = new DemoEntity(); + demoEntity.setId(1000L); + demoEntity.setName("name"); + demoEntity.setAge(19); + + TransforDemoEntity transforEntity = orikaMapper.map(demoEntity, TransforDemoEntity.class); + System.out.println(JSON.toJSONString(transforEntity)); + } + +} 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