diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
index cfd2a8f33..b9de49f0e 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
@@ -226,5 +226,39 @@
Elink833066
+
+
+ prod_shibei_aliyun
+
+ 9055
+ prod
+ prod
+
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+ true
+ 172.16.0.52:8848
+
+ http://172.31.171.61:9411
+
+
+ wx5d3e97461d248397
+ bfed51b731e53db9affb9e6131e7ae12
+
+ wx9f20a46906ab2c3e
+ dc13065f79429979d9f687d249eb5c4e
+
+
+
+
+ epdc
+ Elink@833066
+
+
diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml
index a34114ce5..68f4e75d8 100644
--- a/esua-epdc/epdc-auth/pom.xml
+++ b/esua-epdc/epdc-auth/pom.xml
@@ -159,6 +159,27 @@
+
+ prod_shibei_aliyun
+
+ 9056
+ prod
+ prod
+
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+ true
+ 172.16.0.52:8848
+
+ http://172.31.171.61:9411
+
+
+
prod_kongcun
diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index 89a70d17e..689f4d55d 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -254,6 +254,45 @@
http://localhost:9411
+
+
+ prod_shibei_aliyun
+
+ 9094
+ prod
+
+
+ lb://epdc-auth-server
+ lb://epdc-admin-server
+ lb://epdc-activiti-server
+ lb://epdc-api-server
+ lb://epdc-app-server
+ lb://epdc-heart-server
+ lb://epdc-job-server
+ lb://epdc-message-server
+ lb://epdc-news-server
+ lb://epdc-oss-server
+ lb://epdc-events-server
+ lb://epdc-services-server
+ lb://epdc-user-server
+ lb://epdc-demo-server
+ lb://epdc-group-server
+ lb://epdc-websocket-server
+ lb://epdc-kpi-server
+
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+ true
+ 172.16.0.52:8848
+
+ http://localhost:9411
+
+
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
index a9f4891d6..7f38b18ef 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
@@ -278,6 +278,42 @@
071b8c70da0d0482aaf79052e64f83bc
+
+
+ prod_shibei_aliyun
+
+ prod
+ prod
+
+ 9040
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.0.52:8848
+
+
+ wx3ef8f2cd12a19fcb
+ 948aa2f21dbaa3943288ea5b119ac6f2
+ 111
+ 111
+
+ wx5d3e97461d248397
+ bfed51b731e53db9affb9e6131e7ae12
+
+ wx9f20a46906ab2c3e
+ dc13065f79429979d9f687d249eb5c4e
+
+
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 4b9abf68a..92bf20d64 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -283,11 +283,11 @@ public class AppUserServiceImpl implements AppUserService {
// 组装用户注册信息
EpdcGridLeaderRegisterDTO gridLeaderRegister = this.packageGridLeaderWhileRegister(leaderRegisterDto.getSysUser(), formDto.getWxCode());
List userGridList = ConvertUtils.sourceToTarget(leaderRegisterDto.getLeaderGridList(), UserGridRelationDTO.class);
- for(UserGridRelationDTO item: userGridList){
- item.setAllDeptNames(item.getDistrict()+"-"+item.getStreet()+"-"+item.getCommunity()+"-"+item.getGrid());
- item.setAllDeptIds(item.getDistrictId()+","+item.getStreetId()+","+item.getCommunityId()+","+item.getGridId());
- item.setParentDeptIds(item.getDistrict()+"-"+item.getStreet()+"-"+item.getCommunity());
- item.setParentDeptNames(item.getDistrictId()+","+item.getStreetId()+","+item.getCommunityId());
+ for (UserGridRelationDTO item : userGridList) {
+ item.setAllDeptNames(item.getDistrict() + "-" + item.getStreet() + "-" + item.getCommunity() + "-" + item.getGrid());
+ item.setAllDeptIds(item.getDistrictId() + "," + item.getStreetId() + "," + item.getCommunityId() + "," + item.getGridId());
+ item.setParentDeptIds(item.getDistrict() + "-" + item.getStreet() + "-" + item.getCommunity());
+ item.setParentDeptNames(item.getDistrictId() + "," + item.getStreetId() + "," + item.getCommunityId());
}
EpdcGridLeaderRegisterFormDTO registerDto = new EpdcGridLeaderRegisterFormDTO();
registerDto.setGridLeader(gridLeaderRegister);
@@ -804,7 +804,7 @@ public class AppUserServiceImpl implements AppUserService {
return new Result().error(verification);
}
}
- }else {
+ } else {
userDto.setIdentityNo(null);
}
// 验证手机号
@@ -827,7 +827,7 @@ public class AppUserServiceImpl implements AppUserService {
Result completeResult = userFeignClient.completeUserInfo(dto);
if (!completeResult.success()) {
//党员认证失败
- if(100006001==completeResult.getCode()){
+ if (100006001 == completeResult.getCode()) {
EpdcAppAuthorizationDTO authorizationDto = new EpdcAppAuthorizationDTO();
authorizationDto.setResultCode(YesOrNoEnum.YES.value());
authorizationDto.setResultMsg(completeResult.getMsg());
@@ -867,7 +867,7 @@ public class AppUserServiceImpl implements AppUserService {
if (result.success() && null != result.getData()) {
EpdcCompleteUserInfoDTO dto = ConvertUtils.sourceToTarget(result.getData(), EpdcCompleteUserInfoDTO.class);
if (("0").equals(result.getData().getState())) {
- dto.setGridId(tokenDto.getGridId());
+ dto.setGridId(tokenDto.getGridId());
//未完善信息获取用户当前所在的网格的后两级机构(社区-网格),返回给前端
Result resultParentAndAllDeptDTO = adminFeignClient.getParentAndAllDept(dto.getGridId());
if (resultParentAndAllDeptDTO.success() && null != resultParentAndAllDeptDTO.getData()) {
@@ -963,9 +963,15 @@ public class AppUserServiceImpl implements AppUserService {
}
String sessionKey = this.getUserSessionKey(formDto.getWxCode());
WxMaUserInfo wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, formDto.getEncryptedData(), formDto.getIv());
- if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) {
- // 标准文案后续修改
- return new Result().error("微信接口异常");
+ // 是否需要unionId,0 否 1 是
+ Object requireUnionid = redisUtils.get("epdc:unionid:require");
+ if (null != requireUnionid && YesOrNoEnum.NO.value().equals(requireUnionid.toString())) {
+ log.info("更新用户微信信息,不考虑微信unionid");
+ } else {
+ if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) {
+ // 标准文案后续修改
+ return new Result().error("微信接口异常");
+ }
}
UserDTO userDTO = new UserDTO();
userDTO.setId(userDetail.getUserId());
@@ -1031,7 +1037,7 @@ public class AppUserServiceImpl implements AppUserService {
*/
private void joinGridPartyGroup(UserDTO userDto, List userGridList, String lordFlag) {
List formDTOList = new ArrayList<>(userGridList.size());
- for (UserGridRelationDTO dto:
+ for (UserGridRelationDTO dto :
userGridList) {
GroupUserFormDTO formDto = new GroupUserFormDTO();
formDto.setUserId(userDto.getId());
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
index 78593c756..0364cab99 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
@@ -267,6 +267,39 @@
071b8c70da0d0482aaf79052e64f83bc
+
+
+ prod_shibei_aliyun
+
+ prod
+
+ 9066
+
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.0.52:8848
+
+ prod
+
+
+ wx5d3e97461d248397
+ bfed51b731e53db9affb9e6131e7ae12
+
+ wx9f20a46906ab2c3e
+ dc13065f79429979d9f687d249eb5c4e
+
+
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
index 7147273a5..fd32da726 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
@@ -205,6 +205,30 @@
172.16.1.238:8848
+
+ prod_shibei_aliyun
+
+ prod
+ prod
+
+ 9063
+
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.0.52:8848
+
+
diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
index d5f56d19c..b5e3eb9bc 100644
--- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
@@ -232,6 +232,30 @@
172.16.1.238:8848
+
+
+ prod_shibei_aliyun
+
+ prod
+ prod
+
+ 9061
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.0.52:8848
+
+
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
index 85a1fa225..fb3654e64 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
@@ -232,6 +232,30 @@
172.16.1.238:8848
+
+
+ prod_shibei_aliyun
+
+ prod
+ prod
+
+ 9062
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.0.52:8848
+
+
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
index da580cc04..e3877629b 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
@@ -198,6 +198,30 @@
172.16.1.238:8848
+
+
+ prod_shibei_aliyun
+
+ prod
+ prod
+
+ 9064
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.0.52:8848
+
+
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
index c077ee66b..dca5df69a 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
@@ -251,5 +251,32 @@
172.16.1.239:22122
+
+
+ prod_shibei_aliyun
+
+ prod
+ prod
+
+ 9065
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.0.52:8848
+
+
+ 172.16.0.51:22122
+
+
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
index 2af539586..c7004cb56 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
@@ -204,6 +204,31 @@
172.16.1.238:8848
+
+
+ prod_shibei_aliyun
+
+ prod
+ prod
+
+ 9068
+
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.0.52:8848
+
+
diff --git a/esua-epdc/epdc-module/epdc-webservice/pom.xml b/esua-epdc/epdc-module/epdc-webservice/pom.xml
index 3872a5966..dc624d054 100644
--- a/esua-epdc/epdc-module/epdc-webservice/pom.xml
+++ b/esua-epdc/epdc-module/epdc-webservice/pom.xml
@@ -205,5 +205,28 @@
172.16.1.238:8848
+
+ prod_shibei_aliyun
+
+ 9075
+ prod
+
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+
+ true
+ 172.16.0.52:8848
+
+
diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
index e7228bb19..0e87d80e2 100644
--- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml
@@ -263,6 +263,39 @@
3980e207b86bccea8d3c0bf7d16adeba
+
+
+ prod_shibei_aliyun
+
+ prod
+ prod
+
+ 9988
+
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.0.52:8848
+
+ wx3ef8f2cd12a19fcb
+ 948aa2f21dbaa3943288ea5b119ac6f2
+ 111
+ 111
+
+ wx5d3e97461d248397
+ bfed51b731e53db9affb9e6131e7ae12
+
+