user模块添加多数据源配置，用户、党员相关数据从备库获取

esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

@@ -28,6 +28,11 @@
             <artifactId>epdc-commons-tools</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-dynamic-datasource</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-commons-mybatis</artifactId>
@@ -127,6 +132,12 @@
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
+                <dynamic.datasource.first.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </dynamic.datasource.first.url>
+                <dynamic.datasource.first.username>epdc</dynamic.datasource.first.username>
+                <dynamic.datasource.first.password>elink833066</dynamic.datasource.first.password>
+
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
@@ -151,6 +162,12 @@
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
+                <dynamic.datasource.first.url>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </dynamic.datasource.first.url>
+                <dynamic.datasource.first.username>epdc</dynamic.datasource.first.username>
+                <dynamic.datasource.first.password>elink833066</dynamic.datasource.first.password>
+
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.ip>219.146.91.110</nacos.ip>
@@ -226,6 +243,11 @@
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+                <dynamic.datasource.first.url>
+                    <![CDATA[jdbc:mysql://172.16.0.54:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </dynamic.datasource.first.url>
+                <dynamic.datasource.first.username>epdc</dynamic.datasource.first.username>
+                <dynamic.datasource.first.password>Elink@833066</dynamic.datasource.first.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>172.16.0.52:8848</nacos.server-addr>

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/datasources/DataSourceNames.java

@@ -0,0 +1,14 @@
+package com.elink.esua.epdc.datasources;
+
+/**
+ * 增加多数据源，除默认数据源外，每增加一个数据源，添加一个新的常量
+ *
+ * @author work@yujt.net.cn
+ * @date 2020/2/27 15:03
+ */
+public interface DataSourceNames {
+    /**
+     * 多数据源配置一，对应yml文件中 dynamic:datasource:first:
+     */
+    String FIRST = "first";
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserAuthenticateHistoryRedis.java

@@ -1,47 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.elink.esua.epdc.redis;
-
-import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 用户认证历史表
- *
- * @author qu qu@elink-cn.com
- * @since v1.0.0 2019-11-21
- */
-@Component
-public class UserAuthenticateHistoryRedis {
-    @Autowired
-    private RedisUtils redisUtils;
-
-    public void delete(Object[] ids) {
-
-    }
-
-    public void set(){
-
-    }
-
-    public String get(String id){
-        return null;
-    }
-
-}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java

@@ -18,17 +18,18 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.dao.PartyAuthenticationFailedDao;
+import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.dto.PartyAuthenticationFailedDTO;
 import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity;
 import com.elink.esua.epdc.service.PartyAuthenticationFailedService;
 import com.elink.esua.epdc.util.AppUserUtils;
 import com.google.common.collect.Lists;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,6 +47,7 @@ import java.util.Map;
 public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl<PartyAuthenticationFailedDao, PartyAuthenticationFailedEntity> implements PartyAuthenticationFailedService {
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public PageData<PartyAuthenticationFailedDTO> page(Map<String, Object> params) {
 
         String[] paramKeys = new String[]{"realName", "identityNo", "startTime", "endTime", "mobile"};
@@ -64,6 +66,7 @@ public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl<PartyA
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public List<PartyAuthenticationFailedDTO> list(Map<String, Object> params) {
         // 党员认证失败页面 查询条件：姓名, 手机号, 身份证号, 后端处理前后空格
         String[] paramKeys = new String[]{"realName", "identityNo", "mobile"};
@@ -74,6 +77,7 @@ public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl<PartyA
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public PartyAuthenticationFailedDTO get(String id) {
         PartyAuthenticationFailedEntity entity = baseDao.selectById(id);
         return ConvertUtils.sourceToTarget(entity, PartyAuthenticationFailedDTO.class);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java

@@ -19,11 +19,11 @@ package com.elink.esua.epdc.service.impl;
 
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
@@ -35,6 +35,7 @@ import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.StreamUtils;
 import com.elink.esua.epdc.dao.PartyMembersDao;
+import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.dto.PartyTagRelationDTO;
@@ -73,6 +74,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     private AdminFeignClient adminFeignClient;
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public PageData<PartyMembersDTO> page(Map<String, Object> params) {
         IPage<PartyMembersEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
@@ -82,11 +84,13 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<PageData<PartyMembersDTO>> pageDIY(Map<String, Object> params) {
         return new Result().ok(pagePartyMember(params, YesOrNoEnum.YES.value()));
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<PageData<PartyMembersDTO>> hasAuthenticationPartyPage(Map<String, Object> params) {
         return new Result().ok(pagePartyMember(params, YesOrNoEnum.NO.value()));
     }
@@ -161,6 +165,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public PartyMembersDTO get(String id) {
         PartyMembersDTO partyMembersDTO = baseDao.selectByIdNew(id);
         if (partyMembersDTO.getDeptStrIds() != null) {
@@ -252,7 +257,7 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         List<PartyMembersEntity> partyMembersEntityList = ConvertUtils.sourceToTarget(partyList, PartyMembersEntity.class);
         for (int i = 0; i < partyMembersEntityList.size(); i++) {
             PartyMembersEntity partyMembersEntity = partyMembersEntityList.get(i);
-            partyMembersEntity.setCadreFlag("0");
+            partyMembersEntity.setCadreFlag(YesOrNoEnum.NO.value());
             partyMembersEntity.setRegistFlag(PartyMemberRegFlagEnum.NO.getValue());
             partyMembersEntity.setGridName(null);
         }
@@ -268,12 +273,12 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
             List<PartyMembersEntity> partyMembersEntityList = baseDao.selectList(new QueryWrapper<PartyMembersEntity>());
             List<PartyMembersExcel> partyExportList = ExcelImportUtil.importExcel(f, PartyMembersExcel.class, importParams);
             // 去空格
-            List<PartyMembersExcel> partyList =new ArrayList<>();
+            List<PartyMembersExcel> partyList = new ArrayList<>();
-            for(PartyMembersExcel partyItem:partyExportList){
+            for (PartyMembersExcel partyItem : partyExportList) {
-                if(StringUtils.isNotBlank(partyItem.getIdentityNo())){
+                if (StringUtils.isNotBlank(partyItem.getIdentityNo())) {
                     partyItem.setIdentityNo(ModuleUtils.replaceIllegalCharacter(partyItem.getIdentityNo()));
                 }
-                if(StringUtils.isNotBlank(partyItem.getRealName())){
+                if (StringUtils.isNotBlank(partyItem.getRealName())) {
                     partyItem.setRealName(ModuleUtils.replaceIllegalCharacter(partyItem.getRealName()));
                 }
                 partyList.add(partyItem);
@@ -284,10 +289,10 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
                 return new Result().ok(epdcPartyErroyResultDtos);
             }
             saveList(partyList);
-            for (PartyMembersExcel partyMembers : partyList) {
+            /*for (PartyMembersExcel partyMembers : partyList) {
                 System.out.println("从Excel导入数据到数据库的详细为 ：{}" + JSON.toJSONString(partyMembers));
             }
-            System.out.println("从Excel导入数据一共 {} 行 " + partyList.size());
+            System.out.println("从Excel导入数据一共 {} 行 " + partyList.size());*/
         } catch (Exception e1) {
             throw new RuntimeException("导入失败：{}" + e1.getMessage());
         }
@@ -366,34 +371,15 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
 
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public List<PartyMembersDTO> exportHasMoudle(Map<String, Object> params) {
-        checkParam(params);
-        return baseDao.hasAuthenticationPartyPage(params);
-    }
 
+        params = trimParamValue(params);
 
-    /***
+        return baseDao.hasAuthenticationPartyPage(params);
-     *
-     * @param params
-     * @return void
-     * @author qushutong
-     * @date 2019/12/29 14:51
-     */
-    private void checkParam(Map<String, Object> params) {
-        String realName = (String) params.get("realName");
-        String mobile = (String) params.get("mobile");
-        String identityNo = (String) params.get("identityNo");
-        if (StringUtils.isNotBlank(realName)) {
-            params.put("realName", realName.trim());
-        }
-        if (StringUtils.isNotBlank(mobile)) {
-            params.put("mobile", mobile.trim());
-        }
-        if (StringUtils.isNotBlank(identityNo)) {
-            params.put("identityNo", identityNo.trim());
-        }
     }
 
+
     @Override
     public Result upDataInfo(List<UserEntity> userEntities) {
         List<PartyMembersEntity> partyMembersEntityList = new ArrayList<>();

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserAuthenticateHistoryServiceImpl.java

@@ -19,20 +19,20 @@ package com.elink.esua.epdc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao;
+import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcAuthenticateHistoryFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
 import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
-import com.elink.esua.epdc.redis.UserAuthenticateHistoryRedis;
 import com.elink.esua.epdc.service.UserAuthenticateHistoryService;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -49,9 +49,6 @@ import java.util.Map;
 @Service
 public class UserAuthenticateHistoryServiceImpl extends BaseServiceImpl<UserAuthenticateHistoryDao, UserAuthenticateHistoryEntity> implements UserAuthenticateHistoryService {
 
-    @Autowired
-    private UserAuthenticateHistoryRedis userAuthenticateHistoryRedis;
-
     @Override
     public PageData<UserAuthenticateHistoryDTO> page(Map<String, Object> params) {
         IPage<UserAuthenticateHistoryEntity> page = baseDao.selectPage(
@@ -62,14 +59,15 @@ public class UserAuthenticateHistoryServiceImpl extends BaseServiceImpl<UserAuth
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public List<UserAuthenticateHistoryDTO> list(Map<String, Object> params) {
         List<UserAuthenticateHistoryEntity> entityList = baseDao.selectList(getWrapper(params));
 
         return ConvertUtils.sourceToTarget(entityList, UserAuthenticateHistoryDTO.class);
     }
 
-    private QueryWrapper<UserAuthenticateHistoryEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<UserAuthenticateHistoryEntity> getWrapper(Map<String, Object> params) {
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<UserAuthenticateHistoryEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -78,6 +76,7 @@ public class UserAuthenticateHistoryServiceImpl extends BaseServiceImpl<UserAuth
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public UserAuthenticateHistoryDTO get(String id) {
         UserAuthenticateHistoryEntity entity = baseDao.selectById(id);
         return ConvertUtils.sourceToTarget(entity, UserAuthenticateHistoryDTO.class);
@@ -112,6 +111,7 @@ public class UserAuthenticateHistoryServiceImpl extends BaseServiceImpl<UserAuth
      * @Date 2019/11/21 14:01
      **/
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public List<UserAuthenticateHistoryEntity> listUserAuthenticateHistory(String userId) {
         return baseDao.selectListUserAuthenticateHistory(userId);
     }
@@ -124,6 +124,7 @@ public class UserAuthenticateHistoryServiceImpl extends BaseServiceImpl<UserAuth
      * @Date 2019/11/22 13:17
      **/
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO) {
         return new Result<List<EpdcAuthenticateHistoryResultDTO>>().ok(baseDao.selectListAuthenticateHistory(formDTO.getUserId()));
     }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -24,6 +24,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
 import com.elink.esua.epdc.commons.mybatis.enums.EpdcDelFlagEnum;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -40,6 +41,7 @@ import com.elink.esua.epdc.dao.PartyAuthenticationFailedDao;
 import com.elink.esua.epdc.dao.PartyMembersDao;
 import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao;
 import com.elink.esua.epdc.dao.UserDao;
+import com.elink.esua.epdc.datasources.DataSourceNames;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO;
@@ -109,6 +111,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     private PartyAuthenticationFailedDao partyAuthenticationFailedDao;
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public PageData<UserDTO> page(Map<String, Object> params) {
         String[] paramKeys = new String[]{"streetId", "communityId", "gridId", "realName", "identityNo", "startTime", "endTime", "nickname", "mobile"};
         if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
@@ -137,6 +140,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public UserDTO get(String id) {
         UserEntity entity = baseDao.selectById(id);
         UserDTO resultDTO = ConvertUtils.sourceToTarget(entity, UserDTO.class);
@@ -327,6 +331,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<EpdcUserInfoResultDTO> getInfoById(String id) {
 
         return new Result<EpdcUserInfoResultDTO>().ok(baseDao.selectOneInfoById(id));
@@ -377,6 +382,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<EpdcUserRegisterAuditMsgResultDTO> getUserRegisterAuditResult(String userId) {
         EpdcUserRegisterAuditMsgResultDTO dto = this.baseDao.getUserRegisterAuditResult(userId);
         return new Result().ok(dto);
@@ -568,6 +574,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<String> verifyUserCompleteData(UserDTO userDto) {
 
         String userId = userDto.getId();
@@ -694,6 +701,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      * @return
      */
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
         if (StringUtils.isBlank(userId)) {
             return new Result<EpdcResidentDetailResultDTO>().error("用户Id不能为空");
@@ -753,6 +761,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      * @return
      */
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId) {
         if (StringUtils.isBlank(userId)) {
             return new Result<EpdcPartyMemberDetailDto>().error("用户Id不能为空");
@@ -772,6 +781,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) {
 //        authenticatedFlag是否已认证 0否 1是
 //        partyFlag 是否党员，0否，1是
@@ -803,11 +813,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<Integer> getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) {
         return new Result<Integer>().ok(baseDao.selectCountUnauthorizedAmount(fromDto));
     }
 
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<EpdcUserRegisterInfoResultDTO> getUserLastSwitchGird(String openId) {
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId)
@@ -840,6 +852,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      * @Date 2019/12/7 13:58
      **/
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<UserDTO> queryUserDto(EpdcAppQueryUserInfoFormDTO formDto) {
         UserDTO user = selectUserByWxInfo(formDto.getOpenId(), formDto.getUnionId());
         return new Result().ok(user);
@@ -854,6 +867,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      * @Date 2019/12/19 15:03
      **/
     @Override
+    @DataSource(value = DataSourceNames.FIRST)
     public Result<List<EpdcGridUserResultDTO>> listGridUserResultDTO(List<Long> gridIdList) {
         return new Result<List<EpdcGridUserResultDTO>>().ok(baseDao.selectListGridUserResultDTO(gridIdList));
     }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/application.yml

@@ -40,12 +40,28 @@ spring:
     alibaba:
       seata:
         tx-service-group: epdc-user-server-fescar-service-group
+  # 默认数据源
   datasource:
     druid:
-      driver-class-name: com.mysql.jdbc.Driver
+      driverClassName: com.mysql.jdbc.Driver
       url: @spring.datasource.druid.url@
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
+      initialSize: 10
+      maxActive: 100
+      minIdle: 10
+
+# 多数据源配置
+dynamic:
+  datasource:
+    first:
+      driverClassName: com.mysql.jdbc.Driver
+      url: @dynamic.datasource.first.url@
+      username: @dynamic.datasource.first.username@
+      password: @dynamic.datasource.first.password@
+      initialSize: 10
+      maxActive: 100
+      minIdle: 10
 
 management:
   endpoints: