Merge branch 'master' of https://git.dayouqiantu.cn/yshopb2c/yshop

sql/yshop-menu添加permission权限标识.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50717
  File Encoding         : 65001
 
- Date: 16/07/2020 20:11:40
+ Date: 06/08/2020 23:18:31
 */
 
 SET NAMES utf8mb4;
@@ -53,7 +53,7 @@ INSERT INTO `menu` VALUES (6, b'0', '系统监控', NULL, 0, 100, 'monitor', 'mo
 INSERT INTO `menu` VALUES (7, b'0', '操作日志', 'monitor/log/index', 6, 11, 'log', 'logs', b'1', b'0', 'Log', '2018-12-18 15:18:26', 'log:list', 1, NULL, 0);
 INSERT INTO `menu` VALUES (9, b'0', 'SQL监控', 'monitor/sql/index', 6, 14, 'sqlMonitor', 'druid', b'0', b'0', 'Sql', '2018-12-18 15:19:34', NULL, 1, NULL, 0);
 INSERT INTO `menu` VALUES (14, b'0', '邮件工具', 'tools/email/index', 36, 24, 'email', 'email', b'0', b'0', 'Email', '2018-12-27 10:13:09', NULL, 1, NULL, 0);
-INSERT INTO `menu` VALUES (18, b'0', '存储管理', 'tools/storage/index', 36, 23, 'qiniu', 'storage', b'0', b'0', 'Storage', '2018-12-31 11:12:15', 'storage:list', 1, NULL, 0);
+INSERT INTO `menu` VALUES (18, b'0', '存储管理', 'tools/storage/index', 36, 23, 'qiniu', 'storage', b'0', b'0', 'Storage', '2018-12-31 11:12:15', 'storage:list', 1, '2020-08-06 22:57:28', 0);
 INSERT INTO `menu` VALUES (19, b'0', '支付宝工具', 'tools/aliPay/index', 36, 27, 'alipay', 'aliPay', b'0', b'0', 'AliPay', '2018-12-31 14:52:38', NULL, 1, NULL, 0);
 INSERT INTO `menu` VALUES (28, b'0', '定时任务', 'system/timing/index', 36, 21, 'timing', 'timing', b'0', b'0', 'Timing', '2019-01-07 20:34:40', 'timing:list', 1, NULL, 0);
 INSERT INTO `menu` VALUES (30, b'0', '代码生成', 'generator/index', 36, 22, 'dev', 'generator', b'0', b'0', 'GeneratorIndex', '2019-01-11 15:45:55', NULL, 1, NULL, 0);
@@ -64,7 +64,7 @@ INSERT INTO `menu` VALUES (37, b'0', '岗位管理', 'system/job/index', 1, 7, '
 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', '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 (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,YXSYSTEMGROUPDATA_SELECT', 1, '2020-08-06 23:01:36', 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);
 INSERT INTO `menu` VALUES (48, b'0', '微信管理', '', 0, 14, 'weixin', 'wechat', b'0', b'0', '', '2019-10-06 18:28:54', NULL, 1, '2020-06-26 15:18:32', 0);
@@ -84,12 +84,12 @@ INSERT INTO `menu` VALUES (62, b'0', '评论管理', 'shop/reply/index', 53, 42,
 INSERT INTO `menu` VALUES (63, b'0', '营销管理', '', 0, 6, 'yingxiao', 'activity', b'0', b'0', '', '2019-11-09 14:17:42', NULL, 1, NULL, 0);
 INSERT INTO `menu` VALUES (64, b'0', '优惠券制作', 'activity/coupon/index', 229, 61, 'coupon', 'coupon', b'0', b'0', 'Coupon', '2019-11-09 14:18:58', 'YXSTORECOUPON_SELECT', 1, '2020-06-26 15:16:40', 0);
 INSERT INTO `menu` VALUES (65, b'0', '已发布优惠券', 'activity/couponissue/index', 229, 62, 'coupon2', 'couponissue', b'0', b'0', 'Couponissue', '2019-11-09 14:20:35', 'YXSTORECOUPONISSUE_SELECT', 1, '2020-06-26 15:16:48', 0);
-INSERT INTO `menu` VALUES (66, b'0', '优惠券领取记录', 'activity/storecouponuser/index', 229, 63, 'log', 'couponuser', b'0', b'0', 'Couponuser', '2019-11-09 14:21:35', 'YXSTORECOUPONUSER_SELECT', 1, '2020-06-26 15:16:57', 0);
+INSERT INTO `menu` VALUES (66, b'0', '优惠券领取记录', 'activity/storecouponuser/index', 229, 63, 'log', 'couponuser', b'0', b'0', 'Couponuser', '2019-11-09 14:21:35', 'YXSTORECOUPONUSER_SELECT,YXSTORECOUPONUSER_SELECT', 1, '2020-08-06 23:11:10', 0);
-INSERT INTO `menu` VALUES (68, b'0', '积分配置', 'wechat/config/point', 227, 59, 'configure', 'pointConfig', b'0', b'0', 'PointConfig', '2019-11-10 18:45:55', 'YXSYSTEMCONFIG_SELECT', 1, '2020-06-26 15:01:33', 0);
+INSERT INTO `menu` VALUES (68, b'0', '积分配置', 'wechat/config/point', 227, 59, 'configure', 'pointConfig', b'0', b'0', 'PointConfig', '2019-11-10 18:45:55', 'YXSYSTEMCONFIG_SELECT,YXSYSTEMCONFIG_SELECT', 1, '2020-08-06 23:09:31', 0);
 INSERT INTO `menu` VALUES (69, b'0', '分销管理', '', 0, 7, 'fenxiao', 'promoter', b'0', b'0', '', '2019-11-11 10:42:16', NULL, 1, NULL, 0);
-INSERT INTO `menu` VALUES (70, b'0', '分销配置', 'wechat/config/promoter', 69, 71, 'configure', 'promoterconfig', b'0', b'0', 'Promoterconfig', '2019-11-11 10:48:37', 'YXSYSTEMCONFIG_SELECT', 1, NULL, 0);
+INSERT INTO `menu` VALUES (70, b'0', '分销配置', 'wechat/config/promoter', 69, 71, 'configure', 'promoterconfig', b'0', b'0', 'Promoterconfig', '2019-11-11 10:48:37', 'YXSYSTEMCONFIG_SELECT,YXSYSTEMCONFIG_SELECT', 1, '2020-08-06 23:12:31', 0);
 INSERT INTO `menu` VALUES (71, b'0', '分销员', 'shop/user/aindex', 69, 72, 'user', 'agent', b'0', b'0', 'Agent', '2019-11-13 18:32:00', 'YXUSER_SELECT', 1, NULL, 1);
-INSERT INTO `menu` VALUES (72, b'0', '提现管理', 'activity/extract/index', 176, 81, 'tixian', 'extract', b'0', b'0', 'Extract', '2019-11-14 10:49:39', 'YXUSEREXTRACT_SELECT', 1, NULL, 0);
+INSERT INTO `menu` VALUES (72, b'0', '提现管理', 'activity/extract/index', 176, 81, 'tixian', 'extract', b'0', b'0', 'Extract', '2019-11-14 10:49:39', 'YXUSEREXTRACT_SELECT,YXUSEREXTRACT_SELECT', 1, '2020-08-06 23:07:28', 0);
 INSERT INTO `menu` VALUES (73, b'0', '拼团产品', 'activity/combination/index', 63, 64, 'peoples', 'combination', b'0', b'0', 'Combination', '2019-11-18 14:23:04', 'YXSTORECOMBINATION_SELECT', 1, NULL, 0);
 INSERT INTO `menu` VALUES (74, b'0', '拼团列表', 'activity/combinlist/index', 63, 65, 'list', 'pink', b'0', b'0', 'Pink', '2019-11-21 19:35:58', 'YXSTOREPINK_SELECT', 1, NULL, 0);
 INSERT INTO `menu` VALUES (75, b'0', '微信支付配置', 'wechat/config/pay', 48, 35, 'wxpay', 'wxpayconfig', b'0', b'0', 'Wxpayconfig', '2019-11-28 17:06:22', 'YXSYSTEMCONFIG_ALL', 1, NULL, 0);
@@ -113,7 +113,7 @@ INSERT INTO `menu` VALUES (120, b'0', '商品删除', NULL, 45, 4, NULL, NULL, b
 INSERT INTO `menu` VALUES (121, b'0', '在线用户', 'monitor/online/index', 6, 10, 'Steve-Jobs', 'online', b'0', b'0', 'OnlineUser', '2020-01-06 22:46:43', NULL, 1, NULL, 0);
 INSERT INTO `menu` VALUES (122, b'0', '浏览记录', 'monitor/log/mlog', 40, 13, 'log', 'viewlog', b'0', b'0', 'Viewlog', '2020-01-07 13:17:21', NULL, 1, NULL, 1);
 INSERT INTO `menu` VALUES (123, b'0', '后台接口文档', 'tools/swagger/index', 36, 31, 'swagger', 'swagger2', b'0', b'0', 'Swagger', '2020-01-07 18:05:52', NULL, 1, NULL, 0);
-INSERT INTO `menu` VALUES (124, b'0', '在线会员', 'monitor/online/indext', 46, 25, 'Steve-Jobs', 'onlinet', b'0', b'0', 'OnlineMember', '2020-01-13 10:53:07', NULL, 1, NULL, 0);
+INSERT INTO `menu` VALUES (124, b'0', '在线会员', 'monitor/online/indext', 46, 25, 'Steve-Jobs', 'onlinet', b'0', b'0', 'OnlineMember', '2020-01-13 10:53:07', 'auth_online', 1, '2020-08-06 22:50:49', 0);
 INSERT INTO `menu` VALUES (125, b'0', '邮费配置', 'wechat/config/postage', 55, 58, 'configure', 'postageConfig', b'0', b'0', 'PostageConfig', '2020-02-13 15:38:24', 'YXSYSTEMCONFIG_SELECT', 1, NULL, 1);
 INSERT INTO `menu` VALUES (126, b'0', '编辑', NULL, 54, 1, NULL, NULL, b'0', b'0', NULL, '2020-02-14 21:05:28', 'YXSTOREORDER_EDIT', 2, NULL, 0);
 INSERT INTO `menu` VALUES (127, b'0', '用户新增', NULL, 2, 2, NULL, NULL, b'0', b'0', NULL, '2020-02-14 21:12:21', 'user:add', 2, NULL, 0);
@@ -167,7 +167,7 @@ INSERT INTO `menu` VALUES (176, b'0', '财务管理', NULL, 0, 8, 'price', 'pric
 INSERT INTO `menu` VALUES (177, b'0', '充值管理', 'shop/recharge/index', 176, 82, 'rec', 'recharge', b'0', b'0', 'Recharge', '2020-03-02 23:05:26', 'yxUserRecharge:list', 1, NULL, 0);
 INSERT INTO `menu` VALUES (178, b'0', '门店管理', NULL, 0, 9, 'store', 'store', b'0', b'0', NULL, '2020-03-03 17:27:53', NULL, 1, NULL, 0);
 INSERT INTO `menu` VALUES (179, b'0', '门店列表', 'shop/store/index', 178, 92, 'edit', 'storeinfo', b'0', b'0', 'Storeinfo', '2020-03-03 17:29:09', 'yxSystemStore:list', 1, NULL, 0);
-INSERT INTO `menu` VALUES (180, b'0', '门店配置', 'shop/store/set', 178, 91, 'configure', 'storeset', b'0', b'0', 'Storeset', '2020-03-04 13:09:54', 'YXSYSTEMCONFIG_SELECT', 1, NULL, 0);
+INSERT INTO `menu` VALUES (180, b'0', '门店配置', 'shop/store/set', 178, 91, 'configure', 'storeset', b'0', b'0', 'Storeset', '2020-03-04 13:09:54', 'YXSYSTEMCONFIG_SELECT,YXSYSTEMCONFIG_SELECT', 1, '2020-08-06 23:05:23', 0);
 INSERT INTO `menu` VALUES (181, b'0', '核销订单', 'shop/order/indext', 178, 95, 'order', 'ordert', b'0', b'0', 'Ordert', '2020-03-05 17:04:12', 'YXSTOREORDER_SELECT', 1, NULL, 0);
 INSERT INTO `menu` VALUES (182, b'0', '充值金额配置', 'shop/set/recharge', 176, 83, 'money', 'rechargeset', b'0', b'0', 'Rechargeset', '2020-03-21 14:24:05', 'YXSYSTEMGROUPDATA_ALL,YXSYSTEMGROUPDATA_SELECT', 1, '2020-06-26 15:11:06', 0);
 INSERT INTO `menu` VALUES (183, b'0', '店员列表', 'shop/storestaff/index', 178, 94, 'peoples', 'staff', b'0', b'0', 'Staff', '2020-03-22 14:11:36', 'yxSystemStoreStaff:list', 1, NULL, 0);
@@ -213,9 +213,9 @@ INSERT INTO `menu` VALUES (222, b'0', '编辑核销订单', NULL, 181, 1, NULL,
 INSERT INTO `menu` VALUES (223, b'0', '新增店员', NULL, 183, 1, NULL, NULL, b'0', b'0', NULL, '2020-06-14 22:11:13', 'yxSystemStoreStaff:add', 2, NULL, 0);
 INSERT INTO `menu` VALUES (224, b'0', '修改店员', NULL, 183, 2, NULL, NULL, b'0', b'0', NULL, '2020-06-14 22:11:37', 'yxSystemStoreStaff:edit', 2, NULL, 0);
 INSERT INTO `menu` VALUES (225, b'0', '删除店员', NULL, 183, 3, NULL, NULL, b'0', b'0', NULL, '2020-06-14 22:11:59', 'yxSystemStoreStaff:del', 2, NULL, 0);
-INSERT INTO `menu` VALUES (226, b'0', '分销记录', 'shop/user/brobill', 69, 72, 'log', 'prolog', b'0', b'0', 'Prolog', '2020-06-26 14:52:30', 'YXUSERBILL_ALL,YXUSERBILL_SELECT', 1, '2020-06-26 14:54:33', 0);
+INSERT INTO `menu` VALUES (226, b'0', '分销记录', 'shop/user/brobill', 69, 72, 'log', 'prolog', b'0', b'0', 'Prolog', '2020-06-26 14:52:30', 'YXUSERBILL_ALL,YXUSERBILL_SELECT,YXUSERBILL_SELECT', 1, '2020-08-06 23:12:57', 0);
 INSERT INTO `menu` VALUES (227, b'0', '积分管理', NULL, 0, 10, 'Sign', 'syspoints', b'0', b'0', '-', '2020-06-26 15:00:59', NULL, 1, '2020-06-26 15:06:11', 0);
-INSERT INTO `menu` VALUES (228, b'0', '积分记录', 'shop/user/pobill', 227, 60, 'log', 'pobill', b'0', b'0', 'Pobill', '2020-06-26 15:04:17', 'YXUSERBILL_ALL,YXUSERBILL_SELECT', 1, NULL, 0);
+INSERT INTO `menu` VALUES (228, b'0', '积分记录', 'shop/user/pobill', 227, 60, 'log', 'pobill', b'0', b'0', 'Pobill', '2020-06-26 15:04:17', 'YXUSERBILL_ALL,YXUSERBILL_SELECT,YXUSERBILL_SELECT', 1, '2020-08-06 23:09:57', 0);
 INSERT INTO `menu` VALUES (229, b'0', '电子券管理', NULL, 0, 5, 'coupon', 'syscoupon', b'0', b'0', '', '2020-06-26 15:15:47', NULL, 1, '2020-06-26 15:22:16', 0);
 INSERT INTO `menu` VALUES (230, b'0', '商城系统配置', 'wechat/config/shop', 55, 59, 'shop', 'shopconfig', b'0', b'0', 'Shopconfig', '2020-06-26 15:45:32', 'YXSYSTEMCONFIG_SELECT', 1, '2020-07-04 18:50:34', 0);
 INSERT INTO `menu` VALUES (231, b'0', '阿里云短信', 'wechat/config/sms', 55, 60, 'sys-tools', 'smsconfig', b'0', b'0', 'Smsconfig', '2020-06-26 16:06:08', 'YXSYSTEMCONFIG_SELECT', 1, NULL, 0);

yshop-admin/src/main/java/co/yixiang/modules/security/rest/OnlineController.java

@@ -42,7 +42,7 @@ public class OnlineController {
 
     @ApiOperation("查询在线用户")
     @GetMapping
-    @PreAuthorize("@el.check()")
+    @PreAuthorize("@el.check('auth_online')")
     public ResponseEntity<Object> getAll(@RequestParam(value = "filter",defaultValue = "") String filter,
                                          @RequestParam(value = "type",defaultValue = "0") int type,
                                          Pageable pageable){

yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java

@@ -1,22 +1,18 @@
 /**
-* Copyright (C) 2018-2020
+ * Copyright (C) 2018-2020
-* All rights reserved, Designed By www.yixiang.co
+ * All rights reserved, Designed By www.yixiang.co
-* 注意：
+ * 注意：
-* 本软件为www.yixiang.co开发研制，未经购买不得使用
+ * 本软件为www.yixiang.co开发研制，未经购买不得使用
-* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
+ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
-* 一经发现盗用、分享等行为，将追究法律责任，后果自负
+ * 一经发现盗用、分享等行为，将追究法律责任，后果自负
-*/
+ */
 package co.yixiang.modules.system.service.impl;
 
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import co.yixiang.common.utils.QueryHelpPlus;
 import co.yixiang.dozer.service.IGenerator;
 import co.yixiang.exception.EntityExistException;
-import co.yixiang.modules.system.domain.Dept;
+import co.yixiang.modules.system.domain.*;
-import co.yixiang.modules.system.domain.Menu;
-import co.yixiang.modules.system.domain.Role;
-import co.yixiang.modules.system.domain.RolesDepts;
-import co.yixiang.modules.system.domain.RolesMenus;
 import co.yixiang.modules.system.service.RoleService;
 import co.yixiang.modules.system.service.RolesDeptsService;
 import co.yixiang.modules.system.service.RolesMenusService;
@@ -42,14 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 // 默认不使用缓存
@@ -58,9 +47,9 @@ import java.util.stream.Collectors;
 //import org.springframework.cache.annotation.Cacheable;
 
 /**
-* @author hupeng
+ * @author hupeng
-* @date 2020-05-14
+ * @date 2020-05-14
-*/
+ */
 @Service
 @AllArgsConstructor
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
@@ -71,7 +60,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
     private final MenuMapper menuMapper;
     private final DeptMapper deptMapper;
     private final RolesMenusService rolesMenusService;
-    private final  RolesDeptsService rolesDeptsService;
+    private final RolesDeptsService rolesDeptsService;
 
     @Override
     public Map<String, Object> queryAll(RoleQueryCriteria criteria, Pageable pageable) {
@@ -90,15 +79,15 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
      * @return Object
      */
     @Override
-    public Object queryAlls(RoleQueryCriteria criteria,Pageable pageable) {
+    public Object queryAlls(RoleQueryCriteria criteria, Pageable pageable) {
-        List<Role> roleList =  baseMapper.selectList(QueryHelpPlus.getPredicate(Role.class, criteria));
+        List<Role> roleList = baseMapper.selectList(QueryHelpPlus.getPredicate(Role.class, criteria));
         return roleList;
     }
 
 
     @Override
-    public List<Role> queryAll(RoleQueryCriteria criteria){
+    public List<Role> queryAll(RoleQueryCriteria criteria) {
-        List<Role> roleList =  baseMapper.selectList(QueryHelpPlus.getPredicate(Role.class, criteria));
+        List<Role> roleList = baseMapper.selectList(QueryHelpPlus.getPredicate(Role.class, criteria));
         for (Role role : roleList) {
             role.setMenus(menuMapper.findMenuByRoleId(role.getId()));
             role.setDepts(deptMapper.findDeptByRoleId(role.getId()));
@@ -111,7 +100,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
     public void download(List<RoleDto> all, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
         for (RoleDto role : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
+            Map<String, Object> map = new LinkedHashMap<>();
             map.put("名称", role.getName());
             map.put("备注", role.getRemark());
             map.put("数据权限", role.getDataScope());
@@ -133,7 +122,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
     @Override
     public List<RoleSmallDto> findByUsersId(Long id) {
         List<Role> roles = roleMapper.selectListByUserId(id);
-        return generator.convert(roles,RoleSmallDto.class);
+        return generator.convert(roles, RoleSmallDto.class);
     }
 
     /**
@@ -174,14 +163,14 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
     @Override
 //    @CacheEvict(allEntries = true)
     public void updateMenu(Role resources, RoleDto roleDto) {
-        if(resources.getMenus().size()>0){
+        if (resources.getMenus().size() > 0) {
-            List<RolesMenus> rolesMenusList = resources.getMenus().stream().map(i ->{
+            List<RolesMenus> rolesMenusList = resources.getMenus().stream().map(i -> {
                 RolesMenus rolesMenus = new RolesMenus();
                 rolesMenus.setRoleId(resources.getId());
                 rolesMenus.setMenuId(i.getId());
                 return rolesMenus;
             }).collect(Collectors.toList());
-            rolesMenusService.remove(new LambdaQueryWrapper<RolesMenus>().eq(RolesMenus::getRoleId,resources.getId()));
+            rolesMenusService.remove(new LambdaQueryWrapper<RolesMenus>().eq(RolesMenus::getRoleId, resources.getId()));
             rolesMenusService.saveBatch(rolesMenusList);
         }
     }
@@ -191,16 +180,16 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
 //    @CacheEvict(allEntries = true)
     @Transactional(rollbackFor = Exception.class)
     public RoleDto create(Role resources) {
-        if(this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getName,resources.getName())) != null){
+        if (this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getName, resources.getName())) != null) {
-            throw new EntityExistException(Role.class,"username",resources.getName());
+            throw new EntityExistException(Role.class, "username", resources.getName());
         }
 
-        if(this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getName,resources.getName())) != null){
+        if (this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getName, resources.getName())) != null) {
-            throw new EntityExistException(Role.class,"username",resources.getName());
+            throw new EntityExistException(Role.class, "username", resources.getName());
         }
         this.save(resources);
-        if(resources.getDepts().size()>0){
+        if (resources.getDepts().size() > 0) {
-            List<RolesDepts> rolesDeptsList = resources.getDepts().stream().map(i ->{
+            List<RolesDepts> rolesDeptsList = resources.getDepts().stream().map(i -> {
                 RolesDepts rolesDepts = new RolesDepts();
                 rolesDepts.setRoleId(resources.getId());
                 rolesDepts.setDeptId(i.getId());
@@ -208,7 +197,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
             }).collect(Collectors.toList());
             rolesDeptsService.saveBatch(rolesDeptsList);
         }
-        return generator.convert(resources,RoleDto.class);
+        return generator.convert(resources, RoleDto.class);
     }
 
     @Override
@@ -217,32 +206,33 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
     public void update(Role resources) {
         Role role = this.getById(resources.getId());
 
-        Role role1 = this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getName,resources.getName()));
+        Role role1 = this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getName, resources.getName()));
 
-        if(role1 != null && !role1.getId().equals(role.getId())){
+        if (role1 != null && !role1.getId().equals(role.getId())) {
-            throw new EntityExistException(Role.class,"username",resources.getName());
+            throw new EntityExistException(Role.class, "username", resources.getName());
         }
-        role1 = this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getPermission,resources.getPermission()));
+        role1 = this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getPermission, resources.getPermission()));
-        if(role1 != null && !role1.getId().equals(role.getId())){
+        if (role1 != null && !role1.getId().equals(role.getId())) {
-            throw new EntityExistException(Role.class,"permission",resources.getPermission());
+            throw new EntityExistException(Role.class, "permission", resources.getPermission());
         }
         role.setName(resources.getName());
         role.setRemark(resources.getRemark());
         role.setDataScope(resources.getDataScope());
-        if(resources.getDepts().size()>0){
+        if (resources.getDepts().size() > 0) {
-            List<RolesDepts> rolesDeptsList = resources.getDepts().stream().map(i ->{
+            List<RolesDepts> rolesDeptsList = resources.getDepts().stream().map(i -> {
                 RolesDepts rolesDepts = new RolesDepts();
                 rolesDepts.setRoleId(resources.getId());
                 rolesDepts.setDeptId(i.getId());
                 return rolesDepts;
             }).collect(Collectors.toList());
-            rolesDeptsService.remove(new LambdaQueryWrapper<RolesDepts>().eq(RolesDepts::getRoleId,resources.getId()));
+            rolesDeptsService.remove(new LambdaQueryWrapper<RolesDepts>().eq(RolesDepts::getRoleId, resources.getId()));
             rolesDeptsService.saveBatch(rolesDeptsList);
         }
         role.setLevel(resources.getLevel());
         role.setPermission(resources.getPermission());
         this.saveOrUpdate(role);
     }
+
     /**
      * 获取用户权限信息
      *
@@ -260,11 +250,20 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
             role.setDepts(deptSet);
         }
         Set<String> permissions = roles.stream().filter(role -> StringUtils.isNotBlank(role.getPermission())).map(Role::getPermission).collect(Collectors.toSet());
-        permissions.addAll(
+//        permissions.addAll(
-                roles.stream().flatMap(role -> role.getMenus().stream())
+//                roles.stream().flatMap(role -> role.getMenus().stream())
-                        .filter(menu -> StringUtils.isNotBlank(menu.getPermission()))
+//                        .filter(menu -> StringUtils.isNotBlank(menu.getPermission()))
-                        .map(Menu::getPermission).collect(Collectors.toSet())
+//                        .map(Menu::getPermission).collect(Collectors.toSet())
-        );
+//        );
+        roles.stream().flatMap(role -> role.getMenus().stream())
+                .filter(menu -> StringUtils.isNotBlank(menu.getPermission()))
+                .forEach(menu -> {
+                    // 添加基于Permission的权限信息
+                    for (String permission : StringUtils.split(menu.getPermission(), ",")) {
+                        permissions.add(permission);
+                    }
+                });
+
         return permissions.stream().map(SimpleGrantedAuthority::new)
                 .collect(Collectors.toList());
     }
@@ -274,7 +273,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
     public void delete(Set<Long> ids) {
         for (Long id : ids) {
             rolesMenusService.lambdaUpdate().eq(RolesMenus::getRoleId, id).remove();
-            rolesDeptsService.lambdaUpdate().eq(RolesDepts::getRoleId,id).remove();
+            rolesDeptsService.lambdaUpdate().eq(RolesDepts::getRoleId, id).remove();
         }
         this.removeByIds(ids);
     }

yshop-app/src/main/java/co/yixiang/modules/auth/rest/AuthController.java

@@ -62,7 +62,7 @@ public class AuthController {
     private final RedisUtils redisUtil;
     private final AuthService authService;
 
-    @Value("${single.login:false}")
+    @Value("${single.login}")
     private Boolean singleLogin;
 
 

yshop-app/src/main/java/co/yixiang/modules/services/CreatShareProductService.java

@@ -682,10 +682,10 @@ public class CreatShareProductService {
             }
             g.drawImage(priductUrl.getScaledInstance(750,590,Image.SCALE_DEFAULT),0,0,null);
 
-            File newFileT = new File("Alibaba-PuHuiTi-Regular.otf");
+            File newFileT = new File("simsunb.ttf");
             if(!newFileT.exists()){
                 InputStream streamT =  getClass().getClassLoader()
-                        .getResourceAsStream("Alibaba-PuHuiTi-Regular.otf");
+                        .getResourceAsStream("simsunb.ttf");
                 FileUtils.copyInputStreamToFile(streamT, newFileT);
             }
             Font font =  Font.createFont(Font.TRUETYPE_FONT, newFileT);

yshop-app/src/main/resources/config/application-dev.yml

@@ -69,7 +69,9 @@ yshop:
     jwt-key: yshopmini
     token-expired-in: 86400000
 
-
+# 是否限制单用户登录
+single:
+  login: false
 
 
 #是否开启 swagger-ui

yshop-app/src/main/resources/config/application-prod.yml

@@ -62,7 +62,9 @@ spring:
     # spring cache 缓存类型为redis  也可以是其他的实现
     type: redis
 
-
+# 是否限制单用户登录
+single:
+  login: false
 
 yshop:
   security:

yshop-mall/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java

@@ -338,7 +338,8 @@ public class YxStoreCartServiceImpl extends BaseServiceImpl<StoreCartMapper, YxS
                     .one();
             if(storeCombination == null) throw new YshopException("该产品已下架或删除");
             if(storeCombination.getStock() < cartNum) throw new YshopException("该产品库存不足");
-        }else if(seckillId != null && seckillId > 0){//秒杀
+            //秒杀
+        }else if(seckillId != null && seckillId > 0){
             YxStoreSeckill yxStoreSeckill = storeSeckillService
                     .lambdaQuery().eq(YxStoreSeckill::getId,seckillId)
                     .eq(YxStoreSeckill::getIsShow, ShopCommonEnum.SHOW_1.getValue())
@@ -358,10 +359,10 @@ public class YxStoreCartServiceImpl extends BaseServiceImpl<StoreCartMapper, YxS
             if(yxStoreSeckill.getNum() <= seckillOrderCount || yxStoreSeckill.getNum() < cartNum){
                 throw new YshopException("每人限购:"+yxStoreSeckill.getNum()+"件");
             }
-
+            //砍价
-        }else if(bargainId != null && bargainId > 0){//砍价
+        }else if(bargainId != null && bargainId > 0){
             YxStoreBargain yxStoreBargain = storeBargainService
-                    .lambdaQuery().eq(YxStoreBargain::getId,seckillId)
+                    .lambdaQuery().eq(YxStoreBargain::getId,bargainId)
                     .eq(YxStoreBargain::getStatus, ShopCommonEnum.IS_STATUS_1.getValue())
                     .le(YxStoreBargain::getStartTime,now)
                     .ge(YxStoreBargain::getStopTime,now)

yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java

@@ -1664,7 +1664,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
 
 
         //如果设置满包邮0 表示全局包邮，如果设置大于0表示满这价格包邮，否则走运费模板算法
-        if(storeFreePostage.compareTo(BigDecimal.ZERO) != 0 || totalPrice.compareTo(storeFreePostage) <= 0){
+        if(storeFreePostage.compareTo(BigDecimal.ZERO) != 0 && totalPrice.compareTo(storeFreePostage) <= 0){
             storePostage =  this.handlePostage(cartInfo,userAddress);
         }
 

yshop-mall/src/main/java/co/yixiang/modules/product/service/dto/YxStoreProductQueryCriteria.java

@@ -25,4 +25,7 @@ public class YxStoreProductQueryCriteria{
 
     @Query
     private Integer isShow;
+
+    @Query
+    private Integer cateId;
 }

yshop-mall/src/main/java/co/yixiang/modules/user/param/AddressParam.java

@@ -19,6 +19,7 @@ public class AddressParam  implements Serializable {
     private String real_name;
     private String post_code;
     private String is_default;
+    private String wx_export;
     @NotBlank
     private String detail;
     @NotBlank

yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserAddressServiceImpl.java

@@ -9,6 +9,8 @@
 package co.yixiang.modules.user.service.impl;
 
 
+import cn.hutool.Hutool;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import co.yixiang.dozer.service.IGenerator;
@@ -18,6 +20,7 @@ import co.yixiang.modules.user.param.AddressParam;
 import co.yixiang.modules.user.service.YxUserAddressService;
 import co.yixiang.modules.user.service.mapper.YxUserAddressMapper;
 import co.yixiang.modules.user.vo.YxUserAddressQueryVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -84,6 +87,14 @@ public class YxUserAddressServiceImpl extends BaseServiceImpl<YxUserAddressMappe
                 .build();
         if("true".equals(param.getIs_default())){
             userAddress.setIsDefault(ShopCommonEnum.DEFAULT_1.getValue());
+            //新增地址如果是默认，把之前的状态改掉
+            List<YxUserAddress> userAddresss = this.list(new LambdaQueryWrapper<YxUserAddress>().eq(YxUserAddress::getIsDefault,ShopCommonEnum.DEFAULT_1.getValue()));
+           if(CollectionUtil.isNotEmpty(userAddresss)){
+               userAddresss.forEach(i ->{
+                   i.setIsDefault(ShopCommonEnum.DEFAULT_0.getValue());
+               });
+               this.saveOrUpdateBatch(userAddresss);
+           }
         }else{
             userAddress.setIsDefault(ShopCommonEnum.DEFAULT_0.getValue());
         }

yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java

@@ -77,7 +77,14 @@ public class StoreProductController {
     @GetMapping(value = "/yxStoreProduct")
     @PreAuthorize("hasAnyRole('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_SELECT')")
     public ResponseEntity getYxStoreProducts(YxStoreProductQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(yxStoreProductService.queryAll(criteria,pageable),HttpStatus.OK);
+        //商品分类
+        List<YxStoreCategory> storeCategories = yxStoreCategoryService.lambdaQuery()
+                .eq(YxStoreCategory::getIsShow, ShopCommonEnum.SHOW_1.getValue())
+                .list();
+        List<Map<String,Object>> cateList = new ArrayList<>();
+        Map<String, Object> queryAll = yxStoreProductService.queryAll(criteria, pageable);
+        queryAll.put("cateList", this.makeCate(storeCategories,cateList,0,1));
+        return new ResponseEntity<>(queryAll,HttpStatus.OK);
     }
 
     @ForbidSubmit

yshop-shop/src/main/java/co/yixiang/modules/services/WechatArticleService.java

@@ -12,10 +12,7 @@ import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.WxMpMassTagMessage;
-import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult;
+import me.chanjar.weixin.mp.bean.material.*;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterial;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult;
 import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -47,7 +44,7 @@ public class WechatArticleService {
         WxMpMaterialNews wxMpMaterialNews = new WxMpMaterialNews();
 
 
-        WxMpMaterialNews.WxMpMaterialNewsArticle article = new WxMpMaterialNews.WxMpMaterialNewsArticle();
+        WxMpNewsArticle article = new WxMpNewsArticle();
 
         WxMpMaterialUploadResult wxMpMaterialUploadResult = uploadPhotoToWx( wxMpService,
                 wxNewsArticleItem.getImageInput() );

yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserBillController.java

@@ -40,7 +40,7 @@ public class UserBillController {
     @Log("查询")
     @ApiOperation(value = "查询")
     @GetMapping(value = "/yxUserBill")
-    @PreAuthorize("@el.check('admin','YXUSERBILL_ALL','YXUSERBILL_SELECT')")
+    @PreAuthorize("hasAnyRole('admin','YXUSERBILL_ALL','YXUSERBILL_SELECT')")
     public ResponseEntity getYxUserBills(YxUserBillQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(yxUserBillService.queryAll(criteria,pageable),HttpStatus.OK);
     }

yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java

@@ -49,7 +49,7 @@ public class LocalStorageController {
     @Log("导出数据")
     @ApiOperation("导出数据")
     @GetMapping(value = "/download")
-    @PreAuthorize("@el.check('admin','localStorage:list')")
+    @PreAuthorize("@el.check('admin','storage:list')")
     public void download(HttpServletResponse response, LocalStorageQueryCriteria criteria) throws IOException {
         localStorageService.download(generator.convert(localStorageService.queryAll(criteria), LocalStorageDto.class), response);
     }
@@ -57,7 +57,7 @@ public class LocalStorageController {
     @GetMapping
     @Log("查询文件")
     @ApiOperation("查询文件")
-    @PreAuthorize("@el.check('admin','localStorage:list')")
+    @PreAuthorize("@el.check('admin','storage:list')")
     public ResponseEntity<Object> getLocalStorages(LocalStorageQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(localStorageService.queryAll(criteria,pageable),HttpStatus.OK);
     }
@@ -65,7 +65,7 @@ public class LocalStorageController {
     @PostMapping
     @Log("新增文件")
     @ApiOperation("新增文件")
-    @PreAuthorize("@el.check('admin','localStorage:add')")
+    @PreAuthorize("@el.check('admin','storage:add')")
     public ResponseEntity<Object> create(@RequestParam String name, @RequestParam("file") MultipartFile file){
         return new ResponseEntity<>(localStorageService.create(name,file),HttpStatus.CREATED);
     }
@@ -73,7 +73,7 @@ public class LocalStorageController {
     @PutMapping
     @Log("修改文件")
     @ApiOperation("修改文件")
-    @PreAuthorize("@el.check('admin','localStorage:edit')")
+    @PreAuthorize("@el.check('admin','storage:edit')")
     public ResponseEntity<Object> update(@Validated @RequestBody LocalStorageDto resources){
         localStorageService.updateLocalStorage(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
@@ -81,7 +81,7 @@ public class LocalStorageController {
 
     @Log("删除文件")
     @ApiOperation("删除文件")
-    @PreAuthorize("@el.check('admin','localStorage:del')")
+    @PreAuthorize("@el.check('admin','storage:del')")
     @DeleteMapping
     public ResponseEntity<Object> deleteAll(@RequestBody Long[] ids) {
         Arrays.asList(ids).forEach(id->{

yshop-weixin/pom.xml

@@ -13,7 +13,7 @@
     <name>微信模块</name>
 
     <properties>
-        <weixin-java.version>3.6.0</weixin-java.version>
+        <weixin-java.version>3.8.0</weixin-java.version>
     </properties>
 
     <dependencies>