diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index 689f4d55d..4ccdd4f1b 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -128,6 +128,8 @@
lb://epdc-websocket-server
lb://epdc-kpi-server
+
+ lb://epdc-custom-server
false
47.104.224.45:8848
@@ -167,6 +169,7 @@
lb://epdc-group-server
lb://epdc-websocket-server
lb://epdc-kpi-server
+ lb://epdc-custom-server
true
@@ -202,6 +205,7 @@
lb://epdc-group-server
lb://epdc-websocket-server
lb://epdc-kpi-server
+ lb://epdc-custom-server
0
@@ -240,6 +244,7 @@
lb://epdc-group-server
lb://epdc-websocket-server
lb://epdc-kpi-server
+ lb://epdc-custom-server
0
@@ -279,6 +284,7 @@
lb://epdc-group-server
lb://epdc-websocket-server
lb://epdc-kpi-server
+ lb://epdc-custom-server
0
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index a742d3e24..6a4882b38 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -154,6 +154,14 @@ spring:
- Path=${server.servlet.context-path}/kpi/**
filters:
- StripPrefix=1
+ #定制模块
+ - id: epdc-custom-server
+ uri: @gateway.routes.epdc-custom-server.uri@
+ order: 17
+ predicates:
+ - Path=${server.servlet.context-path}/custom/**
+ filters:
+ - StripPrefix=1
nacos:
discovery:
server-addr: @nacos.server-addr@
diff --git a/esua-epdc/epdc-module/epdc-custom/db/mysql.sql b/esua-epdc/epdc-module/epdc-custom/db/mysql.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-custom/db/oracle.sql b/esua-epdc/epdc-module/epdc-custom/db/oracle.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-custom/db/postgresql.sql b/esua-epdc/epdc-module/epdc-custom/db/postgresql.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-custom/db/sqlserver.sql b/esua-epdc/epdc-module/epdc-custom/db/sqlserver.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/pom.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/pom.xml
new file mode 100644
index 000000000..b1a1ac33f
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/pom.xml
@@ -0,0 +1,27 @@
+
+
+ 4.0.0
+
+
+ com.esua.epdc
+ epdc-custom
+ 1.0.0
+
+
+ epdc-custom-client
+ jar
+
+
+
+ com.esua.epdc
+ epdc-commons-tools
+ 1.0.0
+
+
+
+
+ ${project.artifactId}
+
+
+
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml
new file mode 100644
index 000000000..a9952e6f6
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml
@@ -0,0 +1,220 @@
+
+
+ 4.0.0
+
+
+ com.esua.epdc
+ epdc-custom
+ 1.0.0
+
+
+ epdc-custom-server
+ jar
+
+
+
+ com.esua.epdc
+ epdc-custom-client
+ 1.0.0
+
+
+ com.esua.epdc
+ epdc-commons-tools
+ 1.0.0
+
+
+ com.esua.epdc
+ epdc-commons-mybatis
+ 1.0.0
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework
+ spring-context-support
+
+
+ de.codecentric
+ spring-boot-admin-starter-client
+ ${spring.boot.admin.version}
+
+
+ com.esua.epdc
+ epdc-commons-tools-phone
+ 1.0.0
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-zipkin
+
+
+ net.rakugakibox.spring.boot
+ orika-spring-boot-starter
+ 1.8.0
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
+
+ com.spotify
+ dockerfile-maven-plugin
+
+
+
+
+
+
+ dev
+
+ true
+
+
+ dev
+
+ 9076
+
+ 2
+ 47.104.224.45
+ 6379
+ elink@888
+
+
+
+
+ epdc
+ elink833066
+
+ false
+ 47.104.224.45:8848
+
+
+
+
+
+ test
+
+ test
+
+ 9076
+
+ 2
+ 47.104.224.45
+ 6379
+ elink@888
+
+
+
+
+ epdc
+ elink833066
+
+ true
+ 47.104.224.45:8848
+
+
+
+
+ prod
+
+ prod
+
+ 9076
+
+
+ 0
+ 10.5.34.164
+ 6379
+ Elink@833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 10.5.34.164:8848
+
+
+
+
+ prod_kongcun
+
+ prod
+
+ 9076
+
+
+ 0
+ 172.16.1.238
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.1.238:8848
+
+
+
+
+ prod_shibei_aliyun
+
+ prod
+
+ 9076
+
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.0.52:8848
+
+
+
+
+
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/CustomApplication.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/CustomApplication.java
new file mode 100644
index 000000000..c04551cda
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/CustomApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有,侵权必究!
+ */
+
+package com.elink.esua.epdc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * 模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class CustomApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(CustomApplication.class, args);
+ }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
new file mode 100644
index 000000000..9bc0d6c68
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有,侵权必究!
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+ @Override
+ public String getName() {
+ return "custom";
+ }
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml
new file mode 100644
index 000000000..a2323c50c
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml
@@ -0,0 +1,66 @@
+server:
+ port: @server.port@
+ servlet:
+ context-path: /custom
+
+spring:
+ application:
+ name: epdc-custom-server
+ # 环境 dev|test|prod
+ profiles:
+ active: @spring.profiles.active@
+ messages:
+ encoding: UTF-8
+ basename: i18n/messages,i18n/messages_common
+ jackson:
+ time-zone: GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss
+ redis:
+ database: @spring.redis.index@
+ host: @spring.redis.host@
+ timeout: 30s
+ port: @spring.redis.port@
+ password: @spring.redis.password@
+ cloud:
+ nacos:
+ discovery:
+ server-addr: @nacos.server-addr@
+ register-enabled: @nacos.register-enabled@
+ alibaba:
+ seata:
+ tx-service-group: epdc-custom-server-fescar-service-group
+ datasource:
+ druid:
+ driver-class-name: com.mysql.jdbc.Driver
+ url: @spring.datasource.druid.url@
+ username: @spring.datasource.druid.username@
+ password: @spring.datasource.druid.password@
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: "*"
+ endpoint:
+ health:
+ show-details: ALWAYS
+
+mybatis-plus:
+ mapper-locations: classpath:/mapper/**/*.xml
+ #实体扫描,多个package用逗号或者分号分隔
+ typeAliasesPackage: com.elink.esua.epdc.entity
+ global-config:
+ #数据库相关配置
+ db-config:
+ #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+ id-type: UUID
+ #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+ field-strategy: NOT_NULL
+ #驼峰下划线转换
+ column-underline: true
+ banner: false
+ #原生配置
+ configuration:
+ map-underscore-to-camel-case: true
+ cache-enabled: false
+ call-setters-on-nulls: true
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 000000000..a7091dbb4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages.properties
@@ -0,0 +1 @@
+#Default
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 000000000..9e895e428
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages_en_US.properties
@@ -0,0 +1 @@
+#English
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 000000000..b21fd22ec
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages_zh_CN.properties
@@ -0,0 +1 @@
+#\u7B80\u4F53\u4E2D\u6587
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages_zh_TW.properties
new file mode 100644
index 000000000..4433dba45
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/messages_zh_TW.properties
@@ -0,0 +1 @@
+#\u7E41\u4F53\u4E2D\u6587
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation.properties
new file mode 100644
index 000000000..56ca909c4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation.properties
@@ -0,0 +1 @@
+#Default
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation_en_US.properties
new file mode 100644
index 000000000..9e895e428
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation_en_US.properties
@@ -0,0 +1 @@
+#English
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation_zh_CN.properties
new file mode 100644
index 000000000..b21fd22ec
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation_zh_CN.properties
@@ -0,0 +1 @@
+#\u7B80\u4F53\u4E2D\u6587
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation_zh_TW.properties
new file mode 100644
index 000000000..4433dba45
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/i18n/validation_zh_TW.properties
@@ -0,0 +1 @@
+#\u7E41\u4F53\u4E2D\u6587
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml
new file mode 100644
index 000000000..ede9e630f
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ debug
+
+
+ ${CONSOLE_LOG_PATTERN}
+
+ UTF-8
+
+
+
+
+
+
+
+ ${log.path}/debug.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+ ${log.path}/debug-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ debug
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/info.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+ ${log.path}/info-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ info
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/warn.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+ ${log.path}/warn-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ warn
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/error.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+ ${log.path}/error-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ ERROR
+ ACCEPT
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/registry.conf
new file mode 100644
index 000000000..9cfedf9cc
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/registry.conf
@@ -0,0 +1,21 @@
+registry {
+ # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
+ type = "nacos"
+
+ nacos {
+ serverAddr = "47.104.224.45"
+ namespace = "public"
+ cluster = "default"
+ }
+}
+
+config {
+ # file、nacos 、apollo、zk、consul、etcd3
+ type = "nacos"
+
+ nacos {
+ serverAddr = "47.104.224.45"
+ namespace = "public"
+ cluster = "default"
+ }
+}
diff --git a/esua-epdc/epdc-module/epdc-custom/pom.xml b/esua-epdc/epdc-module/epdc-custom/pom.xml
new file mode 100644
index 000000000..55b2ac95b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-custom/pom.xml
@@ -0,0 +1,21 @@
+
+
+ 4.0.0
+
+
+ com.esua.epdc
+ epdc-module
+ 1.0.0
+
+
+ com.esua.epdc
+ epdc-custom
+ pom
+
+
+ epdc-custom-client
+ epdc-custom-server
+
+
+
diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml
index 1d9f7aec8..ec076c9e2 100644
--- a/esua-epdc/epdc-module/pom.xml
+++ b/esua-epdc/epdc-module/pom.xml
@@ -30,6 +30,7 @@
epdc-websocket
epdc-kpi
epdc-webservice
+ epdc-custom