Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
4ec9b4df
Commit
4ec9b4df
authored
Mar 05, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
明细接口改造
parent
a06adabf
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
74 deletions
+34
-74
daprConfig.properties
...yifu-common-dapr/src/main/resources/daprConfig.properties
+23
-63
ldapConfig.properties
...yifu-common-ldap/src/main/resources/ldapConfig.properties
+2
-2
application-dev.yml
yifu-ekp/yifu-ekp-biz/src/main/resources/application-dev.yml
+3
-3
application-test.yml
...-ekp/yifu-ekp-biz/src/main/resources/application-test.yml
+3
-3
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+2
-2
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+1
-1
No files found.
yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties
View file @
4ec9b4df
#\u6D4B\u8BD5\u73AF\u5883
#\u67E5\u8BE2\u5730\u5740\u6559\u7A0B\uFF1A cd home/data/nginx-mvp-image/mvp/
# vim Default.conf
# \u627E\u5230\u5BF9\u5E94\u7684\u670D\u52A1\u5730\u5740
#dapr.upms.appUrl=http://yifu-auth.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u672C\u5730
dapr.upms.appUrl
=
http://localhost:3500/v1.0/invoke/
dapr.upms.appUrl
=
http://yifu-upms.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.upms.appId
=
yifu-upms
dapr.upms.appPort
=
4000
dapr.upms.httpPort
=
3500
dapr.upms.grpcPort
=
52000
dapr.upms.metricsPort
=
9094
#\u6D4B\u8BD5\u73AF\u5883
#dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u6
72C\u5730
dapr.check.appUrl
=
http://
localhost:3507
/v1.0/invoke/
#\u6
D4B\u8BD5\u73AF\u5883
dapr.check.appUrl
=
http://
yifu-check.qas-mvp.svc.cluster.local:3500
/v1.0/invoke/
dapr.check.appId
=
yifu-check
dapr.check.appPort
=
50022
dapr.check.httpPort
=
3507
dapr.check.grpcPort
=
52008
dapr.check.metricsPort
=
9098
dapr.business.appUrl
=
http://localhost:5034/v1.0/invoke/
dapr.business.appId
=
yifu-business
dapr.business.appPort
=
5034
dapr.business.httpPort
=
3510
dapr.business.grpcPort
=
52010
dapr.business.metricsPort
=
9110
dapr.archives.appUrl
=
http://localhost:3508/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883
dapr.archives.appUrl
=
http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.archives.appId
=
yifu-archives
dapr.archives.appPort
=
5001
dapr.archives.httpPort
=
3508
dapr.archives.grpcPort
=
52009
dapr.archives.metricsPort
=
9099
dapr.social.appUrl
=
http://localhost:3509/v1.0/invoke/
dapr.social.appId
=
yifu-social
dapr.social.appPort
=
5002
dapr.social.httpPort
=
3509
dapr.social.grpcPort
=
52003
dapr.social.metricsPort
=
9093
dapr.salary.appUrl
=
http://localhost:3513/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883
dapr.salary.appUrl
=
http://yifu-salary.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.salary.appId
=
yifu-salary
dapr.salary.appPort
=
5003
dapr.salary.httpPort
=
3513
dapr.salary.grpcPort
=
52013
dapr.salary.metricsPort
=
9102
#\u6D4B\u8BD5\u73AF\u5883
dapr.social.appUrl
=
http://yifu-social.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.social.appId
=
yifu-social
dapr.job.appUrl
=
http://localhost:3504/v1.0/invoke/
dapr.job.appId
=
yifu-job
dapr.job.appPort
=
5004
dapr.job.httpPort
=
3506
dapr.job.grpcPort
=
52007
dapr.job.metricsPort
=
9097
#\u6D4B\u8BD5\u73AF\u5883-B\u7AEF\u670D\u52A1
dapr.business.appUrl
=
http://yifu-business.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.business.appId
=
yifu-business
dapr.msg.appUrl
=
http://localhost:3516/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883-\u6D88\u606F\u63D0\u9192\u670D\u52A1
dapr.msg.appUrl
=
http://yifu-msg.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.msg.appId
=
yifu-msg
dapr.msg.appPort
=
5026
dapr.msg.httpPort
=
3516
dapr.msg.grpcPort
=
52111
dapr.msg.metricsPort
=
9111
dapr.insurances.appUrl
=
http://localhost:3511/v1.0/invoke/
dapr.insurances.appId
=
yifu-insurances
dapr.insurances.appPort
=
5005
dapr.insurances.httpPort
=
3511
dapr.insurances.grpcPort
=
52012
dapr.insurances.metricsPort
=
9101
dapr.permission.appUrl
=
http://localhost:3517/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883-EKP\u6743\u9650
dapr.permission.appUrl
=
http://yifu-permission.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.permission.appId
=
yifu-permission
dapr.permission.appPort
=
5027
dapr.permission.httpPort
=
3517
dapr.permission.grpcPort
=
52222
dapr.permission.metricsPort
=
9222
#\u6D4B\u8BD5\u73AF\u5883-EKP
dapr.ekp.appUrl
=
http://yifu-ekp.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.ekp.appId
=
yifu-ekp
#\u6D4B\u8BD5\u73AF\u5883-\u85AA\u8D44\u670D\u52A1
#dapr.salary.appUrl=http://yifu-salary.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#dapr.salary.appId=yifu-salary
...
...
yifu-common/yifu-common-ldap/src/main/resources/ldapConfig.properties
View file @
4ec9b4df
ldap.url
=
192.168.
0.240
ldap.url
=
192.168.
1.65
ldap.port
=
389
ldap.userName
=
cn=admin,dc=worfu,dc=com
ldap.password
=
Yifu123ABC
!
ldap.password
=
yifu123456
!
ldap.dn
=
dc=worfu,dc=com
ldap.baseDn
=
ou=
\u7696\u
4FE1
\u
4EBA
\u
529B
\u
96C6
\u
56E2,ou=wanxin,dc=worfu,dc=com
\ No newline at end of file
yifu-ekp/yifu-ekp-biz/src/main/resources/application-dev.yml
View file @
4ec9b4df
...
...
@@ -32,14 +32,14 @@ spring:
algorithmClassName
:
com.yifu.cloud.plus.v1.ekp.config.OTAStrategyShardingAlgorithm
type
:
CLASS_BASED
tables
:
t_payment
_info
:
actual-data-nodes
:
ds0.ekp_social_
fee_
info_20$->{23..24}
ekp_social
_info
:
actual-data-nodes
:
ds0.ekp_social_info_20$->{23..24}
key-generate-strategy
:
column
:
fd_id
key-generator-name
:
snowflake
table-strategy
:
standard
:
sharding-column
:
create_tim
e
sharding-column
:
fd_3adfe8cb96c41
e
sharding-algorithm-name
:
t-payment-inline
mvc
:
...
...
yifu-ekp/yifu-ekp-biz/src/main/resources/application-test.yml
View file @
4ec9b4df
...
...
@@ -32,14 +32,14 @@ spring:
algorithmClassName
:
com.yifu.cloud.plus.v1.ekp.config.OTAStrategyShardingAlgorithm
type
:
CLASS_BASED
tables
:
t_payment
_info
:
actual-data-nodes
:
ds0.ekp_
9264ea0160848a681328
_20$->{23..24}
ekp_social
_info
:
actual-data-nodes
:
ds0.ekp_
social_info
_20$->{23..24}
key-generate-strategy
:
column
:
fd_id
key-generator-name
:
snowflake
table-strategy
:
standard
:
sharding-column
:
create_tim
e
sharding-column
:
fd_3adfe8cb96c41
e
sharding-algorithm-name
:
t-payment-inline
mvc
:
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
4ec9b4df
...
...
@@ -2930,7 +2930,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
long
count
=
baseMapper
.
getTPaymentInfoSumPushCount
(
null
);
if
(
count
>
0
)
{
List
<
TPaymentInfoPushVo
>
unPushs
;
int
i
=
(
int
)
Math
.
ceil
((
double
)
count
/
CommonConstants
.
FIVES
_INT
);
int
i
=
(
int
)
Math
.
ceil
((
double
)
count
/
CommonConstants
.
ONE_THOUSAND
_INT
);
Map
<
String
,
TSettleDomainSelectVo
>
mapSelectVo
=
this
.
getSelectVoMap
();
for
(
int
j
=
0
;
j
<
i
;
j
++)
{
unPushs
=
baseMapper
.
getTPaymentInfoSumPushList
(
null
);
...
...
@@ -3133,7 +3133,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
long
count
=
baseMapper
.
getTPaymentInfoSumPushCount
(
searchVo
);
if
(
count
>
0
)
{
List
<
TPaymentInfoPushVo
>
unPushInfo
;
int
i
=
(
int
)
Math
.
ceil
((
double
)
count
/
CommonConstants
.
FIVES
_INT
);
int
i
=
(
int
)
Math
.
ceil
((
double
)
count
/
CommonConstants
.
ONE_THOUSAND
_INT
);
for
(
int
j
=
0
;
j
<
i
;
j
++)
{
unPushInfo
=
baseMapper
.
getTPaymentInfoSumPushList
(
searchVo
);
if
(
Common
.
isNotNull
(
unPushInfo
))
{
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
4ec9b4df
...
...
@@ -2162,7 +2162,7 @@
<include
refid=
"tPaymentInfo_export_push_where"
/>
</where>
GROUP BY a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH,a.SOCIAL_PAY_ADDR
limit 0,
5
000
limit 0,
1
000
</select>
<!--tPaymentInfo合并查询-->
...
...
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