diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
index b10b2b805c..70f42dc1e2 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java
@@ -7,6 +7,20 @@ public interface DataSourceConstant {
String GOV_ORG = "govorg";
String GOV_ISSUE = "govissue";
+
+ /**
+ * 项目
+ */
String GOV_PROJECT = "govproject";
+ /**
+ * 小组
+ */
+ String RESI_GROUP = "resigroup";
+
+ /**
+ * 用户
+ */
+ String EPMET_USER = "epmetuser";
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 437209fc74..38a1c1f0c3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -113,6 +113,20 @@
epmet_gov_project_user
EpmEt-db-UsEr
+
+
+
+
+ epmet_resi_group_user
+ EpmEt-db-UsEr
+
+
+
+
+
+ epmet_user_user
+ EpmEt-db-UsEr
+
0
192.168.1.130
@@ -166,6 +180,20 @@
epmet_gov_project_user
EpmEt-db-UsEr
+
+
+
+
+ epmet_resi_group_user
+ EpmEt-db-UsEr
+
+
+
+
+
+ epmet_user_user
+ EpmEt-db-UsEr
+
0
192.168.1.130
@@ -219,6 +247,20 @@
epmet
elink@833066
+
+
+
+
+ epmet
+ elink@833066
+
+
+
+
+
+ epmet
+ elink@833066
+
0
r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
@@ -272,6 +314,20 @@
epmet_gov_project_user
EpmEt-db-UsEr
+
+
+
+
+ epmet_resi_group_user
+ EpmEt-db-UsEr
+
+
+
+
+
+ epmet_user_user
+ EpmEt-db-UsEr
+
0
r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
new file mode 100644
index 0000000000..fc3acacff7
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
@@ -0,0 +1,8 @@
+package com.epmet.dataaggre.service.epmetuser;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/25 上午9:20
+ */
+public interface EpmetUserService {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
new file mode 100644
index 0000000000..a992809a17
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -0,0 +1,17 @@
+package com.epmet.dataaggre.service.epmetuser.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/25 上午9:21
+ */
+@Service
+@DataSource(DataSourceConstant.EPMET_USER)
+@Slf4j
+public class EpmetUserServiceImpl implements EpmetUserService {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java
new file mode 100644
index 0000000000..72e4e7186a
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java
@@ -0,0 +1,8 @@
+package com.epmet.dataaggre.service.govissue;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/25 上午9:16
+ */
+public interface GovIssueService {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
new file mode 100644
index 0000000000..a666cfbbe1
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
@@ -0,0 +1,17 @@
+package com.epmet.dataaggre.service.govissue.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.service.govissue.GovIssueService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/25 上午9:16
+ */
+@Service
+@DataSource(DataSourceConstant.GOV_ISSUE)
+@Slf4j
+public class GovIssueServiceImpl implements GovIssueService {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
new file mode 100644
index 0000000000..862a7babc5
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@@ -0,0 +1,8 @@
+package com.epmet.dataaggre.service.govorg;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/25 上午9:15
+ */
+public interface GovOrgService {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
new file mode 100644
index 0000000000..ce2b198850
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -0,0 +1,17 @@
+package com.epmet.dataaggre.service.govorg.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.service.govorg.GovOrgService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/25 上午9:15
+ */
+@Service
+@DataSource(DataSourceConstant.GOV_ORG)
+@Slf4j
+public class GovOrgServiceImpl implements GovOrgService {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
new file mode 100644
index 0000000000..872188f23c
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java
@@ -0,0 +1,8 @@
+package com.epmet.dataaggre.service.resigroup;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/25 上午9:21
+ */
+public interface ResiGroupService {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
new file mode 100644
index 0000000000..d22d43dbf5
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
@@ -0,0 +1,17 @@
+package com.epmet.dataaggre.service.resigroup.impl;
+
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.service.resigroup.ResiGroupService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/12/25 上午9:21
+ */
+@Service
+@DataSource(DataSourceConstant.RESI_GROUP)
+@Slf4j
+public class ResiGroupServiceImpl implements ResiGroupService {
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
index 11887efc57..d4c130e09b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
@@ -108,6 +108,16 @@ dynamic:
url: @datasource.druid.govproject.url@
username: @datasource.druid.govproject.username@
password: @datasource.druid.govproject.password@
+ resigroup:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: @datasource.druid.resigroup.url@
+ username: @datasource.druid.resigroup.username@
+ password: @datasource.druid.resigroup.password@
+ epmetuser:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: @datasource.druid.epmetuser.url@
+ username: @datasource.druid.epmetuser.username@
+ password: @datasource.druid.epmetuser.password@
feign:
hystrix: