Skip to content

Y
yifu-mvp
Commit 4ec9b4df authored by huyuchen's avatar huyuchen
Browse files
Options

明细接口改造

parent a06adabf
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 74 deletions
yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties
View file @ 4ec9b4df
#\u6D4B\u8BD5\u73AF\u5883 dapr.upms.appUrl=http://yifu-upms.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\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.appId=yifu-upms 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 #\u6D4B\u8BD5\u73AF\u5883
#dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/ #dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u672C\u5730 #\u6D4B\u8BD5\u73AF\u5883
dapr.check.appUrl=http://localhost:3507/v1.0/invoke/ dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.check.appId=yifu-check 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.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.appId=yifu-salary
dapr.salary.appPort=5003 #\u6D4B\u8BD5\u73AF\u5883
dapr.salary.httpPort=3513 dapr.social.appUrl=http://yifu-social.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.salary.grpcPort=52013 dapr.social.appId=yifu-social
dapr.salary.metricsPort=9102
dapr.job.appUrl=http://localhost:3504/v1.0/invoke/ #\u6D4B\u8BD5\u73AF\u5883-B\u7AEF\u670D\u52A1
dapr.job.appId=yifu-job dapr.business.appUrl=http://yifu-business.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.job.appPort=5004 dapr.business.appId=yifu-business
dapr.job.httpPort=3506
dapr.job.grpcPort=52007
dapr.job.metricsPort=9097
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.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/ #\u6D4B\u8BD5\u73AF\u5883-EKP\u6743\u9650
dapr.insurances.appId=yifu-insurances dapr.permission.appUrl=http://yifu-permission.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
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/
dapr.permission.appId=yifu-permission dapr.permission.appId=yifu-permission
dapr.permission.appPort=5027
dapr.permission.httpPort=3517 #\u6D4B\u8BD5\u73AF\u5883-EKP
dapr.permission.grpcPort=52222 dapr.ekp.appUrl=http://yifu-ekp.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.permission.metricsPort=9222 dapr.ekp.appId=yifu-ekp
#\u6D4B\u8BD5\u73AF\u5883-\u85AA\u8D44\u670D\u52A1 #\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.appUrl=http://yifu-salary.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#dapr.salary.appId=yifu-salary #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.port=389
ldap.userName=cn=admin,dc=worfu,dc=com ldap.userName=cn=admin,dc=worfu,dc=com
ldap.password=Yifu123ABC! ldap.password=yifu123456!
ldap.dn=dc=worfu,dc=com ldap.dn=dc=worfu,dc=com
ldap.baseDn=ou=\u7696\u4FE1\u4EBA\u529B\u96C6\u56E2,ou=wanxin,dc=worfu,dc=com ldap.baseDn=ou=\u7696\u4FE1\u4EBA\u529B\u96C6\u56E2,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: ...@@ -32,14 +32,14 @@ spring:
algorithmClassName: com.yifu.cloud.plus.v1.ekp.config.OTAStrategyShardingAlgorithm algorithmClassName: com.yifu.cloud.plus.v1.ekp.config.OTAStrategyShardingAlgorithm
type: CLASS_BASED type: CLASS_BASED
tables: tables:
t_payment_info: ekp_social_info:
actual-data-nodes: ds0.ekp_social_fee_info_20$->{23..24} actual-data-nodes: ds0.ekp_social_info_20$->{23..24}
key-generate-strategy: key-generate-strategy:
column: fd_id column: fd_id
key-generator-name: snowflake key-generator-name: snowflake
table-strategy: table-strategy:
standard: standard:
sharding-column: create_time sharding-column: fd_3adfe8cb96c41e
sharding-algorithm-name: t-payment-inline sharding-algorithm-name: t-payment-inline
mvc: mvc:
......
yifu-ekp/yifu-ekp-biz/src/main/resources/application-test.yml
View file @ 4ec9b4df
...@@ -32,14 +32,14 @@ spring: ...@@ -32,14 +32,14 @@ spring:
algorithmClassName: com.yifu.cloud.plus.v1.ekp.config.OTAStrategyShardingAlgorithm algorithmClassName: com.yifu.cloud.plus.v1.ekp.config.OTAStrategyShardingAlgorithm
type: CLASS_BASED type: CLASS_BASED
tables: tables:
t_payment_info: ekp_social_info:
actual-data-nodes: ds0.ekp_9264ea0160848a681328_20$->{23..24} actual-data-nodes: ds0.ekp_social_info_20$->{23..24}
key-generate-strategy: key-generate-strategy:
column: fd_id column: fd_id
key-generator-name: snowflake key-generator-name: snowflake
table-strategy: table-strategy:
standard: standard:
sharding-column: create_time sharding-column: fd_3adfe8cb96c41e
sharding-algorithm-name: t-payment-inline sharding-algorithm-name: t-payment-inline
mvc: 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 ...@@ -2930,7 +2930,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
long count = baseMapper.getTPaymentInfoSumPushCount(null); long count = baseMapper.getTPaymentInfoSumPushCount(null);
if (count > 0) { if (count > 0) {
List<TPaymentInfoPushVo> unPushs; 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(); Map<String, TSettleDomainSelectVo> mapSelectVo = this.getSelectVoMap();
for (int j = 0; j < i; j++) { for (int j = 0; j < i; j++) {
unPushs = baseMapper.getTPaymentInfoSumPushList(null); unPushs = baseMapper.getTPaymentInfoSumPushList(null);
...@@ -3133,7 +3133,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -3133,7 +3133,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
long count = baseMapper.getTPaymentInfoSumPushCount(searchVo); long count = baseMapper.getTPaymentInfoSumPushCount(searchVo);
if (count > 0) { if (count > 0) {
List<TPaymentInfoPushVo> unPushInfo; 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++) { for (int j = 0; j < i; j++) {
unPushInfo = baseMapper.getTPaymentInfoSumPushList(searchVo); unPushInfo = baseMapper.getTPaymentInfoSumPushList(searchVo);
if (Common.isNotNull(unPushInfo)) { if (Common.isNotNull(unPushInfo)) {
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @ 4ec9b4df
...@@ -2162,7 +2162,7 @@ ...@@ -2162,7 +2162,7 @@
<include refid="tPaymentInfo_export_push_where"/> <include refid="tPaymentInfo_export_push_where"/>
</where> </where>
GROUP BY a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH,a.SOCIAL_PAY_ADDR GROUP BY a.EMP_IDCARD,a.SOCIAL_PAY_MONTH,a.SOCIAL_CREATE_MONTH,a.SOCIAL_PAY_ADDR
limit 0,5000 limit 0,1000
</select> </select>
<!--tPaymentInfo合并查询--> <!--tPaymentInfo合并查询-->
......
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