group,user数据库添加

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";
+
 }

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -113,6 +113,20 @@
                 <datasource.druid.govproject.username>epmet_gov_project_user</datasource.druid.govproject.username>
                 <datasource.druid.govproject.password>EpmEt-db-UsEr</datasource.druid.govproject.password>
 
+                <!-- resi-group -->
+                <datasource.druid.resigroup.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.resigroup.url>
+                <datasource.druid.resigroup.username>epmet_resi_group_user</datasource.druid.resigroup.username>
+                <datasource.druid.resigroup.password>EpmEt-db-UsEr</datasource.druid.resigroup.password>
+
+                <!-- epmet-user -->
+                <datasource.druid.epmetuser.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmetuser.url>
+                <datasource.druid.epmetuser.username>epmet_user_user</datasource.druid.epmetuser.username>
+                <datasource.druid.epmetuser.password>EpmEt-db-UsEr</datasource.druid.epmetuser.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>
@@ -166,6 +180,20 @@
                 <datasource.druid.govproject.username>epmet_gov_project_user</datasource.druid.govproject.username>
                 <datasource.druid.govproject.password>EpmEt-db-UsEr</datasource.druid.govproject.password>
 
+                <!-- resi-group -->
+                <datasource.druid.resigroup.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.resigroup.url>
+                <datasource.druid.resigroup.username>epmet_resi_group_user</datasource.druid.resigroup.username>
+                <datasource.druid.resigroup.password>EpmEt-db-UsEr</datasource.druid.resigroup.password>
+
+                <!-- epmet-user -->
+                <datasource.druid.epmetuser.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmetuser.url>
+                <datasource.druid.epmetuser.username>epmet_user_user</datasource.druid.epmetuser.username>
+                <datasource.druid.epmetuser.password>EpmEt-db-UsEr</datasource.druid.epmetuser.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>
@@ -219,6 +247,20 @@
                 <datasource.druid.govproject.username>epmet</datasource.druid.govproject.username>
                 <datasource.druid.govproject.password>elink@833066</datasource.druid.govproject.password>
 
+                <!-- resi-group -->
+                <datasource.druid.resigroup.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.resigroup.url>
+                <datasource.druid.resigroup.username>epmet</datasource.druid.resigroup.username>
+                <datasource.druid.resigroup.password>elink@833066</datasource.druid.resigroup.password>
+
+                <!-- epmet-user -->
+                <datasource.druid.epmetuser.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmetuser.url>
+                <datasource.druid.epmetuser.username>epmet</datasource.druid.epmetuser.username>
+                <datasource.druid.epmetuser.password>elink@833066</datasource.druid.epmetuser.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@@ -272,6 +314,20 @@
                 <datasource.druid.govproject.username>epmet_gov_project_user</datasource.druid.govproject.username>
                 <datasource.druid.govproject.password>EpmEt-db-UsEr</datasource.druid.govproject.password>
 
+                <!-- resi-group -->
+                <datasource.druid.resigroup.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.resigroup.url>
+                <datasource.druid.resigroup.username>epmet_resi_group_user</datasource.druid.resigroup.username>
+                <datasource.druid.resigroup.password>EpmEt-db-UsEr</datasource.druid.resigroup.password>
+
+                <!-- epmet-user -->
+                <datasource.druid.epmetuser.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmetuser.url>
+                <datasource.druid.epmetuser.username>epmet_user_user</datasource.druid.epmetuser.username>
+                <datasource.druid.epmetuser.password>EpmEt-db-UsEr</datasource.druid.epmetuser.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>

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 {
+}

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 {
+}

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 {
+}

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 {
+}

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 {
+}

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 {
+}

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 {
+}

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 {
+}

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: