diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index f84f5cdc9..c88992544 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -128,6 +128,7 @@ lb://epdc-websocket-server lb://epdc-kpi-server + lb://epdc-points-server false 47.104.224.45:8848 @@ -167,6 +168,7 @@ lb://epdc-group-server lb://epdc-websocket-server lb://epdc-kpi-server + lb://epdc-points-server true @@ -202,6 +204,7 @@ lb://epdc-group-server lb://epdc-websocket-server lb://epdc-kpi-server + lb://epdc-points-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 bb363122e..3908b03c0 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -146,6 +146,14 @@ spring: - Path=${server.servlet.context-path}/kpi/** filters: - StripPrefix=1 + #绩效考核模块 + - id: epdc-kpi-server + uri: @gateway.routes.epdc-kpi-server.uri@ + order: 17 + predicates: + - Path=${server.servlet.context-path}/points/** + filters: + - StripPrefix=1 nacos: discovery: server-addr: @nacos.server-addr@ @@ -198,7 +206,6 @@ renren: - /activiti/service/** - /activiti/editor-app/** - /message/sms/sendCode #发送验证码 - - /heart/** - /oss/file/download - /ws/** workLoginUrls: diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/Dockerfile b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/Dockerfile new file mode 100755 index 000000000..d9a1f64c6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/Dockerfile @@ -0,0 +1,20 @@ +# 基础镜像 +FROM adoptopenjdk/openjdk11 +# 作者 +MAINTAINER rongchao@elink-cn.com +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 +ARG JAR_FILE +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 +ARG JAR_NAME +# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 +ARG SERVER_PORT +# 复制打包完成后的jar文件到/opt目录下 +ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar +ADD ${JAR_FILE} $JAR_PATH +# /data设为环境变量 +ENV DATAPATH /data +# 挂载/data目录到主机 +VOLUME $DATAPATH +# 启动容器时执行 +ENTRYPOINT java -jar -Xmx1024m $JAR_PATH +EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/HeartApplication.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/HeartApplication.java index 875fb9800..1eed28f50 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/HeartApplication.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/HeartApplication.java @@ -25,7 +25,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; public class HeartApplication { public static void main(String[] args) { - SpringApplication.run(HeartApplication.class, args); + SpringApplication.run(PointsApplication.class, args); } } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/Dockerfile b/esua-epdc/epdc-module/epdc-job/epdc-job-server/Dockerfile new file mode 100755 index 000000000..d9a1f64c6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/Dockerfile @@ -0,0 +1,20 @@ +# 基础镜像 +FROM adoptopenjdk/openjdk11 +# 作者 +MAINTAINER rongchao@elink-cn.com +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 +ARG JAR_FILE +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 +ARG JAR_NAME +# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 +ARG SERVER_PORT +# 复制打包完成后的jar文件到/opt目录下 +ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar +ADD ${JAR_FILE} $JAR_PATH +# /data设为环境变量 +ENV DATAPATH /data +# 挂载/data目录到主机 +VOLUME $DATAPATH +# 启动容器时执行 +ENTRYPOINT java -jar -Xmx1024m $JAR_PATH +EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/Dockerfile b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/Dockerfile new file mode 100755 index 000000000..d9a1f64c6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-neighbor/epdc-neighbor-server/Dockerfile @@ -0,0 +1,20 @@ +# 基础镜像 +FROM adoptopenjdk/openjdk11 +# 作者 +MAINTAINER rongchao@elink-cn.com +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 +ARG JAR_FILE +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 +ARG JAR_NAME +# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 +ARG SERVER_PORT +# 复制打包完成后的jar文件到/opt目录下 +ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar +ADD ${JAR_FILE} $JAR_PATH +# /data设为环境变量 +ENV DATAPATH /data +# 挂载/data目录到主机 +VOLUME $DATAPATH +# 启动容器时执行 +ENTRYPOINT java -jar -Xmx1024m $JAR_PATH +EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/pom.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-client/pom.xml new file mode 100644 index 000000000..73ab0b2b7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/pom.xml @@ -0,0 +1,15 @@ + + + + epdc-points + com.esua.epdc + 1.0.0 + + 4.0.0 + + epdc-points-client + jar + + diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/Dockerfile b/esua-epdc/epdc-module/epdc-points/epdc-points-server/Dockerfile new file mode 100755 index 000000000..d9a1f64c6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/Dockerfile @@ -0,0 +1,20 @@ +# 基础镜像 +FROM adoptopenjdk/openjdk11 +# 作者 +MAINTAINER rongchao@elink-cn.com +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 +ARG JAR_FILE +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 +ARG JAR_NAME +# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 +ARG SERVER_PORT +# 复制打包完成后的jar文件到/opt目录下 +ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar +ADD ${JAR_FILE} $JAR_PATH +# /data设为环境变量 +ENV DATAPATH /data +# 挂载/data目录到主机 +VOLUME $DATAPATH +# 启动容器时执行 +ENTRYPOINT java -jar -Xmx1024m $JAR_PATH +EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml new file mode 100644 index 000000000..7e5d60b54 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml @@ -0,0 +1,163 @@ + + + + epdc-points + com.esua.epdc + 1.0.0 + + 4.0.0 + + epdc-points-server + jar + + + + com.esua.epdc + epdc-points-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 + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + de.codecentric + spring-boot-admin-starter-client + ${spring.boot.admin.version} + + + + org.springframework.cloud + spring-cloud-starter-zipkin + + + + + ${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 + + 9060 + + 2 + 47.104.224.45 + 6379 + elink@888 + + + + + root + shibei@888 + + true + 47.104.224.45:8848 + + http://localhost:9411 + + + + + test + + test + + 9060 + + 2 + 47.104.224.45 + 6379 + elink@888 + + + + + epdc + elink888 + + false + 47.104.224.45:8848 + + http://localhost:9411 + + + + + prod + + prod + + 9060 + + 2 + 47.104.224.45 + 6379 + elink@888 + + + + + epdc + elink888 + + false + 47.104.224.45:8848 + + http://localhost:9411 + + + + diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/PointsApplication.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/PointsApplication.java new file mode 100644 index 000000000..8f2b9aa29 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/PointsApplication.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.1.0 + */ +@SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients +public class PointsApplication { + + public static void main(String[] args) { + SpringApplication.run(PointsApplication.class, args); + } + +} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java new file mode 100644 index 000000000..a91d50d2b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-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 "heart"; + } +} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java new file mode 100644 index 000000000..48e87c871 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.DemoDto; +import com.elink.esua.epdc.feign.DemoFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/8/23 10:59 + */ +@RestController +@RequestMapping("demo") +public class DemoController { + + + @Autowired + private DemoFeignClient demoFeignClient; + + + @GetMapping("listAll") + public Result> listDemo(){ + Result> listResult = demoFeignClient.listDemo(); + return listResult; + } +} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml new file mode 100644 index 000000000..4a4b07d69 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml @@ -0,0 +1,75 @@ +server: + port: @server.port@ + servlet: + context-path: /points + +spring: + application: + name: epdc-points-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-heart-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@ + zipkin: + # 指定了 zipkin 服务器的地址 + base-url: @spring.zipkin.base-url@ + sleuth: + sampler: + # 将采样比例设置为 1.0，也就是全部都需要。默认是 0.1 + probability: 1.0 + + +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' diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages_en_US.properties b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages_zh_CN.properties b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages_zh_CN.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages_zh_TW.properties b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages_zh_TW.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation.properties b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation_en_US.properties b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation_en_US.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation_zh_CN.properties b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation_zh_CN.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation_zh_TW.properties b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation_zh_TW.properties new file mode 100644 index 000000000..e69de29bb diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..e357d9282 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/registry.conf new file mode 100644 index 000000000..9cfedf9cc --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-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-points/pom.xml b/esua-epdc/epdc-module/epdc-points/pom.xml new file mode 100644 index 000000000..c15cfe38f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/pom.xml @@ -0,0 +1,20 @@ + + + + epdc-module + com.esua.epdc + 1.0.0 + + 4.0.0 + + epdc-points + pom + + epdc-points-client + epdc-points-server + + + + diff --git a/esua-epdc/epdc-module/epdc-services/epdc-services-server/Dockerfile b/esua-epdc/epdc-module/epdc-services/epdc-services-server/Dockerfile new file mode 100755 index 000000000..d9a1f64c6 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-services/epdc-services-server/Dockerfile @@ -0,0 +1,20 @@ +# 基础镜像 +FROM adoptopenjdk/openjdk11 +# 作者 +MAINTAINER rongchao@elink-cn.com +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 +ARG JAR_FILE +# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 +ARG JAR_NAME +# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 +ARG SERVER_PORT +# 复制打包完成后的jar文件到/opt目录下 +ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar +ADD ${JAR_FILE} $JAR_PATH +# /data设为环境变量 +ENV DATAPATH /data +# 挂载/data目录到主机 +VOLUME $DATAPATH +# 启动容器时执行 +ENTRYPOINT java -jar -Xmx1024m $JAR_PATH +EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml index 179020534..d18565c7e 100644 --- a/esua-epdc/epdc-module/pom.xml +++ b/esua-epdc/epdc-module/pom.xml @@ -29,6 +29,7 @@ epdc-group epdc-websocket epdc-kpi + epdc-points