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
84d0ee09
Commit
84d0ee09
authored
Apr 23, 2023
by
徐高华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
自建
parent
a4263da8
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
SecretSettingServiceImpl.java
...manage/service/service/impl/SecretSettingServiceImpl.java
+1
-1
WxEnterpriseServiceImpl.java
.../manage/service/service/impl/WxEnterpriseServiceImpl.java
+1
-1
WxEnterpriseController.java
.../haoban/manage/web/controller/WxEnterpriseController.java
+4
-4
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/SecretSettingServiceImpl.java
View file @
84d0ee09
...
@@ -75,7 +75,7 @@ public class SecretSettingServiceImpl implements SecretSettingService {
...
@@ -75,7 +75,7 @@ public class SecretSettingServiceImpl implements SecretSettingService {
WxEnterpriseQwDTO
qwDTO
=
this
.
wxEnterpriseService
.
getQwInfo
(
wxEnterpriseId
)
;
WxEnterpriseQwDTO
qwDTO
=
this
.
wxEnterpriseService
.
getQwInfo
(
wxEnterpriseId
)
;
// 如果是纯自建,使用自建的token
// 如果是纯自建,使用自建的token
if
(
qwDTO
.
isSelf
())
{
if
(
qwDTO
.
isSelf
())
{
secretType
=
SecretTypeEnum
.
CONTACT_CUSTOMER
.
getVal
()
;
secretType
=
SecretTypeEnum
.
SELF_APP
.
getVal
()
;
}
}
TabSecretSetting
secretSetting
=
secretSettingMapper
.
getSecretSetting
(
wxEnterpriseId
,
secretType
,
null
);
TabSecretSetting
secretSetting
=
secretSettingMapper
.
getSecretSetting
(
wxEnterpriseId
,
secretType
,
null
);
return
EntityUtil
.
changeEntityByJSON
(
SecretSettingDTO
.
class
,
secretSetting
);
return
EntityUtil
.
changeEntityByJSON
(
SecretSettingDTO
.
class
,
secretSetting
);
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseServiceImpl.java
View file @
84d0ee09
...
@@ -108,7 +108,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
...
@@ -108,7 +108,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
qw
.
setDkCorpid
(
wxEnterprise
.
getWxCorpid
());
qw
.
setDkCorpid
(
wxEnterprise
.
getWxCorpid
());
qw
.
setThirdCorpid
(
wxEnterprise
.
getWxCorpid
());
qw
.
setThirdCorpid
(
wxEnterprise
.
getWxCorpid
());
qw
.
setMemberCorpid
(
wxEnterprise
.
getWxCorpid
());
qw
.
setMemberCorpid
(
wxEnterprise
.
getWxCorpid
());
TabSecretSetting
secret
=
secretSettingMapper
.
getSecretSetting
(
wxEnterpriseId
,
SecretTypeEnum
.
CONTACT_CUSTOMER
.
getVal
(),
null
);
TabSecretSetting
secret
=
secretSettingMapper
.
getSecretSetting
(
wxEnterpriseId
,
SecretTypeEnum
.
SELF_APP
.
getVal
(),
null
);
qw
.
setSelfSecret
(
secret
.
getSecretVal
());
qw
.
setSelfSecret
(
secret
.
getSecretVal
());
qw
.
setAgentId
(
secret
.
getAgentId
());
qw
.
setAgentId
(
secret
.
getAgentId
());
qw
.
setAgentName
(
secret
.
getAgentName
());
qw
.
setAgentName
(
secret
.
getAgentName
());
...
...
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java
View file @
84d0ee09
...
@@ -323,7 +323,7 @@ public class WxEnterpriseController extends WebBaseController {
...
@@ -323,7 +323,7 @@ public class WxEnterpriseController extends WebBaseController {
// 如果是第三方校验待开发
// 如果是第三方校验待开发
WxEnterpriseQwDTO
qwDTO
=
this
.
wxEnterpriseApiService
.
getQwInfo
(
wxEnterpriseId
)
;
WxEnterpriseQwDTO
qwDTO
=
this
.
wxEnterpriseApiService
.
getQwInfo
(
wxEnterpriseId
)
;
if
(
qwDTO
.
isSelf
())
{
if
(
qwDTO
.
isSelf
())
{
if
((
secretTypeList
.
contains
(
SecretTypeEnum
.
CONTACT_CUSTOMER
.
getVal
())))
{
if
((
secretTypeList
.
contains
(
SecretTypeEnum
.
SELF_APP
.
getVal
())))
{
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
true
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
true
);
}
}
}
else
{
}
else
{
...
@@ -357,12 +357,12 @@ public class WxEnterpriseController extends WebBaseController {
...
@@ -357,12 +357,12 @@ public class WxEnterpriseController extends WebBaseController {
if
(
StringUtils
.
isEmpty
(
token
)
||
token
.
length
()
<
10
)
{
if
(
StringUtils
.
isEmpty
(
token
)
||
token
.
length
()
<
10
)
{
return
this
.
fail
(
"请确认secret是否正确"
)
;
return
this
.
fail
(
"请确认secret是否正确"
)
;
}
}
SecretSettingDTO
secretSetting
=
wxEnterpriseApiService
.
getSecretSetting
(
wxEnterpriseId
,
SecretTypeEnum
.
CONTACT_CUSTOMER
.
getVal
(),
null
);
SecretSettingDTO
secretSetting
=
wxEnterpriseApiService
.
getSecretSetting
(
wxEnterpriseId
,
SecretTypeEnum
.
SELF_APP
.
getVal
(),
null
);
if
(
null
==
secretSetting
)
{
if
(
null
==
secretSetting
)
{
secretSetting
=
new
SecretSettingDTO
();
secretSetting
=
new
SecretSettingDTO
();
}
}
secretSetting
.
setSecretType
(
SecretTypeEnum
.
CONTACT_CUSTOMER
.
getVal
());
secretSetting
.
setSecretType
(
SecretTypeEnum
.
SELF_APP
.
getVal
());
secretSetting
.
setSecretName
(
SecretTypeEnum
.
CONTACT_CUSTOMER
.
getName
());
secretSetting
.
setSecretName
(
SecretTypeEnum
.
SELF_APP
.
getName
());
secretSetting
.
setWxEnterpriseId
(
wxEnterpriseId
);
secretSetting
.
setWxEnterpriseId
(
wxEnterpriseId
);
secretSetting
.
setEnterpriseId
(
"-1"
);
secretSetting
.
setEnterpriseId
(
"-1"
);
secretSetting
.
setSecretVal
(
wxSecretKey
);
secretSetting
.
setSecretVal
(
wxSecretKey
);
...
...
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