记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
f023b74c
Commit
f023b74c
authored
Dec 02, 2021
by
Tice
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
9ff3fb2a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
9 deletions
+13
-9
bootstrap-client-admin-web.yml
...min-web/src/main/resources/bootstrap-client-admin-web.yml
+1
-1
MerchantAuthorizationRecordsServiceImpl.java
...service/impl/MerchantAuthorizationRecordsServiceImpl.java
+5
-3
MerchantFieldsServiceImpl.java
...vice/merchant/service/impl/MerchantFieldsServiceImpl.java
+5
-3
application-dev.yml
...net-support-config/src/main/resources/application-dev.yml
+2
-2
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-client-admin-web.yml
View file @
f023b74c
...
@@ -10,7 +10,7 @@ spring:
...
@@ -10,7 +10,7 @@ spring:
cloud
:
cloud
:
config
:
config
:
# uri: http://127.0.0.1:7002/support-config
# uri: http://127.0.0.1:7002/support-config
# uri: http://39.10
6.122.201
:7002/support-config
# uri: http://39.10
7.71.112
:7002/support-config
name
:
${spring.application.name},${spring.application.name}-druid
#默认为spring.application.name
name
:
${spring.application.name},${spring.application.name}-druid
#默认为spring.application.name
profile
:
${liquidnet.cloudConfig.profile}
profile
:
${liquidnet.cloudConfig.profile}
discovery
:
discovery
:
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantAuthorizationRecordsServiceImpl.java
View file @
f023b74c
...
@@ -53,11 +53,13 @@ public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthori
...
@@ -53,11 +53,13 @@ public class MerchantAuthorizationRecordsServiceImpl implements IMerchantAuthori
public
List
<
MerchantAuthorizationRecordsVo
>
performanceRecordCheckers
(
String
cuid
,
String
performanceId
)
{
public
List
<
MerchantAuthorizationRecordsVo
>
performanceRecordCheckers
(
String
cuid
,
String
performanceId
)
{
List
<
MerchantAuthorizationRecordsVo
>
authorizationRecordsVos
=
merchantMongoService
.
getAuthorizationRecordsCheckersVosByCuid
(
cuid
,
performanceId
);
List
<
MerchantAuthorizationRecordsVo
>
authorizationRecordsVos
=
merchantMongoService
.
getAuthorizationRecordsCheckersVosByCuid
(
cuid
,
performanceId
);
if
(!
CollectionUtil
.
isEmpty
(
authorizationRecordsVos
))
{
for
(
MerchantAuthorizationRecordsVo
recordsVo:
authorizationRecordsVos
)
{
for
(
MerchantAuthorizationRecordsVo
recordsVo:
authorizationRecordsVos
)
{
if
(
null
!=
recordsVo
.
getMobile
()
&&
recordsVo
.
getMobile
().
length
()
>
4
)
{
if
(
null
!=
recordsVo
.
getMobile
()
&&
recordsVo
.
getMobile
().
length
()
>
4
)
{
recordsVo
.
setMobile
(
StringUtil
.
hiddenMobile
(
recordsVo
.
getMobile
()));
recordsVo
.
setMobile
(
StringUtil
.
hiddenMobile
(
recordsVo
.
getMobile
()));
}
}
}
}
}
return
authorizationRecordsVos
;
return
authorizationRecordsVos
;
}
}
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldsServiceImpl.java
View file @
f023b74c
...
@@ -147,11 +147,13 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
...
@@ -147,11 +147,13 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
List
<
MerchantFieldCheckersVo
>
fieldCheckersVos
=
merchantRdmService
.
getFieldCheckersVosByFieldId
(
fieldId
);
List
<
MerchantFieldCheckersVo
>
fieldCheckersVos
=
merchantRdmService
.
getFieldCheckersVosByFieldId
(
fieldId
);
if
(!
CollectionUtil
.
isEmpty
(
fieldCheckersVos
))
{
for
(
MerchantFieldCheckersVo
checkersVo
:
fieldCheckersVos
)
{
for
(
MerchantFieldCheckersVo
checkersVo
:
fieldCheckersVos
)
{
if
(
null
!=
checkersVo
.
getMobile
()
&&
checkersVo
.
getMobile
().
length
()
>
4
)
{
if
(
null
!=
checkersVo
.
getMobile
()
&&
checkersVo
.
getMobile
().
length
()
>
4
)
{
checkersVo
.
setMobile
(
StringUtil
.
hiddenMobile
(
checkersVo
.
getMobile
()));
checkersVo
.
setMobile
(
StringUtil
.
hiddenMobile
(
checkersVo
.
getMobile
()));
}
}
}
}
}
return
fieldCheckersVos
;
return
fieldCheckersVos
;
}
}
...
...
liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml
View file @
f023b74c
...
@@ -18,9 +18,9 @@ liquidnet:
...
@@ -18,9 +18,9 @@ liquidnet:
username
:
admin
username
:
admin
password
:
admin
password
:
admin
config
:
config
:
# location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
# location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
# location: /Users/Tice/Company/Liquidnet/Liquidnet_Bus/liquidnet-bus-config/liquidnet-config
# location: /Users/hujiachen/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
# location: /Users/hujiachen/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
# location: /Users/Tice/Company/Liquidnet/Liquidnet_Bus/liquidnet-bus-config/liquidnet-config
location
:
/app/support-config
location
:
/app/support-config
# end-dev-这里是配置信息基本值
# end-dev-这里是配置信息基本值
...
...
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