diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index e5ec2fde..47ee05fd 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -142,6 +142,7 @@ http://127.0.0.1:9078 lb://epdc-content-security-server + lb://epdc-screen-server false 115.29.142.202:8848 @@ -190,7 +191,7 @@ lb://epdc-party-group-server lb://epdc-analysis-server lb://epdc-content-security-server - + lb://epdc-screen-server true 47.104.92.53:8848 @@ -231,6 +232,7 @@ lb://epdc-party-group-server lb://epdc-analysis-server lb://epdc-content-security-server + lb://epdc-screen-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 8e801d07..b8dc72b1 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -204,6 +204,14 @@ spring: - Path=${server.servlet.context-path}/contentSecurity/** filters: - StripPrefix=1 + #大屏 + - id: epdc-screen-server + uri: @gateway.routes.epdc-screen-server.uri@ + order: 22 + predicates: + - Path=${server.servlet.context-path}/screen/** + filters: + - StripPrefix=1 nacos: discovery: server-addr: @nacos.server-addr@ diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/pom.xml b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/pom.xml new file mode 100644 index 00000000..180fea64 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-client/pom.xml @@ -0,0 +1,26 @@ + + + + epdc-screen + com.esua.epdc + 1.0.0 + + 4.0.0 + + epdc-screen-client + jar + + + com.esua.epdc + epdc-commons-tools + 1.0.0 + + + + + ${project.artifactId} + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/pom.xml b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/pom.xml new file mode 100644 index 00000000..34a6ca92 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/pom.xml @@ -0,0 +1,203 @@ + + + + epdc-screen + com.esua.epdc + 1.0.0 + + 4.0.0 + + epdc-screen-server + jar + + + + com.esua.epdc + epdc-screen-client + 1.0.0 + + + com.esua.epdc + epdc-commons-mybatis + 1.0.0 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-context-support + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + de.codecentric + spring-boot-admin-starter-client + ${spring.boot.admin.version} + + + com.esua.epdc + epdc-admin-client + 1.0.0 + + + + org.apache.rocketmq + rocketmq-spring-boot-starter + 2.0.2 + + + + + ${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 + + + + ${project.basedir}/src/main/java + + + + true + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + + ${basedir}/src/main/resources + + **/application*.yml + **/*.properties + logback-spring.xml + registry.conf + + + + + + + + + dev + + true + + + dev + + 9014 + + + 11 + r-v0l694084401a044pd.redis.rds.aliyuncs.com + 6379 + CJ!redis@elink + + + + + jinshui_epdc_test + jinshui@833066 + + + false + 47.104.92.53:8848 + + 845f2ce1-7dc6-4a2a-9d26-37c509fabad6 + + 47.104.85.99:9876;114.215.125.123:9876 + jinshui-organizationGroup + + + + + test + + test + + 11017 + + 11 + r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com + 10001 + elink!888 + + + + + jinshui_epdc_test + jinshui@833066 + + true + 115.29.142.202:8848 + 47.104.94.220 + 9c6a1a78-690f-4cfe-833b-f8cec174c6e8 + + 47.104.85.99:9876;114.215.125.123:9876 + jinshui-organizationGroup + + + + + prod + + prod + prod + + 9081 + + + 0 + 172.16.0.8 + 6379 + epdc!redis@master1405 + + + true + 172.16.0.7:10000,172.16.0.7:10001 + 172.16.0.7 + + + + + + epdc + epdc@jinshui888 + + + 172.16.0.7:9876;172.16.0.8:9876 + jinshui-organizationGroup + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/ScreenApplication.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/ScreenApplication.java new file mode 100644 index 00000000..13b9ba12 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/ScreenApplication.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 ScreenApplication { + + public static void main(String[] args) { + SpringApplication.run(ScreenApplication.class, args); + } + +} diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java new file mode 100644 index 00000000..97b38718 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-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 "screen"; + } +} diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/application.yml new file mode 100644 index 00000000..8dce3e57 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/application.yml @@ -0,0 +1,94 @@ +server: + port: @server.port@ + servlet: + context-path: /screen + +spring: + main: + allow-bean-definition-overriding: true + application: + name: epdc-screen-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@ + ip: @nacos.ip@ + namespace: @nacos.namespace@ + alibaba: + seata: + tx-service-group: epdc-screen-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@ + +feign: + hystrix: + enabled: true + httpclient: + enabled: true + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 60000 #缺省为1000 + +ribbon: + ReadTimeout: 300000 + ConnectTimeout: 300000 + +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + #实体扫描,多个package用逗号或者分号分隔 + typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity + global-config: + #数据库相关配置 + db-config: + #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID"; + id-type: ID_WORKER + #字段策略 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 + jdbc-type-for-null: 'null' + +rocketmq: + name-server: @rocketmq.name.server@ + consumer: + group: @rocketmq.consumer.group@ diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/messages.properties new file mode 100644 index 00000000..e69de29b diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 00000000..e69de29b diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/messages_zh_CN.properties new file mode 100644 index 00000000..e69de29b diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/messages_zh_TW.properties new file mode 100644 index 00000000..e69de29b diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/validation.properties new file mode 100644 index 00000000..e69de29b diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/validation_en_US.properties new file mode 100644 index 00000000..e69de29b diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/validation_zh_CN.properties new file mode 100644 index 00000000..e69de29b diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/i18n/validation_zh_TW.properties new file mode 100644 index 00000000..e69de29b diff --git a/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..1d5cdf4a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/logback-spring.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + 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-screen/epdc-screen-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/registry.conf new file mode 100644 index 00000000..b5f08984 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-screen/epdc-screen-server/src/main/resources/registry.conf @@ -0,0 +1,21 @@ +registry { + # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa + type = "nacos" + + nacos { + serverAddr = "@nacos.server-addr@" + namespace = "@nacos.namespace@" + cluster = "default" + } +} + +config { + # file、nacos 、apollo、zk、consul、etcd3 + type = "nacos" + + nacos { + serverAddr = "@nacos.server-addr@" + namespace = "@nacos.namespace@" + cluster = "default" + } +} diff --git a/esua-epdc/epdc-module/epdc-screen/pom.xml b/esua-epdc/epdc-module/epdc-screen/pom.xml new file mode 100644 index 00000000..41dac0f7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-screen/pom.xml @@ -0,0 +1,20 @@ + + + + epdc-module + com.esua.epdc + 1.0.0 + + 4.0.0 + + epdc-screen + pom + + epdc-screen-client + epdc-screen-server + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml index e071e96a..4e892696 100644 --- a/esua-epdc/epdc-module/pom.xml +++ b/esua-epdc/epdc-module/pom.xml @@ -34,6 +34,7 @@ epdc-points epdc-party-group epdc-content-security + epdc-screen