Browse Source

Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_0814

dev
管理员 6 years ago
parent
commit
2a42a2a069
  1. 51
      esua-epdc/epdc-commons/epdc-commons-api-version-control/pom.xml
  2. 42
      esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiRequestMappingHandlerMapping.java
  3. 22
      esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiVersion.java
  4. 48
      esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/ApiVersionCondition.java
  5. 19
      esua-epdc/epdc-commons/epdc-commons-api-version-control/src/main/java/com/elink/esua/epdc/commons/api/version/config/WebMvcRegistrationsConfig.java
  6. 6
      esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/Constant.java
  7. 2
      esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java
  8. 1
      esua-epdc/epdc-commons/pom.xml
  9. 8
      esua-epdc/epdc-gateway/pom.xml
  10. 6
      esua-epdc/epdc-gateway/src/main/resources/application.yml
  11. 7
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  12. 18
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/rest/v2/DemoV2Controller.java
  13. 2
      esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml
  14. 5
      esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml
  15. 2
      esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java
  16. 18
      esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/TransforDemoEntity.java
  17. 26
      esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/transfor/Demo2DemoTransforEntity.java
  18. 38
      esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/test/java/com/elink/esua/epdc/OrikaTest.java
  19. 4
      esua-epdc/epdc-module/epdc-issue/epdc-issue-client/pom.xml
  20. 0
      esua-epdc/epdc-module/epdc-issue/epdc-issue-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep
  21. 6
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/pom.xml
  22. 4
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/IssueApplication.java
  23. 2
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
  24. 6
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/application.yml
  25. 0
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages.properties
  26. 0
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_en_US.properties
  27. 0
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_CN.properties
  28. 0
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_TW.properties
  29. 0
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation.properties
  30. 0
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_en_US.properties
  31. 0
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_CN.properties
  32. 0
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_TW.properties
  33. 2
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/logback-spring.xml
  34. 0
      esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/registry.conf
  35. 6
      esua-epdc/epdc-module/epdc-issue/pom.xml
  36. 2
      esua-epdc/epdc-module/pom.xml

51
esua-epdc/epdc-commons/epdc-commons-api-version-control/pom.xml

@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<artifactId>epdc-commons</artifactId>
<groupId>com.esua.epdc</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>epdc-commons-api-version-control</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>com.vaadin.external.google</groupId>
<artifactId>android-json</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
</build>
</project>

42
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<ApiVersionCondition> 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());
}
}

22
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();
}

48
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<ApiVersionCondition> {
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;
}
}

19
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();
}
}

6
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}";
}

2
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";
/**
* 生活服务模块
*/

1
esua-epdc/epdc-commons/pom.xml

@ -17,5 +17,6 @@
<module>epdc-commons-tools</module>
<module>epdc-commons-mybatis</module>
<module>epdc-commons-dynamic-datasource</module>
<module>epdc-commons-api-version-control</module>
</modules>
</project>

8
esua-epdc/epdc-gateway/pom.xml

@ -97,8 +97,8 @@
<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
<!-- <gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>-->
<gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
<gateway.routes.epdc-party-server.uri>lb://epdc-party-server</gateway.routes.epdc-party-server.uri>
<!-- <gateway.routes.epdc-party-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-party-server.uri>-->
<gateway.routes.epdc-issue-server.uri>lb://epdc-issue-server</gateway.routes.epdc-issue-server.uri>
<!-- <gateway.routes.epdc-issue-server.uri>http://127.0.0.1:9066</gateway.routes.epdc-issue-server.uri>-->
<gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
<!-- <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->
<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
@ -134,7 +134,7 @@
<gateway.routes.epdc-neighbor-server.uri>lb://epdc-neighbor-server</gateway.routes.epdc-neighbor-server.uri>
<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
<gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
<gateway.routes.epdc-party-server.uri>lb://epdc-party-server</gateway.routes.epdc-party-server.uri>
<gateway.routes.epdc-issue-server.uri>lb://epdc-issue-server</gateway.routes.epdc-issue-server.uri>
<gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
<gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
@ -169,7 +169,7 @@
<gateway.routes.epdc-neighbor-server.uri>lb://epdc-neighbor-server</gateway.routes.epdc-neighbor-server.uri>
<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
<gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
<gateway.routes.epdc-party-server.uri>lb://epdc-party-server</gateway.routes.epdc-party-server.uri>
<gateway.routes.epdc-issue-server.uri>lb://epdc-issue-server</gateway.routes.epdc-issue-server.uri>
<gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
<gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>

