From 37572a4da7ae681cec1c7fb7972509d6e286c014 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 Jun 2020 16:22:30 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9Edata-report=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=202.=E4=BF=AE=E6=94=B9data-statistical=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E5=A2=9E=E5=8A=A0Dockerfile=EF=BC=8Cdeploy?= =?UTF-8?q?=E7=AD=89=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84pom=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report/data-report-client/pom.xml | 15 ++ .../data-report/data-report-server/Dockerfile | 11 ++ .../deploy/docker-compose-dev.yml | 17 ++ .../deploy/docker-compose-test.yml | 17 ++ .../data-report/data-report-server/pom.xml | 159 ++++++++++++++++++ .../java/com/epmet/DataReportApplication.java | 11 ++ .../com/epmet/config/ModuleConfigImpl.java | 24 +++ .../src/main/resources/bootstrap.yml | 119 +++++++++++++ epmet-module/data-report/pom.xml | 20 +++ .../data-statistical-server/Dockerfile | 11 ++ .../deploy/docker-compose-dev.yml | 17 ++ .../deploy/docker-compose-test.yml | 17 ++ .../data-statistical-server/pom.xml | 7 +- .../com/epmet/config/ModuleConfigImpl.java | 2 +- epmet-module/pom.xml | 4 +- 15 files changed, 446 insertions(+), 5 deletions(-) create mode 100644 epmet-module/data-report/data-report-client/pom.xml create mode 100644 epmet-module/data-report/data-report-server/Dockerfile create mode 100644 epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml create mode 100644 epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml create mode 100644 epmet-module/data-report/data-report-server/pom.xml create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/config/ModuleConfigImpl.java create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml create mode 100644 epmet-module/data-report/pom.xml create mode 100644 epmet-module/data-statistical/data-statistical-server/Dockerfile create mode 100644 epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml create mode 100644 epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml diff --git a/epmet-module/data-report/data-report-client/pom.xml b/epmet-module/data-report/data-report-client/pom.xml new file mode 100644 index 0000000000..f001810eaa --- /dev/null +++ b/epmet-module/data-report/data-report-client/pom.xml @@ -0,0 +1,15 @@ + + + + data-report + com.epmet + 2.0.0 + + 4.0.0 + + data-report-client + + + \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/Dockerfile b/epmet-module/data-report/data-report-server/Dockerfile new file mode 100644 index 0000000000..1f773a109f --- /dev/null +++ b/epmet-module/data-report/data-report-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8109 + +ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml new file mode 100644 index 0000000000..f2b8960a42 --- /dev/null +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml @@ -0,0 +1,17 @@ +version: "3.7" +services: + data-report-server: + container_name: data-report-server-dev + image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.1 + ports: + - "8109:8109" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/dev:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar" + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml new file mode 100644 index 0000000000..5181a184da --- /dev/null +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml @@ -0,0 +1,17 @@ +version: "3.7" +services: + data-report-server: + container_name: data-report-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-report-server:0.3.1 + ports: + - "8108:8108" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/test:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar" + deploy: + resources: + limits: + cpus: '0.1' + memory: 400M \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml new file mode 100644 index 0000000000..b8c65eda08 --- /dev/null +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -0,0 +1,159 @@ + + + + 0.3.1 + data-report-server + + + data-report + com.epmet + 2.0.0 + + 4.0.0 + + + + com.epmet + data-report-client + 2.0.0 + + + com.epmet + epmet-commons-mybatis + 2.0.0 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-context-support + + + org.springframework.boot + spring-boot-starter-actuator + + + de.codecentric + spring-boot-admin-starter-client + ${spring.boot.admin.version} + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.epmet + epmet-commons-service-call + 0.3.1 + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + ${project.basedir}/src/main/java + + + true + ${basedir}/src/main/resources + + + + + + + dev + + true + + + 8109 + dev + + + + + + epmet_data_statistical_user + EpmEt-db-UsEr + + + 0 + 118.190.150.119 + 47379 + 123456 + + + false + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + false + + + + test + + + 8109 + test + + + + + + epmet + elink@833066 + + + 0 + r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com + 6379 + EpmEtrEdIs!q@w + + + true + 192.168.10.150:8848 + 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae + + + false + + + + true + + + + + \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java new file mode 100644 index 0000000000..dced5aa566 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/DataReportApplication.java @@ -0,0 +1,11 @@ +package com.epmet; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DataReportApplication { + public static void main(String[] args) { + SpringApplication.run(DataReportApplication.class, args); + } +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/config/ModuleConfigImpl.java new file mode 100644 index 0000000000..c52ec15b50 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/config/ModuleConfigImpl.java @@ -0,0 +1,24 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.epmet.config; + +import com.epmet.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 "data-report"; + } +} diff --git a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000..19e6e4b584 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml @@ -0,0 +1,119 @@ +server: + port: @server.port@ + servlet: + context-path: /data/report + +spring: + main: + allow-bean-definition-overriding: true + application: + name: data-report-server + #环境 dev|test|prod + profiles: + active: dev + jackson: + time-zone: GMT+8 + date-format: yyyy-MM-dd HH:mm:ss + redis: + database: @spring.redis.index@ + host: @spring.redis.host@ + port: @spring.redis.port@ + password: @spring.redis.password@ + timeout: 30s + datasource: + druid: + #MySQL + driver-class-name: com.mysql.cj.jdbc.Driver + url: @datasource.druid.url@ + username: @datasource.druid.username@ + password: @datasource.druid.password@ + cloud: + nacos: + discovery: + server-addr: @nacos.server-addr@ + #nacos的命名空间ID，默认是public + namespace: @nacos.discovery.namespace@ + #不把自己注册到注册中心的地址 + register-enabled: @nacos.register-enabled@ + ip: @nacos.ip@ + config: + enabled: @nacos.config-enabled@ + server-addr: @nacos.server-addr@ + namespace: @nacos.config.namespace@ + group: @nacos.config.group@ + file-extension: yaml + #指定共享配置，且支持动态刷新 + # ext-config: + # - data-id: datasource.yaml + # group: ${spring.cloud.nacos.config.group} + # refresh: true + # - data-id: common.yaml + # group: ${spring.cloud.nacos.config.group} + # refresh: true + + # 数据迁移工具flyway + flyway: + enabled: false + locations: classpath:db/migration + url: @datasource.druid.url@ + user: @datasource.druid.username@ + password: @datasource.druid.password@ + baseline-on-migrate: true + baseline-version: 0 + +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.epmet.entity + global-config: + #数据库相关配置 + db-config: + #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID"; + id-type: INPUT + #字段策略 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' + +feign: + hystrix: + enabled: true + client: + config: + default: + loggerLevel: BASIC + httpclient: + enabled: true + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 60000 #缺省为1000 + +ribbon: + ReadTimeout: 300000 + ConnectTimeout: 300000 + +#pageHelper分页插件 +pagehelper: + helper-dialect: mysql + reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1 \ No newline at end of file diff --git a/epmet-module/data-report/pom.xml b/epmet-module/data-report/pom.xml new file mode 100644 index 0000000000..d85eb578fd --- /dev/null +++ b/epmet-module/data-report/pom.xml @@ -0,0 +1,20 @@ + + + + epmet-module + com.epmet + 2.0.0 + + 4.0.0 + + data-report + pom + + data-report-client + data-report-server + + + + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/Dockerfile b/epmet-module/data-statistical/data-statistical-server/Dockerfile new file mode 100644 index 0000000000..e592acbf38 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8108 + +ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml new file mode 100644 index 0000000000..de1ff9baa5 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml @@ -0,0 +1,17 @@ +version: "3.7" +services: + data-statistical-server: + container_name: data-statistical-server-dev + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.1 + ports: + - "8108:8108" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/dev:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar" + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml new file mode 100644 index 0000000000..7d80790041 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml @@ -0,0 +1,17 @@ +version: "3.7" +services: + data-statistical-server: + container_name: data-statistical-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/data-statistical-server:0.3.1 + ports: + - "8108:8108" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/test:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./app.jar" + deploy: + resources: + limits: + cpus: '0.1' + memory: 400M \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index dc90aa7c1c..f88c6d9031 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,6 +2,7 @@ + 0.3.1 data-statistical com.epmet @@ -151,10 +152,10 @@ - + - epmet - elink@833066 + epmet + elink@833066 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/ModuleConfigImpl.java index 5dfeb091b3..be1b632462 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/ModuleConfigImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/ModuleConfigImpl.java @@ -19,6 +19,6 @@ import org.springframework.stereotype.Service; public class ModuleConfigImpl implements ModuleConfig { @Override public String getName() { - return "data-stats"; + return "data-statistical"; } } diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml index 45ca155078..6a43dfe29f 100644 --- a/epmet-module/pom.xml +++ b/epmet-module/pom.xml @@ -38,6 +38,8 @@ gov-voice resi-voice data-statistical - + data-report + data-report +