From 2592e3b25f4e1394549092b5ff76b1c8d6596242 Mon Sep 17 00:00:00 2001
From: taozi <552920369@qq.com>
Date: Thu, 16 Jul 2020 14:10:23 +0800
Subject: [PATCH] =?UTF-8?q?bug--=E6=9D=83=E9=99=90=E5=AE=8C=E5=96=84?=
=?UTF-8?q?=E5=92=8C=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8=E7=9A=84=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sql/yshop-menu添加permission权限标识.sql | 4 ++--
yshop-admin/pom.xml | 12 ------------
.../category/rest/StoreCategoryController.java | 2 +-
.../modules/order/rest/StoreOrderController.java | 4 ++--
4 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/sql/yshop-menu添加permission权限标识.sql b/sql/yshop-menu添加permission权限标识.sql
index 5735aa7f..dea4303b 100644
--- a/sql/yshop-menu添加permission权限标识.sql
+++ b/sql/yshop-menu添加permission权限标识.sql
@@ -49,7 +49,7 @@ INSERT INTO `menu` VALUES (36, b'0', '系统工具', '', 0, 101, 'sys-tools', 's
INSERT INTO `menu` VALUES (37, b'0', '岗位管理', 'system/job/index', 1, 7, 'Steve-Jobs', 'job', b'0', b'0', 'Job', '2019-03-29 13:51:18', 'user:list', 1, NULL, 0);
INSERT INTO `menu` VALUES (39, b'0', '字典管理', 'system/dict/index', 1, 8, 'dictionary', 'dict', b'0', b'0', 'Dict', '2019-04-10 11:49:04', 'dict:list', 1, NULL, 0);
INSERT INTO `menu` VALUES (40, b'0', '商品管理', '', 0, 1, 'shop', 'shop', b'1', b'0', '', '2019-10-03 17:40:19', NULL, 1, NULL, 0);
-INSERT INTO `menu` VALUES (41, b'0', '商品分类', 'shop/cate/index', 40, 11, 'icon', 'cate', b'0', b'0', 'Cate', '2019-10-03 17:42:35', 'cate:list,YXSTORECATEGORY_ALL,YXSTORECATEGORY_SELECT', 1, NULL, 0);
+INSERT INTO `menu` VALUES (41, b'0', '商品分类', 'shop/cate/index', 40, 11, 'icon', 'cate', b'0', b'0', 'Cate', '2019-10-03 17:42:35', 'YXSTORECATEGORY_ALL,YXSTORECATEGORY_SELECT', 1, NULL, 0);
INSERT INTO `menu` VALUES (45, b'0', '管理商品', 'shop/goods/tab', 40, 12, 'develop', 'goods', b'1', b'0', 'Goods', '2019-10-04 15:34:35', 'YXSTOREPRODUCT_SELECT,YXSTORECATEGORY_ALL,YXSTORECATEGORY_SELECT', 1, NULL, 0);
INSERT INTO `menu` VALUES (46, b'0', '会员管理', '', 0, 2, 'peoples', 'member', b'0', b'0', '', '2019-10-06 16:18:05', NULL, 1, NULL, 0);
INSERT INTO `menu` VALUES (47, b'0', '会员', 'shop/user/index', 46, 21, 'peoples', 'member', b'0', b'0', 'Member', '2019-10-06 16:20:17', 'YXUSER_SELECT', 1, NULL, 0);
@@ -59,7 +59,7 @@ INSERT INTO `menu` VALUES (50, b'0', '图文管理', 'wechat/article/index', 48,
INSERT INTO `menu` VALUES (51, b'0', '自动回复', 'wechat/reply/index', 48, 33, 'reply', 'wereply', b'0', b'0', 'Wereply', '2019-10-10 09:58:31', 'YXWECHATREPLY_ALL', 1, NULL, 0);
INSERT INTO `menu` VALUES (52, b'0', '公众号配置', 'wechat/config/index', 48, 34, 'configure', 'weconfig', b'0', b'0', 'WeConfig', '2019-10-10 15:52:24', 'YXSYSTEMCONFIG_ALL', 1, NULL, 0);
INSERT INTO `menu` VALUES (53, b'0', '订单管理', '', 0, 4, 'lock', 'order', b'0', b'0', '', '2019-10-14 14:35:18', NULL, 1, NULL, 0);
-INSERT INTO `menu` VALUES (54, b'0', '订单', 'shop/order/index', 53, 41, 'order', 'order', b'0', b'0', 'Order', '2019-10-14 14:36:28', 'YXSTOREORDER_SELECT', 1, NULL, 0);
+INSERT INTO `menu` VALUES (54, b'0', '订单', 'shop/order/index', 53, 41, 'order', 'order', b'0', b'0', 'Order', '2019-10-14 14:36:28', 'YXSTOREORDER_SELECT,YXEXPRESS_SELECT', 1, NULL, 0);
INSERT INTO `menu` VALUES (55, b'0', '商城配置', '', 0, 15, 'configure', 'set', b'0', b'0', '', '2019-10-18 15:21:26', NULL, 1, '2020-06-26 15:18:20', 0);
INSERT INTO `menu` VALUES (56, b'0', '首页幻灯片', 'shop/set/index', 55, 51, 'banner', 'homeBanner', b'0', b'0', 'HomeBanner', '2019-10-18 15:24:30', 'YXSYSTEMGROUPDATA_ALL,YXSYSTEMGROUPDATA_SELECT', 1, NULL, 0);
INSERT INTO `menu` VALUES (57, b'0', '首页导航按钮', 'shop/set/menu', 55, 52, 'button', 'homeMenus', b'0', b'0', 'HomeMenus', '2019-10-18 17:23:35', 'YXSYSTEMGROUPDATA_ALL,YXSYSTEMGROUPDATA_SELECT', 1, NULL, 0);
diff --git a/yshop-admin/pom.xml b/yshop-admin/pom.xml
index 739e1bd7..789415a7 100644
--- a/yshop-admin/pom.xml
+++ b/yshop-admin/pom.xml
@@ -74,18 +74,6 @@
quartz
-
- ch.ethz.ganymed
- ganymed-ssh2
- build210
-
-
-
- com.jcraft
- jsch
- 0.1.55
-
-
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java b/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java
index 2fe0d0c1..0f1eae73 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java
@@ -57,7 +57,7 @@ public class StoreCategoryController {
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/yxStoreCategory/download")
- @PreAuthorize("@el.check('admin','cate:list')")
+ @PreAuthorize("@el.check('admin','YXSTORECATEGORY_SELECT')")
public void download(HttpServletResponse response, YxStoreCategoryQueryCriteria criteria) throws IOException {
yxStoreCategoryService.download(yxStoreCategoryService.queryAll(criteria), response);
}
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
index a81d5465..ea78f665 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
@@ -107,7 +107,7 @@ public class StoreOrderController {
@ApiOperation(value = "查询订单")
@GetMapping(value = "/yxStoreOrder")
- @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_SELECT')")
+ @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_SELECT','YXEXPRESS_SELECT')")
public ResponseEntity getYxStoreOrders(YxStoreOrderQueryCriteria criteria,
Pageable pageable,
@RequestParam(name = "orderStatus") String orderStatus,
@@ -222,7 +222,7 @@ public class StoreOrderController {
@Log("导出数据")
@ApiOperation("导出数据")
@GetMapping(value = "/yxStoreOrder/download")
- @PreAuthorize("@el.check('admin','cate:list')")
+ @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_SELECT')")
public void download(HttpServletResponse response,
YxStoreOrderQueryCriteria criteria,
Pageable pageable,