6
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
#生活服务模块

7
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@ -41,13 +41,18 @@
<artifactId>spring-boot-admin-starter-client</artifactId>
<version>${spring.boot.admin.version}</version>
</dependency>
<!-- nacos start -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<!-- nacos end -->
<!--版本控制-->
<dependency>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-commons-api-version-control</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>

18
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 {
}

2
esua-epdc/epdc-module/epdc-app/epdc-app-client/pom.xml

@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-party-client</artifactId>
<artifactId>epdc-issue-client</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>

5
esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml

@ -53,6 +53,11 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zipkin</artifactId>
</dependency>
<dependency>
<groupId>net.rakugakibox.spring.boot</groupId>
<artifactId>orika-spring-boot-starter</artifactId>
<version>1.8.0</version>
</dependency>
</dependencies>
<build>

2
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

18
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;
}

26
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();
}
}

38
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));
}
}

4
esua-epdc/epdc-module/epdc-party/epdc-party-client/pom.xml → 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">
<parent>
<artifactId>epdc-party</artifactId>
<artifactId>epdc-issue</artifactId>
<groupId>com.esua.epdc</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>epdc-party-client</artifactId>
<artifactId>epdc-issue-client</artifactId>
<packaging>jar</packaging>

0
esua-epdc/epdc-module/epdc-party/epdc-party-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep → esua-epdc/epdc-module/epdc-issue/epdc-issue-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep

6
esua-epdc/epdc-module/epdc-party/epdc-party-server/pom.xml → 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">
<parent>
<artifactId>epdc-party</artifactId>
<artifactId>epdc-issue</artifactId>
<groupId>com.esua.epdc</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>epdc-party-server</artifactId>
<artifactId>epdc-issue-server</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>com.esua.epdc</groupId>
<artifactId>epdc-party-client</artifactId>
<artifactId>epdc-issue-client</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>

4
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/PartyApplication.java → 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);
}
}

2
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java → 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";
}
}

6
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/application.yml → 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

0
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages.properties → esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages.properties

0
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_en_US.properties → esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_en_US.properties

0
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_CN.properties → esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_CN.properties

0
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/messages_zh_TW.properties → esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/messages_zh_TW.properties

0
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation.properties → esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation.properties

0
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_en_US.properties → esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_en_US.properties

0
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_CN.properties → esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_CN.properties

0
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/i18n/validation_zh_TW.properties → esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/i18n/validation_zh_TW.properties

2
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/logback-spring.xml → esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/logback-spring.xml

@ -2,7 +2,7 @@
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<property name="log.path" value="logs/party"/>
<property name="log.path" value="logs/issue"/>
<!-- 彩色日志格式 -->
<property name="CONSOLE_LOG_PATTERN"

0
esua-epdc/epdc-module/epdc-party/epdc-party-server/src/main/resources/registry.conf → esua-epdc/epdc-module/epdc-issue/epdc-issue-server/src/main/resources/registry.conf

6
esua-epdc/epdc-module/epdc-party/pom.xml → esua-epdc/epdc-module/epdc-issue/pom.xml

@ -9,11 +9,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>epdc-party</artifactId>
<artifactId>epdc-issue</artifactId>
<packaging>pom</packaging>
<modules>
<module>epdc-party-client</module>
<module>epdc-party-server</module>
<module>epdc-issue-client</module>
<module>epdc-issue-server</module>
</modules>

2
esua-epdc/epdc-module/pom.xml

@ -21,7 +21,7 @@
<module>epdc-api</module>
<module>epdc-heart</module>
<module>epdc-news</module>
<module>epdc-party</module>
<module>epdc-issue</module>
<module>epdc-neighbor</module>
<module>epdc-services</module>
<module>epdc-app</module>

Loading…
Cancel
Save