Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
11a609fe
Commit
11a609fe
authored
Feb 23, 2022
by
xugaojun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加尊兴id,修改配置,修改suitId
parent
256f85c6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
27 deletions
+3
-27
Config.java
...ain/java/com/gic/haoban/manage/service/config/Config.java
+0
-10
AddMemberUnionRelateConsumerProcessor.java
...e/mq/processor/AddMemberUnionRelateConsumerProcessor.java
+1
-1
MessageApiServiceImpl.java
...anage/service/service/out/impl/MessageApiServiceImpl.java
+1
-1
WxEnterpriseApiServiceImpl.java
.../service/service/out/impl/WxEnterpriseApiServiceImpl.java
+1
-15
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/config/Config.java
View file @
11a609fe
...
...
@@ -23,8 +23,6 @@ public class Config {
@Value
(
"${memberOpenPage}"
)
private
String
memberOpenPage
;
@Value
(
"${historyMbrMassEnterpriseWhiteList}"
)
private
String
historyMbrMassEnterpriseWhiteList
;
@Value
(
"${historyMbrMassOperWhiteList}"
)
private
String
historyMbrMassOperWhiteList
;
...
...
@@ -76,14 +74,6 @@ public class Config {
this
.
wxSuiteid
=
wxSuiteid
;
}
public
String
getHistoryMbrMassEnterpriseWhiteList
()
{
return
historyMbrMassEnterpriseWhiteList
;
}
public
void
setHistoryMbrMassEnterpriseWhiteList
(
String
historyMbrMassEnterpriseWhiteList
)
{
this
.
historyMbrMassEnterpriseWhiteList
=
historyMbrMassEnterpriseWhiteList
;
}
public
String
getHistoryMbrMassOperWhiteList
()
{
return
historyMbrMassOperWhiteList
;
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/mq/processor/AddMemberUnionRelateConsumerProcessor.java
View file @
11a609fe
...
...
@@ -105,7 +105,7 @@ public class AddMemberUnionRelateConsumerProcessor extends AbstractConsumerProce
return
;
}
// 转换外部联系人id
String
serviceExternalUserid
=
qywxUserApiService
.
toServiceExternalUserid
(
bo
.
getCorpid
(),
config
.
get
WxSuitei
d
(),
externalUserid
);
String
serviceExternalUserid
=
qywxUserApiService
.
toServiceExternalUserid
(
bo
.
getCorpid
(),
config
.
get
SuiteI
d
(),
externalUserid
);
logger
.
info
(
"自建转换第三方返回:{}"
,
serviceExternalUserid
);
// 幂等
MemberUnionidRelatedDTO
exsitDTO
=
memberUnionRelatedService
.
getByUnionId
(
wxEnterpriseId
,
wxUserId
,
dto
.
getUnionid
());
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java
View file @
11a609fe
...
...
@@ -194,7 +194,7 @@ public class MessageApiServiceImpl implements MessageApiService {
}
private
boolean
checkSuitEnterpriseId
(
String
wxEnterpriseId
)
{
Set
<
String
>
wxSet
=
Sets
.
newHashSet
(
"ca66a01b79474c40b3e7c7f93daf1a3b"
);
Set
<
String
>
wxSet
=
Sets
.
newHashSet
(
"ca66a01b79474c40b3e7c7f93daf1a3b"
,
"c0c2186a947440aa8c0afbdd869ec043"
);
return
wxSet
.
contains
(
wxEnterpriseId
);
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java
View file @
11a609fe
...
...
@@ -134,7 +134,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
com
.
gic
.
api
.
base
.
commons
.
Page
<
YwWxEnterpriseDTO
>
resPage
=
PageUtil
.
changePageHelperToCurrentPage
(
page
,
YwWxEnterpriseDTO
.
class
);
boolean
matchOperId
=
matchOperId
(
loginUserId
);
resPage
.
getResult
().
forEach
(
one
->
{
if
(
match
WxEnterpriseIdWhiteList
(
one
.
getWxEnterpriseId
())
&&
match
OperId
)
{
if
(
matchOperId
)
{
one
.
setOpenMassFlag
(
Boolean
.
TRUE
);
}
else
{
one
.
setOpenMassFlag
(
Boolean
.
FALSE
);
...
...
@@ -143,20 +143,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
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
)
{
if
(
StringUtils
.
isEmpty
(
loginUserId
))
{
return
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment