From 7ac96de72fe7d5b8c1fc8427c0b054e50a4c619d Mon Sep 17 00:00:00 2001 From: dingzhiwei Date: Mon, 14 Jun 2021 01:23:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=9A=84=E5=88=97=E8=A1=A8=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/sql/init.sql | 8 ++++++++ .../jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java | 2 +- .../jeepay/mgr/ctrl/merchant/MchInfoController.java | 2 +- .../jeepay/mgr/ctrl/order/MchNotifyController.java | 2 +- .../jeequan/jeepay/mgr/ctrl/order/PayOrderController.java | 2 +- .../jeepay/mgr/ctrl/order/RefundOrderController.java | 2 +- .../jeequan/jeepay/mgr/ctrl/sysuser/SysLogController.java | 2 +- .../jeequan/jeepay/mch/ctrl/order/PayOrderController.java | 2 +- .../jeepay/mch/ctrl/order/RefundOrderController.java | 2 +- 9 files changed, 16 insertions(+), 8 deletions(-) diff --git a/docs/sql/init.sql b/docs/sql/init.sql index c20fc3c..2f8891d 100644 --- a/docs/sql/init.sql +++ b/docs/sql/init.sql @@ -374,6 +374,7 @@ insert into t_sys_entitlement values('ENT_C_MAIN', '主页', 'home', '/main', 'M -- 商户管理 insert into t_sys_entitlement values('ENT_MCH_INFO', '商户管理', 'shop', '', 'RouteView', 'ML', 0, 1, 'ROOT', '30', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_MCH_INFO_LIST', '商户列表', 'profile', '/mch', 'MchListPage', 'ML', 0, 1, 'ENT_MCH_INFO', '10', 'MGR', now(), now()); + insert into t_sys_entitlement values('ENT_MCH_LIST', '页面：商户列表', 'no-icon', '', '', 'PB', 0, 1, 'ENT_MCH_INFO_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_MCH_INFO_ADD', '按钮：新增', 'no-icon', '', '', 'PB', 0, 1, 'ENT_MCH_INFO_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_MCH_INFO_EDIT', '按钮：编辑', 'no-icon', '', '', 'PB', 0, 1, 'ENT_MCH_INFO_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_MCH_INFO_VIEW', '按钮：详情', 'no-icon', '', '', 'PB', 0, 1, 'ENT_MCH_INFO_LIST', '0', 'MGR', now(), now()); @@ -388,6 +389,7 @@ insert into t_sys_entitlement values('ENT_MCH_INFO', '商户管理', 'shop', '', -- 服务商管理 insert into t_sys_entitlement values('ENT_ISV_INFO', '服务商管理', 'block', '', 'RouteView', 'ML', 0, 1, 'ROOT', '40', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_ISV_INFO_LIST', '服务商列表', 'profile', '/isv', 'IsvListPage', 'ML', 0, 1, 'ENT_ISV_INFO', '10', 'MGR', now(), now()); + insert into t_sys_entitlement values('ENT_ISV_LIST', '页面：服务商列表', 'no-icon', '', '', 'PB', 0, 1, 'ENT_ISV_INFO_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_ISV_INFO_ADD', '按钮：新增', 'no-icon', '', '', 'PB', 0, 1, 'ENT_ISV_INFO_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_ISV_INFO_EDIT', '按钮：编辑', 'no-icon', '', '', 'PB', 0, 1, 'ENT_ISV_INFO_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_ISV_INFO_VIEW', '按钮：详情', 'no-icon', '', '', 'PB', 0, 1, 'ENT_ISV_INFO_LIST', '0', 'MGR', now(), now()); @@ -399,10 +401,13 @@ insert into t_sys_entitlement values('ENT_ISV_INFO', '服务商管理', 'block', -- 订单管理 insert into t_sys_entitlement values('ENT_ORDER', '订单管理', 'transaction', '', 'RouteView', 'ML', 0, 1, 'ROOT', '50', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_PAY_ORDER_LIST', '支付订单', 'account-book', '/pay', 'PayOrderListPage', 'ML', 0, 1, 'ENT_ORDER', '10', 'MGR', now(), now()); + insert into t_sys_entitlement values('ENT_ORDER_LIST', '页面：订单列表', 'no-icon', '', '', 'PB', 0, 1, 'ENT_PAY_ORDER_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_PAY_ORDER_VIEW', '按钮：详情', 'no-icon', '', '', 'PB', 0, 1, 'ENT_PAY_ORDER_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_REFUND_ORDER_LIST', '退款订单', 'exception', '/refund', 'RefundOrderListPage', 'ML', 0, 1, 'ENT_ORDER', '20', 'MGR', now(), now()); + insert into t_sys_entitlement values('ENT_REFUND_LIST', '页面：退款订单列表', 'no-icon', '', '', 'PB', 0, 1, 'ENT_REFUND_ORDER_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_REFUND_ORDER_VIEW', '按钮：详情', 'no-icon', '', '', 'PB', 0, 1, 'ENT_REFUND_ORDER_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_MCH_NOTIFY_LIST', '商户通知', 'notification', '/notify', 'MchNotifyListPage', 'ML', 0, 1, 'ENT_ORDER', '30', 'MGR', now(), now()); + insert into t_sys_entitlement values('ENT_NOTIFY_LIST', '页面：商户通知列表', 'no-icon', '', '', 'PB', 0, 1, 'ENT_MCH_NOTIFY_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_MCH_NOTIFY_VIEW', '按钮：详情', 'no-icon', '', '', 'PB', 0, 1, 'ENT_MCH_NOTIFY_LIST', '0', 'MGR', now(), now()); -- 支付配置菜单 @@ -449,6 +454,7 @@ insert into t_sys_entitlement values('ENT_SYS_CONFIG', '系统管理', 'setting' insert into t_sys_entitlement values('ENT_SYS_CONFIG_EDIT', '按钮： 修改', 'no-icon', '', '', 'PB', 0, 1, 'ENT_SYS_CONFIG_INFO', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_SYS_LOG_LIST', '系统日志', 'file-text', '/log', 'SysLogPage', 'ML', 0, 1, 'ENT_SYS_CONFIG', '20', 'MGR', now(), now()); + insert into t_sys_entitlement values('ENT_LOG_LIST', '页面：系统日志列表', 'no-icon', '', '', 'PB', 0, 1, 'ENT_SYS_LOG_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_SYS_LOG_VIEW', '按钮：详情', 'no-icon', '', '', 'PB', 0, 1, 'ENT_SYS_LOG_LIST', '0', 'MGR', now(), now()); insert into t_sys_entitlement values('ENT_SYS_LOG_DEL', '按钮：删除', 'no-icon', '', '', 'PB', 0, 1, 'ENT_SYS_LOG_LIST', '0', 'MGR', now(), now()); @@ -472,8 +478,10 @@ insert into t_sys_entitlement values('ENT_MCH_MAIN', '主页', 'home', '/main', -- 【商户系统】 订单管理 insert into t_sys_entitlement values('ENT_ORDER', '订单中心', 'transaction', '', 'RouteView', 'ML', 0, 1, 'ROOT', '20', 'MCH', now(), now()); insert into t_sys_entitlement values('ENT_PAY_ORDER_LIST', '订单管理', 'account-book', '/pay', 'PayOrderListPage', 'ML', 0, 1, 'ENT_ORDER', '10', 'MCH', now(), now()); + insert into t_sys_entitlement values('ENT_ORDER_LIST', '页面：订单列表', 'no-icon', '', '', 'PB', 0, 1, 'ENT_PAY_ORDER_LIST', '0', 'MCH', now(), now()); insert into t_sys_entitlement values('ENT_PAY_ORDER_VIEW', '按钮：详情', 'no-icon', '', '', 'PB', 0, 1, 'ENT_PAY_ORDER_LIST', '0', 'MCH', now(), now()); insert into t_sys_entitlement values('ENT_REFUND_ORDER_LIST', '退款记录', 'exception', '/refund', 'RefundOrderListPage', 'ML', 0, 1, 'ENT_ORDER', '20', 'MCH', now(), now()); + insert into t_sys_entitlement values('ENT_REFUND_LIST', '页面：退款订单列表', 'no-icon', '', '', 'PB', 0, 1, 'ENT_REFUND_ORDER_LIST', '0', 'MCH', now(), now()); insert into t_sys_entitlement values('ENT_REFUND_ORDER_VIEW', '按钮：详情', 'no-icon', '', '', 'PB', 0, 1, 'ENT_REFUND_ORDER_LIST', '0', 'MCH', now(), now()); -- 【商户系统】 支付配置 diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java index d59719a..45ad2d9 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/isv/IsvInfoController.java @@ -52,7 +52,7 @@ public class IsvInfoController extends CommonCtrl { * @date: 2021/6/7 16:12 * @describe: 查询服务商信息列表 */ - @PreAuthorize("hasAuthority('ENT_ISV_INFO_LIST')") + @PreAuthorize("hasAuthority('ENT_ISV_LIST')") @RequestMapping(value="", method = RequestMethod.GET) public ApiRes list() { IsvInfo isvInfo = getObject(IsvInfo.class); diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java index 2f5a1f8..daf1e9e 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/merchant/MchInfoController.java @@ -61,7 +61,7 @@ public class MchInfoController extends CommonCtrl { * @date: 2021/6/7 16:14 * @describe: 商户信息列表 */ - @PreAuthorize("hasAuthority('ENT_MCH_INFO_LIST')") + @PreAuthorize("hasAuthority('ENT_MCH_LIST')") @RequestMapping(value="", method = RequestMethod.GET) public ApiRes list() { MchInfo mchInfo = getObject(MchInfo.class); diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/MchNotifyController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/MchNotifyController.java index 9f8bef6..ed58804 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/MchNotifyController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/MchNotifyController.java @@ -49,7 +49,7 @@ public class MchNotifyController extends CommonCtrl { * @date: 2021/6/7 16:14 * @describe: 商户通知列表 */ - @PreAuthorize("hasAuthority('ENT_MCH_NOTIFY_LIST')") + @PreAuthorize("hasAuthority('ENT_NOTIFY_LIST')") @RequestMapping(value="", method = RequestMethod.GET) public ApiRes list() { diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java index f4557bf..eb9ecb8 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java @@ -56,7 +56,7 @@ public class PayOrderController extends CommonCtrl { * @date: 2021/6/7 16:15 * @describe: 订单信息列表 */ - @PreAuthorize("hasAuthority('ENT_PAY_ORDER_LIST')") + @PreAuthorize("hasAuthority('ENT_ORDER_LIST')") @RequestMapping(value="", method = RequestMethod.GET) public ApiRes list() { diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java index 6fbf06e..8d083a2 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/RefundOrderController.java @@ -49,7 +49,7 @@ public class RefundOrderController extends CommonCtrl { * @date: 2021/6/7 16:15 * @describe: 退款订单信息列表 */ - @PreAuthorize("hasAuthority('ENT_REFUND_ORDER_LIST')") + @PreAuthorize("hasAuthority('ENT_REFUND_LIST')") @RequestMapping(value="", method = RequestMethod.GET) public ApiRes list() { diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysLogController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysLogController.java index b5701c8..d8450d8 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysLogController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/sysuser/SysLogController.java @@ -54,7 +54,7 @@ public class SysLogController extends CommonCtrl { * @date: 2021/6/7 16:15 * @describe: 日志记录列表 */ - @PreAuthorize("hasAuthority('ENT_SYS_LOG_LIST')") + @PreAuthorize("hasAuthority('ENT_LOG_LIST')") @RequestMapping(value="", method = RequestMethod.GET) public ApiRes list() { SysLog sysLog = getObject(SysLog.class); diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java index 8b06816..ee91831 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/PayOrderController.java @@ -58,7 +58,7 @@ public class PayOrderController extends CommonCtrl { * @Description: 订单信息列表 * @Date: 10:43 2021/5/13 */ - @PreAuthorize("hasAuthority('ENT_PAY_ORDER_LIST')") + @PreAuthorize("hasAuthority('ENT_ORDER_LIST')") @GetMapping public ApiRes list() { diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java index 197ab19..7acabc2 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/order/RefundOrderController.java @@ -49,7 +49,7 @@ public class RefundOrderController extends CommonCtrl { * @Description: 退款订单信息列表 * @Date: 10:44 2021/5/13 */ - @PreAuthorize("hasAuthority('ENT_REFUND_ORDER_LIST')") + @PreAuthorize("hasAuthority('ENT_REFUND_LIST')") @GetMapping public ApiRes list() { -- GitLab