Commit Graph

871 Commits

Author SHA1 Message Date
8197002852 Merge branch 'uat_保证金天擎调用' into uat_code 2022-10-10 11:32:01 +08:00
38eddaa7dc 修改 中信支付天擎接口参数实体类 2022-10-10 11:30:48 +08:00
yss
8d4989c07e Merge branch 'master-风控中心加属性' into uat_code 2022-10-08 10:38:17 +08:00
yss
c096968642 风控中心加风控对象属性 2022-10-08 10:37:04 +08:00
yss
d828b6e545 Merge branch 'master-风控中心加属性' into uat_code
# Conflicts:
#	src/main/resources/application.yml
2022-09-29 14:36:20 +08:00
yss
f53e868916 Merge remote-tracking branch 'origin/master' into master-风控中心加属性 2022-09-29 14:33:45 +08:00
yss
d334ef014d 风控中心-加日志注解 2022-09-29 14:33:04 +08:00
yss
894dca1005 Merge branch 'master-风控中心加属性' into uat_code 2022-09-28 11:13:04 +08:00
yss
18554ad6c2 风控中心加风控对象属性 2022-09-27 14:26:09 +08:00
yss
28377ffa1f Merge branch 'master-风控中心加属性' into uat_code 2022-09-27 11:08:15 +08:00
yss
d15ac34e0b 风控中心加风控对象属性 2022-09-27 11:02:29 +08:00
yss
1a758ad5d9 Merge branch 'master-风控中心加属性' into uat_code 2022-09-26 11:27:12 +08:00
yss
ec1c068df4 Merge remote-tracking branch 'origin/uat_code' into uat_code 2022-09-26 11:26:01 +08:00
05bc20591b jasypt 2022-09-23 14:55:53 +00:00
d3077853e7 Merge branch 'uat-deleteuserinfo' into 'master'
uat到master

See merge request eshop/biz_service_ebtp_extend!2
2022-09-23 07:08:08 +00:00
c1f7d7c945 Merge branch 'uat-put&delete' into 'master'
put&delete

See merge request eshop/biz_service_ebtp_extend!1
2022-09-23 06:49:26 +00:00
yss
fd5f4ac726 风控中心加风控对象属性 2022-09-23 09:34:05 +08:00
fd0db1f111 jasypt 2022-09-23 09:28:29 +08:00
yss
41eeb0d31d 风控中心加风控对象属性 2022-09-23 09:06:03 +08:00
cb19f1920b 生成新消息输出日志 2022-09-15 14:03:14 +08:00
0de5667def Merge branch 'uat-deleteuserinfo' into 'uat_code'
修改pom

See merge request eshop/biz_service_ebtp_extend!125
2022-08-29 14:19:37 +08:00
963b460cae 修改pom 2022-08-29 14:18:54 +08:00
b914ab9f18 Merge branch 'uat-deleteuserinfo' into 'uat_code'
删除user相关接口

See merge request eshop/biz_service_ebtp_extend!124
2022-08-29 11:28:10 +08:00
a84ddb1f5f 删除user相关接口 2022-08-29 11:27:22 +08:00
02128075b2 Merge branch 'uat' into 'uat_code'
Uat

See merge request eshop/biz_service_ebtp_extend!123
2022-08-12 10:56:25 +08:00
97d954c2bf Merge branch 'master-时间戳' into 'uat'
申请时间戳异常 不提示

See merge request eshop/biz_service_ebtp_extend!122
2022-08-12 10:50:35 +08:00
55e2394516 Merge branch 'master' into 'uat'
Master

See merge request eshop/biz_service_ebtp_extend!121
2022-08-12 08:45:01 +08:00
e44e9ee59b Merge branch 'uat_保证金天擎调用' into 'uat'
Uat 保证金天擎调用

See merge request eshop/biz_service_ebtp_extend!120
2022-08-12 08:40:05 +08:00
d87cfa4ddb 申请时间戳异常 不提示 2022-08-04 17:20:57 +08:00
e13284ff4d Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加天擎接口https请求 ssl证书

See merge request eshop/biz_service_ebtp_extend!118
2022-08-01 17:03:26 +08:00
d46efb3b6c 增加天擎接口https请求 ssl证书 2022-08-01 15:50:35 +08:00
c069180be0 Merge branch 'uat_保证金天擎调用' into 'uat_code'
天擎接口优化

See merge request eshop/biz_service_ebtp_extend!114
2022-07-27 16:51:25 +08:00
6df457a678 天擎接口优化 2022-07-27 16:50:24 +08:00
4137453c0f Merge branch 'uat' into 'uat_code'
Uat

See merge request eshop/biz_service_ebtp_extend!112
2022-07-26 15:11:38 +08:00
18687baa0d Merge branch 'uat-put&delete' into 'uat'
put&delete

See merge request eshop/biz_service_ebtp_extend!111
2022-07-26 15:08:49 +08:00
yss
7110ad3c31 区块链根据mconfig.bss.app-secret 修改请求路径 2022-07-20 19:38:29 +08:00
bd67db61ac Merge branch 'uat_partyMemberEvent' 2022-07-15 20:40:34 +08:00
720609b71b Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-15 15:49:45 +08:00
2857f0e4ee 查询过滤 2022-07-15 15:49:25 +08:00
eec1202338 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-15 14:59:22 +08:00
89c1824c6d 查询过滤 2022-07-15 14:58:59 +08:00
d1d51c5850 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-15 10:00:02 +08:00
807d280762 修改排序 2022-07-15 09:59:38 +08:00
a3142bfcf3 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-14 16:17:26 +08:00
8743da85fb 修改排序 2022-07-14 16:16:39 +08:00
feba281453 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-14 15:54:57 +08:00
a9593a9493 修改排序 2022-07-14 15:54:16 +08:00
5b46de5b06 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-14 15:23:16 +08:00
855a1dbb8a 修改接口参数 2022-07-14 15:22:01 +08:00
6ab07f7db0 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-13 14:13:30 +08:00