diff --git a/epmet-module/data-statistician/data-statistician-server/pom.xml b/epmet-module/data-statistician/data-statistician-server/pom.xml new file mode 100644 index 0000000000..b6950f5e36 --- /dev/null +++ b/epmet-module/data-statistician/data-statistician-server/pom.xml @@ -0,0 +1,179 @@ + + + + data-statistician + com.epmet + 2.0.0 + + 4.0.0 + + data-statistician-server + + + + com.epmet + data-statistician-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 + + + 8108 + dev + + + + + + epmet_gov_access_user + EpmEt-db-UsEr + + + + + epmet_gov_org_user + EpmEt-db-UsEr + + + + + epmet_gov_issue_user + EpmEt-db-UsEr + + + 0 + 192.168.1.130 + 6379 + 123456 + + false + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + false + + + + test + + + 8108 + test + + + + + + epmet + elink@833066 + + + + + epmet + elink@833066 + + + + + 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-statistician/data-statistician-server/src/main/java/com/epmet/DataStatsApplication.java b/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/DataStatsApplication.java new file mode 100644 index 0000000000..93cf107f30 --- /dev/null +++ b/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/DataStatsApplication.java @@ -0,0 +1,15 @@ +package com.epmet; + +import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.config.DatasourceConfig; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +@SpringBootApplication (exclude = {DataSourceAutoConfiguration.class}) +public class DataStatsApplication { + + public static void main(String[] args) { + SpringApplication.run(DataStatsApplication.class ,args); + } +} diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/config/DatasourceConfig.java b/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/config/DatasourceConfig.java new file mode 100644 index 0000000000..b201ae72e9 --- /dev/null +++ b/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/config/DatasourceConfig.java @@ -0,0 +1,11 @@ +package com.epmet.config; + +import com.epmet.properties.DatasourceProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Configuration +@EnableConfigurationProperties(value = DatasourceProperties.class) +public class DatasourceConfig { + +} diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/config/ModuleConfigImpl.java new file mode 100644 index 0000000000..5dfeb091b3 --- /dev/null +++ b/epmet-module/data-statistician/data-statistician-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-stats"; + } +} diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/controller/DemoController.java new file mode 100644 index 0000000000..60008f3f4c --- /dev/null +++ b/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/controller/DemoController.java @@ -0,0 +1,24 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.config.DatasourceConfig; +import com.epmet.properties.DatasourceProperties; +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; + +@RequestMapping("demo") +@RestController +public class DemoController { + + @Autowired + private DatasourceProperties datasourceProperties; + + @GetMapping("demo") + public void demo() { + System.out.println(datasourceProperties); + } + + +} diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/properties/DatasourceProperties.java b/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/properties/DatasourceProperties.java new file mode 100644 index 0000000000..21d3665add --- /dev/null +++ b/epmet-module/data-statistician/data-statistician-server/src/main/java/com/epmet/properties/DatasourceProperties.java @@ -0,0 +1,67 @@ +package com.epmet.properties; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +import java.util.List; + +/** + * 数据源属性 + */ +@Data +@ConfigurationProperties(prefix = "stats") +public class DatasourceProperties { + + private List datasources; + + /** + * 数据源配置内部类 + */ + public static class DatasourceInfo { + private String name; + private String driverClassName; + private String url; + private String username; + private String password; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDriverClassName() { + return driverClassName; + } + + public void setDriverClassName(String driverClassName) { + this.driverClassName = driverClassName; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + } +} diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistician/data-statistician-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000..bf29c4cfbe --- /dev/null +++ b/epmet-module/data-statistician/data-statistician-server/src/main/resources/bootstrap.yml @@ -0,0 +1,133 @@ +server: + port: @server.port@ + servlet: + context-path: /data/stats + +spring: + main: + allow-bean-definition-overriding: true + application: + name: data-statistician-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: jdbc:mysql://192.168.1.130:3306/epmet_gov_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + username: epmet_gov_access_user + password: EpmEt-db-UsEr + 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: jdbc:mysql://192.168.1.130:3306/epmet_gov_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + user: epmet_gov_access_user + password: EpmEt-db-UsEr + baseline-on-migrate: true + baseline-version: 0 + +stats: + datasources: + - name: statsDatasource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @datasource.druid.stats.url@ + username: @datasource.druid.stats.username@ + password: @datasource.druid.stats.password@ + - name: orgDatasource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @datasource.druid.org.url@ + username: @datasource.druid.org.username@ + password: @datasource.druid.org.password@ + +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: 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' + +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 + diff --git a/epmet-module/data-statistician/data-statistician-server/src/main/resources/db/migration/V0.0.1__demo.sql b/epmet-module/data-statistician/data-statistician-server/src/main/resources/db/migration/V0.0.1__demo.sql new file mode 100644 index 0000000000..7a51a3f595 --- /dev/null +++ b/epmet-module/data-statistician/data-statistician-server/src/main/resources/db/migration/V0.0.1__demo.sql @@ -0,0 +1 @@ +select 0; \ No newline at end of file