diff --git a/README.md b/README.md index b5b555f0b..6730f96a7 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

star - Build Status + Build Status Build Status Build Status Downloads diff --git a/_config/sql/2.0.2/2.0.2.update.data.sql b/_config/sql/2.0.2/2.0.2.update.data.sql index f2548343e..19a4a3551 100644 --- a/_config/sql/2.0.2/2.0.2.update.data.sql +++ b/_config/sql/2.0.2/2.0.2.update.data.sql @@ -62,6 +62,14 @@ INSERT INTO `iam_role_path`(`id`, `role_id`, `permission_id`) VALUES (1764931648 INSERT INTO `iam_role_path`(`id`, `role_id`, `permission_id`) VALUES (1764931648924622852, 1757297023118462976, 1764663810424303616); +INSERT INTO `iam_role_menu`(`id`, `role_id`, `client_code`, `permission_id`) VALUES (1764945575888781312, 1757297023118462976, 'dax-pay', 1764638353289027584); + +INSERT INTO `iam_role_menu`(`id`, `role_id`, `client_code`, `permission_id`) VALUES (1764945575888781313, 1757297023118462976, 'dax-pay', 1764638678821543936); + +INSERT INTO `iam_role_menu`(`id`, `role_id`, `client_code`, `permission_id`) VALUES (1764945576350154752, 1757298887092326400, 'dax-pay', 1764638353289027584); + +INSERT INTO `iam_role_menu`(`id`, `role_id`, `client_code`, `permission_id`) VALUES (1764945576350154753, 1757298887092326400, 'dax-pay', 1764638678821543936); + INSERT INTO `starter_quartz_job`(`id`, `name`, `job_class_name`, `cron`, `parameter`, `state`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1764664552203743232, '支付宝定时对账', 'cn.bootx.platform.daxpay.service.task.ReconcileTask', '* * 11 * * ? *', '{\"channel\":\"ali_pay\",\"n\":1}', 0, '', 1399985191002447872, '2024-03-04 22:49:50', 1399985191002447872, '2024-03-04 22:49:50', 0, 0); INSERT INTO `starter_quartz_job`(`id`, `name`, `job_class_name`, `cron`, `parameter`, `state`, `remark`, `creator`, `create_time`, `last_modifier`, `last_modified_time`, `version`, `deleted`) VALUES (1764667388106887168, '微信支付定时对账', 'cn.bootx.platform.daxpay.service.task.ReconcileTask', '* * 11 * * ? *', '{\"channel\":\"wechat_pay\",\"n\":1}', 0, '', 1399985191002447872, '2024-03-04 23:01:06', 1399985191002447872, '2024-03-04 23:01:06', 0, 0); diff --git a/_config/sql/dax-pay.sql b/_config/sql/dax-pay.sql index 72597dc70..2c675b02b 100644 --- a/_config/sql/dax-pay.sql +++ b/_config/sql/dax-pay.sql @@ -1521,6 +1521,10 @@ CREATE TABLE `iam_role_menu` ( -- ---------------------------- -- Records of iam_role_menu -- ---------------------------- +INSERT INTO `iam_role_menu` VALUES (1764945575888781312, 1757297023118462976, 'dax-pay', 1764638353289027584); +INSERT INTO `iam_role_menu` VALUES (1764945575888781313, 1757297023118462976, 'dax-pay', 1764638678821543936); +INSERT INTO `iam_role_menu` VALUES (1764945576350154752, 1757298887092326400, 'dax-pay', 1764638353289027584); +INSERT INTO `iam_role_menu` VALUES (1764945576350154753, 1757298887092326400, 'dax-pay', 1764638678821543936); INSERT INTO `iam_role_menu` VALUES (1757298674730520576, 1757297023118462976, 'dax-pay', 1744271715476684800); INSERT INTO `iam_role_menu` VALUES (1757298674730520577, 1757297023118462976, 'dax-pay', 1744642856348520448); INSERT INTO `iam_role_menu` VALUES (1757298674730520578, 1757297023118462976, 'dax-pay', 1745457623493496832); diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md index 6c89beb70..44c0eb22b 100644 --- a/_doc/ChangeLog.md +++ b/_doc/ChangeLog.md @@ -1,8 +1,9 @@ # CHANGELOG ## [v2.0.2] +- 增加微信支付对账功能 +- 增加支付宝支付对账功能 +- 优化: 修复策略对订单时间和状态字段的变更优化 - fix: 前端支付订单查询条件中"支付ID"条件不生效 - - ## [v2.0.1] - 增加支付、退款时客户通知功能，支持多次重发 - 开源文档增加支付通知和退款通知文档 @@ -24,7 +25,7 @@ - fix: 修复简单退款选择全部退款时报错问题 - fix: 修复退款时未检验退款金额问题，导致可以退款余额可以大于可退余额 -## [v2.0.1] +## [v2.0.2] - 支持支付宝支付: 扫码支付、付款码支付、PC支付、H5支付 - 支持微信支付: 扫码支付、WAP支付、公众号支付 - 增加聚合支付演示功能，支持支付宝和微信支付 diff --git a/daxpay-single-demo/pom.xml b/daxpay-single-demo/pom.xml index 43fca2ade..845bb4e5e 100644 --- a/daxpay-single-demo/pom.xml +++ b/daxpay-single-demo/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform dax-pay - 2.0.1 + 2.0.2 daxpay-single-demo @@ -36,7 +36,7 @@ cn.bootx.platform daxpay-single-sdk - 2.0.1 + 2.0.2 diff --git a/daxpay-single-sdk/pom.xml b/daxpay-single-sdk/pom.xml index cabbbb473..3d787473a 100644 --- a/daxpay-single-sdk/pom.xml +++ b/daxpay-single-sdk/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform daxpay-single-sdk - 2.0.1 + 2.0.2 jar diff --git a/daxpay-single/daxpay-single-admin/pom.xml b/daxpay-single/daxpay-single-admin/pom.xml index 121cbae90..555b52b66 100644 --- a/daxpay-single/daxpay-single-admin/pom.xml +++ b/daxpay-single/daxpay-single-admin/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform daxpay-single - 2.0.1 + 2.0.2 daxpay-single-admin diff --git a/daxpay-single/daxpay-single-core/pom.xml b/daxpay-single/daxpay-single-core/pom.xml index c4ec15a4c..8441690e4 100644 --- a/daxpay-single/daxpay-single-core/pom.xml +++ b/daxpay-single/daxpay-single-core/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform daxpay-single - 2.0.1 + 2.0.2 daxpay-single-core diff --git a/daxpay-single/daxpay-single-gateway/pom.xml b/daxpay-single/daxpay-single-gateway/pom.xml index c16bb3bf6..6ea8cba4b 100644 --- a/daxpay-single/daxpay-single-gateway/pom.xml +++ b/daxpay-single/daxpay-single-gateway/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform daxpay-single - 2.0.1 + 2.0.2 daxpay-single-gateway diff --git a/daxpay-single/daxpay-single-service/pom.xml b/daxpay-single/daxpay-single-service/pom.xml index 84f640c01..792ff7b8e 100644 --- a/daxpay-single/daxpay-single-service/pom.xml +++ b/daxpay-single/daxpay-single-service/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform daxpay-single - 2.0.1 + 2.0.2 daxpay-single-service diff --git a/daxpay-single/daxpay-single-start/pom.xml b/daxpay-single/daxpay-single-start/pom.xml index 5fefd644a..b0adf07fd 100644 --- a/daxpay-single/daxpay-single-start/pom.xml +++ b/daxpay-single/daxpay-single-start/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform daxpay-single - 2.0.1 + 2.0.2 daxpay-single-start diff --git a/daxpay-single/daxpay-single-start/src/main/resources/application-dev.yml b/daxpay-single/daxpay-single-start/src/main/resources/application-dev.yml index a510479c6..4997c4249 100644 --- a/daxpay-single/daxpay-single-start/src/main/resources/application-dev.yml +++ b/daxpay-single/daxpay-single-start/src/main/resources/application-dev.yml @@ -65,7 +65,7 @@ bootx: swagger: enabled: true author: bootx - version: 2.0.1 + version: 2.0.2 title: 开源支付平台-单商户 description: 开源支付平台-单商户版 # 多模块扫码 diff --git a/daxpay-single/pom.xml b/daxpay-single/pom.xml index 6f1c489a2..d3e6aacc1 100644 --- a/daxpay-single/pom.xml +++ b/daxpay-single/pom.xml @@ -6,7 +6,7 @@ cn.bootx.platform dax-pay - 2.0.1 + 2.0.2 daxpay-single diff --git a/pom.xml b/pom.xml index 33425cb60..93f22ecf5 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ cn.bootx.platform dax-pay pom - 2.0.1 + 2.0.2 daxpay-single @@ -30,7 +30,7 @@ 1.3.6.2 - 2.0.1 + 2.0.2 1.7.30 3.16.8