Commit 11a609fe by xugaojun

添加尊兴id,修改配置,修改suitId

parent 256f85c6
...@@ -23,8 +23,6 @@ public class Config { ...@@ -23,8 +23,6 @@ public class Config {
@Value("${memberOpenPage}") @Value("${memberOpenPage}")
private String memberOpenPage; private String memberOpenPage;
@Value("${historyMbrMassEnterpriseWhiteList}")
private String historyMbrMassEnterpriseWhiteList;
@Value("${historyMbrMassOperWhiteList}") @Value("${historyMbrMassOperWhiteList}")
private String historyMbrMassOperWhiteList; private String historyMbrMassOperWhiteList;
...@@ -76,14 +74,6 @@ public class Config { ...@@ -76,14 +74,6 @@ public class Config {
this.wxSuiteid = wxSuiteid; this.wxSuiteid = wxSuiteid;
} }
public String getHistoryMbrMassEnterpriseWhiteList() {
return historyMbrMassEnterpriseWhiteList;
}
public void setHistoryMbrMassEnterpriseWhiteList(String historyMbrMassEnterpriseWhiteList) {
this.historyMbrMassEnterpriseWhiteList = historyMbrMassEnterpriseWhiteList;
}
public String getHistoryMbrMassOperWhiteList() { public String getHistoryMbrMassOperWhiteList() {
return historyMbrMassOperWhiteList; return historyMbrMassOperWhiteList;
} }
......
...@@ -105,7 +105,7 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce ...@@ -105,7 +105,7 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce
return; return;
} }
// 转换外部联系人id // 转换外部联系人id
String serviceExternalUserid = qywxUserApiService.toServiceExternalUserid(bo.getCorpid(), config.getWxSuiteid(), externalUserid); String serviceExternalUserid = qywxUserApiService.toServiceExternalUserid(bo.getCorpid(), config.getSuiteId(), externalUserid);
logger.info("自建转换第三方返回:{}", serviceExternalUserid); logger.info("自建转换第三方返回:{}", serviceExternalUserid);
// 幂等 // 幂等
MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByUnionId(wxEnterpriseId, wxUserId, dto.getUnionid()); MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByUnionId(wxEnterpriseId, wxUserId, dto.getUnionid());
......
...@@ -194,7 +194,7 @@ public class MessageApiServiceImpl implements MessageApiService { ...@@ -194,7 +194,7 @@ public class MessageApiServiceImpl implements MessageApiService {
} }
private boolean checkSuitEnterpriseId(String wxEnterpriseId) { private boolean checkSuitEnterpriseId(String wxEnterpriseId) {
Set<String> wxSet = Sets.newHashSet("ca66a01b79474c40b3e7c7f93daf1a3b"); Set<String> wxSet = Sets.newHashSet("ca66a01b79474c40b3e7c7f93daf1a3b","c0c2186a947440aa8c0afbdd869ec043");
return wxSet.contains(wxEnterpriseId); return wxSet.contains(wxEnterpriseId);
} }
......
...@@ -134,7 +134,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService { ...@@ -134,7 +134,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
com.gic.api.base.commons.Page<YwWxEnterpriseDTO> resPage = PageUtil.changePageHelperToCurrentPage(page, YwWxEnterpriseDTO.class); com.gic.api.base.commons.Page<YwWxEnterpriseDTO> resPage = PageUtil.changePageHelperToCurrentPage(page, YwWxEnterpriseDTO.class);
boolean matchOperId = matchOperId(loginUserId); boolean matchOperId = matchOperId(loginUserId);
resPage.getResult().forEach(one -> { resPage.getResult().forEach(one -> {
if (matchWxEnterpriseIdWhiteList(one.getWxEnterpriseId()) && matchOperId) { if (matchOperId) {
one.setOpenMassFlag(Boolean.TRUE); one.setOpenMassFlag(Boolean.TRUE);
} else { } else {
one.setOpenMassFlag(Boolean.FALSE); one.setOpenMassFlag(Boolean.FALSE);
...@@ -143,20 +143,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService { ...@@ -143,20 +143,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
return resPage; return resPage;
} }
private boolean matchWxEnterpriseIdWhiteList(String wxEnterpriseId) {
if (StringUtils.isEmpty(wxEnterpriseId)) {
return false;
}
// 匹配微信企业id白名单
String whiteList = config.getHistoryMbrMassEnterpriseWhiteList();
if (StringUtils.isEmpty(whiteList)) {
return false;
}
String[] idArr = whiteList.split(",");
Set<String> idSet = new HashSet<>(Arrays.asList(idArr));
return idSet.contains(wxEnterpriseId);
}
private boolean matchOperId(String loginUserId) { private boolean matchOperId(String loginUserId) {
if (StringUtils.isEmpty(loginUserId)) { if (StringUtils.isEmpty(loginUserId)) {
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment