From 58d41775cf795d0a17c41bd04e7e94d29e1f8ea7 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 22 Jul 2021 17:26:10 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E4=B8=8D=E8=AE=B0=E5=BD=95PV=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/controller/store/StoreBuyerController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java index a472a92ab..c3d824d40 100644 --- a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java @@ -4,8 +4,6 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.statistics.aop.PageViewPoint; -import cn.lili.modules.statistics.aop.enums.PageViewEnum; import cn.lili.modules.store.entity.dto.StoreBankDTO; import cn.lili.modules.store.entity.dto.StoreCompanyDTO; import cn.lili.modules.store.entity.dto.StoreOtherInfoDTO; @@ -61,7 +59,6 @@ public class StoreBuyerController { @ApiOperation(value = "通过id获取店铺信息") @ApiImplicitParam(name = "id", value = "店铺ID", required = true, paramType = "path") @GetMapping(value = "/get/detail/{id}") - @PageViewPoint(type = PageViewEnum.STORE, id = "#id") public ResultMessage detail(@NotNull @PathVariable String id) { return ResultUtil.data(storeDetailService.getStoreBasicInfoDTO(id)); } From 280c5dec390b2498fc2f57e1a27d3ffcf21d80bc Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 22 Jul 2021 17:33:57 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E5=8C=85=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/controller/member/MemberManagerController.java | 2 +- .../cn/lili/controller/other/PageDataManagerController.java | 2 +- .../cn/lili/controller/passport/AdminUserManagerController.java | 2 +- .../cn/lili/controller/permission/MenuManagerController.java | 2 +- .../cn/lili/controller/setting/RegionManagerController.java | 2 +- .../cn/lili/controller/setting/SettingManagerController.java | 2 +- .../java/cn/lili/controller/store/StoreManagerController.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java index a2805fb9f..9ec1473bf 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.member; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.system.aspect.DemoSite; +import cn.lili.modules.system.aspect.annotation.DemoSite; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dto.ManagerMemberEditDTO; import cn.lili.modules.member.entity.dto.MemberAddDTO; diff --git a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java index b5f1a8971..035ac038d 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.other; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.system.aspect.DemoSite; +import cn.lili.modules.system.aspect.annotation.DemoSite; import cn.lili.modules.page.entity.dos.PageData; import cn.lili.modules.page.entity.dto.PageDataDTO; import cn.lili.modules.page.entity.vos.PageDataListVO; diff --git a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java index e06a2d5e1..27388dd24 100644 --- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java @@ -13,7 +13,7 @@ import cn.lili.modules.verification.service.VerificationService; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; -import cn.lili.modules.system.aspect.DemoSite; +import cn.lili.modules.system.aspect.annotation.DemoSite; import cn.lili.modules.permission.entity.dos.AdminUser; import cn.lili.modules.permission.entity.dto.AdminUserDTO; import cn.lili.modules.permission.entity.vo.AdminUserVO; diff --git a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java index ae1162310..b6d8c11cc 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.permission; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.system.aspect.DemoSite; +import cn.lili.modules.system.aspect.annotation.DemoSite; import cn.lili.modules.permission.entity.dos.Menu; import cn.lili.modules.permission.entity.dto.MenuSearchParams; import cn.lili.modules.permission.entity.vo.MenuVO; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java index 4bac14ba1..558b6e2c8 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.system.aspect.DemoSite; +import cn.lili.modules.system.aspect.annotation.DemoSite; import cn.lili.modules.system.service.RegionService; import cn.lili.modules.system.entity.dos.Region; import io.swagger.annotations.Api; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java index a16790962..6a50e6781 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java @@ -5,7 +5,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.system.aspect.DemoSite; +import cn.lili.modules.system.aspect.annotation.DemoSite; import cn.lili.modules.system.entity.dos.Setting; import cn.lili.modules.system.entity.dto.*; import cn.lili.modules.system.entity.dto.connect.QQConnectSetting; diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java index 23fe97ee3..dffa4b5ac 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.store; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.system.aspect.DemoSite; +import cn.lili.modules.system.aspect.annotation.DemoSite; import cn.lili.modules.goods.entity.vos.CategoryVO; import cn.lili.modules.store.entity.dos.Store; import cn.lili.modules.store.entity.dto.AdminStoreApplyDTO; From e99aeeede5018acf69c5494d1f2e22725b4233a9 Mon Sep 17 00:00:00 2001 From: Chopper Date: Sun, 25 Jul 2021 17:45:46 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=83=AD=E8=AF=8D=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E6=8F=90=E4=BE=9Bredis=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=87=8D=E5=80=BC?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hotwords/HotWordsEveryDayTaskExecute.java | 30 ++++++++++++ .../src/main/java/cn/lili/cache/Cache.java | 27 +++++++---- .../java/cn/lili/cache/impl/RedisCache.java | 10 ++-- .../entity/enums/HotWordsRedisKeyEnum.java | 24 ---------- .../search/service/EsGoodsSearchService.java | 8 ++++ .../serviceimpl/EsGoodsSearchServiceImpl.java | 16 +++++-- .../system/token/ManagerTokenGenerate.java | 16 +++++-- .../setting/HotWordsManagerController.java | 47 +++++++++++++++++++ .../InstantDeliveryManagerController.java | 1 - 9 files changed, 134 insertions(+), 45 deletions(-) create mode 100644 consumer/src/main/java/cn/lili/timetask/handler/impl/hotwords/HotWordsEveryDayTaskExecute.java delete mode 100644 framework/src/main/java/cn/lili/modules/search/entity/enums/HotWordsRedisKeyEnum.java create mode 100755 manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/hotwords/HotWordsEveryDayTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/hotwords/HotWordsEveryDayTaskExecute.java new file mode 100644 index 000000000..a6e99c324 --- /dev/null +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/hotwords/HotWordsEveryDayTaskExecute.java @@ -0,0 +1,30 @@ +package cn.lili.timetask.handler.impl.hotwords; + +import cn.lili.cache.Cache; +import cn.lili.cache.CachePrefix; +import cn.lili.timetask.handler.EveryDayExecute; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @author paulG + * @since 2021/3/11 + **/ +@Slf4j +@Component +public class HotWordsEveryDayTaskExecute implements EveryDayExecute { + + @Autowired + private Cache cache; + + /** + * 执行每日任务 + */ + @Override + public void execute() { + //移除昨日的热搜词 + cache.remove(CachePrefix.HOT_WORD.getPrefix()); + } + +} diff --git a/framework/src/main/java/cn/lili/cache/Cache.java b/framework/src/main/java/cn/lili/cache/Cache.java index c8c690809..cd475d4dc 100644 --- a/framework/src/main/java/cn/lili/cache/Cache.java +++ b/framework/src/main/java/cn/lili/cache/Cache.java @@ -60,7 +60,7 @@ public interface Cache { * Add an item to the cache, nontransactionally, with * failfast semantics * - * @param key 缓存key + * @param key 缓存key * @param value 缓存value */ void put(Object key, T value); @@ -68,7 +68,7 @@ public interface Cache { /** * 往缓存中写入内容 * - * @param key 缓存key + * @param key 缓存key * @param value 缓存value * @param exp 超时时间，单位为秒 */ @@ -77,9 +77,9 @@ public interface Cache { /** * 往缓存中写入内容 * - * @param key 缓存key - * @param value 缓存value - * @param exp 过期时间 + * @param key 缓存key + * @param value 缓存value + * @param exp 过期时间 * @param timeUnit 过期单位 */ void put(Object key, T value, Long exp, TimeUnit timeUnit); @@ -124,7 +124,7 @@ public interface Cache { /** * 读取缓存值 * - * @param key 缓存key + * @param key 缓存key * @param hashKey map value * @return 返回缓存中的数据 */ @@ -142,8 +142,7 @@ public interface Cache { * 是否包含 * * @param key 缓存key - * @return 缓存中的数据 - * + * @return 缓存中的数据 */ boolean hasKey(Object key); @@ -164,7 +163,7 @@ public interface Cache { * 效率较高的 计数器 * 如需清零，按照普通key 移除即可 * - * @param key key值 + * @param key key值 * @param value 去重统计值 * @return 计数器结果 */ @@ -223,6 +222,16 @@ public interface Cache { */ void incrementScore(String sortedSetName, String keyword); + /** + * 使用Sorted Set记录keyword + * zincrby命令，对于一个Sorted Set，存在的就把分数加x(x可自行设定)，不存在就创建一个分数为1的成员 + * + * @param sortedSetName sortedSetName的Sorted Set不用预先创建，不存在会自动创建，存在则向里添加数据 + * @param keyword 关键词 + * @param score 分数 + */ + void incrementScore(String sortedSetName, String keyword, Integer score); + /** * zrevrange命令, 查询Sorted Set中指定范围的值 * 返回的有序集合中，score大的在前面 diff --git a/framework/src/main/java/cn/lili/cache/impl/RedisCache.java b/framework/src/main/java/cn/lili/cache/impl/RedisCache.java index ef96f058e..f34515e52 100644 --- a/framework/src/main/java/cn/lili/cache/impl/RedisCache.java +++ b/framework/src/main/java/cn/lili/cache/impl/RedisCache.java @@ -223,9 +223,13 @@ public class RedisCache implements Cache { */ @Override public void incrementScore(String sortedSetName, String keyword) { - //x 的含义请见本方法的注释 - double x = 1.0; - this.redisTemplate.opsForZSet().incrementScore(sortedSetName, keyword, x); + //指向key名为KEY的zset元素 + redisTemplate.opsForZSet().incrementScore(sortedSetName,keyword, 1); + } + + @Override + public void incrementScore(String sortedSetName, String keyword, Integer score) { + redisTemplate.opsForZSet().incrementScore(sortedSetName, keyword, score); } /** diff --git a/framework/src/main/java/cn/lili/modules/search/entity/enums/HotWordsRedisKeyEnum.java b/framework/src/main/java/cn/lili/modules/search/entity/enums/HotWordsRedisKeyEnum.java deleted file mode 100644 index 1ccaf7e1b..000000000 --- a/framework/src/main/java/cn/lili/modules/search/entity/enums/HotWordsRedisKeyEnum.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.lili.modules.search.entity.enums; - -/** - * @author paulG - * @since 2021/1/20 - **/ -public enum HotWordsRedisKeyEnum { - - /** - * "搜索热词" - */ - SEARCH_HOT_WORD("搜索热词"); - - - private final String description; - - HotWordsRedisKeyEnum(String description) { - this.description = description; - } - - public String description() { - return description; - } -} diff --git a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java index 795b7e373..1099c0baa 100644 --- a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java +++ b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java @@ -34,6 +34,14 @@ public interface EsGoodsSearchService { */ List getHotWords(Integer start, Integer end); + /** + * 设置热门关键词 + * + * @param words 关键词 + * @param point 赋予分数 + */ + void setHotWords(String words, Integer point); + /** * 获取筛选器 * diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java index ec039e520..7637c196c 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java @@ -3,6 +3,7 @@ package cn.lili.modules.search.serviceimpl; import cn.hutool.core.convert.Convert; import cn.hutool.core.text.CharSequenceUtil; import cn.lili.cache.Cache; +import cn.lili.cache.CachePrefix; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.modules.goods.entity.dos.Brand; @@ -16,7 +17,6 @@ import cn.lili.modules.search.entity.dos.EsGoodsRelatedInfo; import cn.lili.modules.search.entity.dto.EsGoodsSearchDTO; import cn.lili.modules.search.entity.dto.ParamOptions; import cn.lili.modules.search.entity.dto.SelectorOptions; -import cn.lili.modules.search.entity.enums.HotWordsRedisKeyEnum; import cn.lili.modules.search.repository.EsGoodsIndexRepository; import cn.lili.modules.search.service.EsGoodsSearchService; import lombok.extern.slf4j.Slf4j; @@ -51,6 +51,7 @@ import java.util.*; /** * ES商品搜索业务层实现 + * * @author paulG * @since 2020/10/16 **/ @@ -90,7 +91,7 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { @Override public Page searchGoods(EsGoodsSearchDTO searchDTO, PageVO pageVo) { if (CharSequenceUtil.isNotEmpty(searchDTO.getKeyword())) { - cache.incrementScore(HotWordsRedisKeyEnum.SEARCH_HOT_WORD.name(), searchDTO.getKeyword()); + cache.incrementScore(CachePrefix.HOT_WORD.getPrefix(), searchDTO.getKeyword()); } NativeSearchQueryBuilder searchQueryBuilder = createSearchQueryBuilder(searchDTO, pageVo, true); NativeSearchQuery searchQuery = searchQueryBuilder.build(); @@ -102,13 +103,18 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { @Override public List getHotWords(Integer start, Integer end) { List hotWords = new ArrayList<>(); - Set set = cache.reverseRangeWithScores(HotWordsRedisKeyEnum.SEARCH_HOT_WORD.name(), start, end); + Set set = cache.reverseRangeWithScores(CachePrefix.HOT_WORD.getPrefix(), start, end); for (DefaultTypedTuple defaultTypedTuple : set) { hotWords.add(Objects.requireNonNull(defaultTypedTuple.getValue()).toString()); } return hotWords; } + @Override + public void setHotWords(String words, Integer point) { + cache.incrementScore(CachePrefix.HOT_WORD.getPrefix(), words, point); + } + @Override public EsGoodsRelatedInfo getSelector(EsGoodsSearchDTO goodsSearch, PageVO pageVo) { NativeSearchQueryBuilder builder = createSearchQueryBuilder(goodsSearch, null, true); @@ -318,6 +324,7 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { /** * 查询属性处理 + * * @param filterBuilder * @param queryBuilder * @param searchDTO @@ -391,7 +398,7 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { //价格区间判定 if (CharSequenceUtil.isNotEmpty(searchDTO.getPrice())) { String[] prices = searchDTO.getPrice().split("_"); - if(prices.length==0){ + if (prices.length == 0) { return; } double min = Convert.toDouble(prices[0], 0.0); @@ -406,6 +413,7 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { /** * 关键字查询处理 + * * @param filterBuilder * @param queryBuilder * @param keyword diff --git a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java index ee621f04e..3948977c6 100644 --- a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java @@ -3,8 +3,8 @@ package cn.lili.modules.system.token; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.security.AuthUser; -import cn.lili.common.security.enums.UserEnums; import cn.lili.common.security.enums.PermissionEnum; +import cn.lili.common.security.enums.UserEnums; import cn.lili.common.security.token.Token; import cn.lili.common.security.token.TokenUtil; import cn.lili.common.security.token.base.AbstractTokenGenerate; @@ -116,11 +116,19 @@ public class ManagerTokenGenerate extends AbstractTokenGenerate { */ void initPermission(List superPermissions, List queryPermissions) { //用户信息维护 - superPermissions.add("/manager/user/info"); - superPermissions.add("/manager/user/edit"); + superPermissions.add("/manager/user/info*"); + superPermissions.add("/manager/user/edit*"); superPermissions.add("/manager/user/editPassword*"); - //统计查看 + + //统计查看权限 queryPermissions.add("/manager/statistics*"); + //菜单查看权限 + queryPermissions.add("/manager/menu*"); + //商品分类查看权限 + queryPermissions.add("/manager/goods/category*"); + //查看地区接口 + queryPermissions.add("/manager/region*"); + } } diff --git a/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java new file mode 100755 index 000000000..91d9a5da9 --- /dev/null +++ b/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java @@ -0,0 +1,47 @@ +package cn.lili.controller.setting; + +import cn.lili.common.enums.ResultUtil; +import cn.lili.common.vo.ResultMessage; +import cn.lili.modules.search.service.EsGoodsSearchService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 管理端,app版本控制器 + * + * @author Chopper + * @since 2018-07-04 21:50:52 + */ +@RestController +@Api(tags = "管理端,系统设置扩展接口") +@RequestMapping("/manager/hotwords") +public class HotWordsManagerController { + + @Autowired + private EsGoodsSearchService esGoodsSearchService; + + @ApiOperation(value = "获取热词") + @GetMapping + public ResultMessage getHotWords() { + return ResultUtil.data(esGoodsSearchService.getHotWords(0, 99)); + } + + @ApiOperation(value = "设置热词") + @ApiImplicitParams({ + @ApiImplicitParam(name = "keywords", value = "关键字"), + @ApiImplicitParam(name = "point", value = "权重值") + }) + @PostMapping + public ResultMessage paymentForm(String keywords, Integer point) { + esGoodsSearchService.setHotWords(keywords, point); + return ResultUtil.success(); + } + +} diff --git a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java index bd6e68ce1..bd9e6dc67 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java @@ -39,7 +39,6 @@ public class InstantDeliveryManagerController { IPage data = instantDeliveryService.page(PageUtil.initPage(page)); //组织数据结构 IPage newData = instantDeliveryService.getInstantDeliveryPage(data, page); - System.out.println(); //返回数据 return ResultUtil.data(newData); } From 0514bec9948f55a39535fc2e14b766492387d23c Mon Sep 17 00:00:00 2001 From: Chopper Date: Sun, 25 Jul 2021 17:46:24 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=A8=A1=E5=9D=97=E6=A0=A1=E9=AA=8C=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/ManagerAuthenticationFilter.java | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java index d8fa20ed4..70706a821 100755 --- a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java +++ b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import cn.lili.cache.Cache; import cn.lili.cache.CachePrefix; import cn.lili.common.security.AuthUser; +import cn.lili.common.security.enums.PermissionEnum; import cn.lili.common.security.enums.SecurityEnum; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.security.token.SecretKeyUtil; @@ -20,6 +21,8 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; +import org.springframework.util.PatternMatchUtils; +import org.springframework.web.bind.annotation.RequestMethod; import javax.naming.NoPermissionException; import javax.servlet.FilterChain; @@ -71,27 +74,28 @@ public class ManagerAuthenticationFilter extends BasicAuthenticationFilter { */ private void customAuthentication(HttpServletRequest request, HttpServletResponse response, UsernamePasswordAuthenticationToken authentication) throws NoPermissionException { AuthUser authUser = (AuthUser) authentication.getDetails(); + String requestUrl = request.getRequestURI(); Map> permission = (Map>) cache.get(CachePrefix.PERMISSION_LIST.getPrefix(UserEnums.MANAGER) + authUser.getId()); - if (authUser.getIsSuper()) { - return; - } else { - //用户是否拥有权限判定œ + //如果不是超级管理员， 不做鉴权 + if (!authUser.getIsSuper()) { //获取数据权限 -// if (request.getMethod().equals(RequestMethod.GET.name())) { -// if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER).toArray(new String[0]), request.getRequestURI()) || -// PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.QUERY).toArray(new String[0]), request.getRequestURI())) { -// -// ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限")); -// throw new NoPermissionException("权限不足"); -// } -// } else { -// if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER).toArray(new String[0]), request.getRequestURI())) { -// -// ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限")); -// throw new NoPermissionException("权限不足"); -// } -// } - return; + if (request.getMethod().equals(RequestMethod.GET.name())) { + //如果用户的超级权限和查阅权限都不包含当前请求的api + if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), requestUrl) && + !PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.QUERY.name()).toArray(new String[0]), requestUrl)) { + + ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限")); + throw new NoPermissionException("权限不足"); + } + } + //非get请求（数据操作） 判定 + else { + if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), request.getRequestURI())) { + + ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限")); + throw new NoPermissionException("权限不足"); + } + } } } From 8b861e8fe76e7f733f2b8bef3ed3db5b5eac28e9 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 26 Jul 2021 16:02:03 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=83=AD=E8=AF=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=88=86=E6=95=B0=E7=BA=BF=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/entity/dto/HotWordsDTO.java | 24 +++++++++++++++++++ .../search/service/EsGoodsSearchService.java | 7 +++--- .../serviceimpl/EsGoodsSearchServiceImpl.java | 5 ++-- .../setting/HotWordsManagerController.java | 13 ++++------ 4 files changed, 35 insertions(+), 14 deletions(-) create mode 100644 framework/src/main/java/cn/lili/modules/search/entity/dto/HotWordsDTO.java diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/HotWordsDTO.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/HotWordsDTO.java new file mode 100644 index 000000000..8756dcf26 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/HotWordsDTO.java @@ -0,0 +1,24 @@ +package cn.lili.modules.search.entity.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 搜索热词 + * + * @author Chopper + * @version v1.0 + * 2021-07-26 15:46 + */ +@Data +public class HotWordsDTO { + + @NotBlank(message = "搜索热词不能为空") + private String keywords; + + @NotNull(message = "分数不能为空") + private Integer point; +} + diff --git a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java index 1099c0baa..c4cfbebbf 100644 --- a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java +++ b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java @@ -4,6 +4,7 @@ import cn.lili.common.vo.PageVO; import cn.lili.modules.search.entity.dos.EsGoodsIndex; import cn.lili.modules.search.entity.dos.EsGoodsRelatedInfo; import cn.lili.modules.search.entity.dto.EsGoodsSearchDTO; +import cn.lili.modules.search.entity.dto.HotWordsDTO; import org.springframework.data.domain.Page; import java.util.List; @@ -36,11 +37,9 @@ public interface EsGoodsSearchService { /** * 设置热门关键词 - * - * @param words 关键词 - * @param point 赋予分数 + * @param hotWords 热词分数 */ - void setHotWords(String words, Integer point); + void setHotWords(HotWordsDTO hotWords); /** * 获取筛选器 diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java index 7637c196c..552336231 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java @@ -15,6 +15,7 @@ import cn.lili.modules.goods.service.CategoryService; import cn.lili.modules.search.entity.dos.EsGoodsIndex; import cn.lili.modules.search.entity.dos.EsGoodsRelatedInfo; import cn.lili.modules.search.entity.dto.EsGoodsSearchDTO; +import cn.lili.modules.search.entity.dto.HotWordsDTO; import cn.lili.modules.search.entity.dto.ParamOptions; import cn.lili.modules.search.entity.dto.SelectorOptions; import cn.lili.modules.search.repository.EsGoodsIndexRepository; @@ -111,8 +112,8 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { } @Override - public void setHotWords(String words, Integer point) { - cache.incrementScore(CachePrefix.HOT_WORD.getPrefix(), words, point); + public void setHotWords(HotWordsDTO hotWords) { + cache.incrementScore(CachePrefix.HOT_WORD.getPrefix(), hotWords.getKeywords(), hotWords.getPoint()); } @Override diff --git a/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java index 91d9a5da9..6722c9219 100755 --- a/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java @@ -2,12 +2,12 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; +import cn.lili.modules.search.entity.dto.HotWordsDTO; import cn.lili.modules.search.service.EsGoodsSearchService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -34,13 +34,10 @@ public class HotWordsManagerController { } @ApiOperation(value = "设置热词") - @ApiImplicitParams({ - @ApiImplicitParam(name = "keywords", value = "关键字"), - @ApiImplicitParam(name = "point", value = "权重值") - }) @PostMapping - public ResultMessage paymentForm(String keywords, Integer point) { - esGoodsSearchService.setHotWords(keywords, point); + public ResultMessage paymentForm(@Validated HotWordsDTO hotWords) { + + esGoodsSearchService.setHotWords(hotWords); return ResultUtil.success(); } From ad2640dac9f1d78c125adbaf0a445b8cbad08b0e Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 26 Jul 2021 16:12:59 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E7=83=AD=E8=AF=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=A4=84=E7=90=86sql=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update-sql/version4.2to4.3.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 update-sql/version4.2to4.3.sql diff --git a/update-sql/version4.2to4.3.sql b/update-sql/version4.2to4.3.sql new file mode 100644 index 000000000..e57b0bd0a --- /dev/null +++ b/update-sql/version4.2to4.3.sql @@ -0,0 +1,2 @@ +/** 热词管理*/ +UPDATE `lilishop`.`li_menu` SET `create_by` = 'admin', `create_time` = '2021-03-03 09:54:51', `delete_flag` = b'0', `update_by` = 'admin', `update_time` = '2021-07-23 19:07:45', `description` = 'null', `front_route` = 'page/article-manage/hotWords', `icon` = 'md-aperture', `level` = 2, `name` = 'hotKeyWord', `parent_id` = '1367050250249830400', `path` = 'hotKeyWord', `sort_order` = 0.00, `title` = '关键字', `front_component` = 'null' WHERE `id` = 1367050829697122304; \ No newline at end of file From a407d3a539af33c5511e58856ee03c49f9716d8f Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 26 Jul 2021 17:21:02 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update-sql/version4.2to4.3.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-sql/version4.2to4.3.sql b/update-sql/version4.2to4.3.sql index e57b0bd0a..8d3d3d416 100644 --- a/update-sql/version4.2to4.3.sql +++ b/update-sql/version4.2to4.3.sql @@ -1,2 +1,2 @@ /** 热词管理*/ -UPDATE `lilishop`.`li_menu` SET `create_by` = 'admin', `create_time` = '2021-03-03 09:54:51', `delete_flag` = b'0', `update_by` = 'admin', `update_time` = '2021-07-23 19:07:45', `description` = 'null', `front_route` = 'page/article-manage/hotWords', `icon` = 'md-aperture', `level` = 2, `name` = 'hotKeyWord', `parent_id` = '1367050250249830400', `path` = 'hotKeyWord', `sort_order` = 0.00, `title` = '关键字', `front_component` = 'null' WHERE `id` = 1367050829697122304; \ No newline at end of file +UPDATE `lilishop`.`li_menu` SET `create_by` = 'admin', `create_time` = '2021-03-03 09:54:51', `delete_flag` = b'0', `update_by` = 'admin', `update_time` = '2021-07-23 19:07:45', `description` = 'null', `front_route` = 'page/article-manage/hotWords', `icon` = 'md-aperture', `level` = 2, `name` = 'hotKeyWord', `parent_id` = '1367050250249830400', `path` = 'hotKeyWord', `sort_order` = 0.00, `title` = '搜索热词', `front_component` = 'null' WHERE `id` = 1367050829697122304; \ No newline at end of file From 5999b5f217b7c4e99bfa67c52d8920700e9c2e5d Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 27 Jul 2021 17:03:31 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=94=B9=E7=89=88?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/WechatMessageServiceImpl.java | 17 +++++++++-- .../message/util/WechatAccessTokenUtil.java | 2 +- .../message/util/WechatMessageUtil.java | 12 ++++---- .../modules/permission/entity/dos/Menu.java | 18 ++++-------- .../permission/entity/vo/UserMenuVO.java | 6 ++++ .../system/token/ManagerTokenGenerate.java | 19 ++++++------- .../security/ManagerAuthenticationFilter.java | 28 ++++++++++++------- 7 files changed, 61 insertions(+), 41 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java index 7fa749c43..bcb711982 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java @@ -39,6 +39,10 @@ public class WechatMessageServiceImpl extends ServiceImpl setIndustryParams = new HashMap<>(); + setIndustryParams.put("industry_id1", 1);//互联网/电子商务 + setIndustryParams.put("industry_id2", 5);//通信与运营商 + String context = HttpUtils.doPostWithJson(setIndustry + accessToken, setIndustryParams); + //获取已有模版，删除 - String context = HttpUtil.get(allMsgTpl + accessToken); + context = HttpUtil.get(allMsgTpl + accessToken); JSONObject jsonObject = new JSONObject(context); WechatMessageUtil.wechatHandler(jsonObject); List oldList = new ArrayList<>(); @@ -77,7 +90,7 @@ public class WechatMessageServiceImpl extends ServiceImpl tmpList = initData(); tmpList.forEach(tplData -> { WechatMessage wechatMessage = new WechatMessage(); - Map params = new HashMap<>(1); + Map params = new HashMap<>(1); params.put("template_id_short", tplData.getMsgId()); String content = HttpUtils.doPostWithJson(addTpl + accessToken, params); JSONObject tplContent = new JSONObject(content); diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java index fc7411c82..2f8ba06b2 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java @@ -68,7 +68,7 @@ public class WechatAccessTokenUtil { } //获取token String content = HttpUtil.get("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential" + - "&appid=" + item.getAppId() + "&secret=" + item.getAppSecret()); + "&appid=wx6cfbe6e0ace12ce8&secret=6dfbe0c72380dce5d49d65b3c91059b1"); JSONObject object = new JSONObject(content); log.info("token获取【" + clientTypeEnum.name() + "】返回" + object.toString()); diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java index 1c16343a9..1c42ffb29 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java @@ -93,7 +93,7 @@ public class WechatMessageUtil { return; } - log.info("微信消息发送消息：", order.getMemberId() + "-" + sn); + log.info("微信消息发送消息：{}", order.getMemberId() + "-" + sn); //获取token String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.H5); @@ -137,7 +137,7 @@ public class WechatMessageUtil { wechatMPMessageQueryWrapper.eq(WechatMPMessage::getOrderStatus, order.getOrderStatus()); WechatMPMessage wechatMPMessage = wechatMPMessageService.getOne(wechatMPMessageQueryWrapper); if (wechatMPMessage == null) { - log.error("未配置微信消息订阅"); + log.info("未配置微信消息订阅"); return; } @@ -150,7 +150,7 @@ public class WechatMessageUtil { return; } - log.info("微信消息订阅消息发送：", order.getMemberId() + "-" + sn); + log.info("微信消息订阅消息发送：{}", order.getMemberId() + "-" + sn); //获取token String token = wechatAccessTokenUtil.cgiAccessToken(ClientTypeEnum.WECHAT_MP); @@ -270,7 +270,7 @@ public class WechatMessageUtil { /** * 如果返回信息有错误 * - * @param jsonObject + * @param jsonObject 返回消息 */ public static void wechatHandler(JSONObject jsonObject) { if (jsonObject.containsKey("errmsg")) { @@ -283,9 +283,9 @@ public class WechatMessageUtil { } /** - * 如果返回信息有错误....................................................................................................................................................................................333333333333333333 + * 如果返回信息有错误 * - * @param string + * @param string 返回消息 */ public static String wechatHandler(String string) { JSONObject jsonObject = new JSONObject(); diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java index 3ba16eb21..ba84452c3 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java @@ -26,36 +26,30 @@ public class Menu extends BaseEntity { private static final long serialVersionUID = 7050744476203495207L; - @ApiModelProperty(value = "菜单/权限名称") + @ApiModelProperty(value = "菜单名称") private String name; - @ApiModelProperty(value = "层级") + @ApiModelProperty(value = "菜单层级") private Integer level; @ApiModelProperty(value = "菜单标题") private String title; - @ApiModelProperty(value = "赋权API地址,正则表达式") + @ApiModelProperty(value = "路径") private String path; - @ApiModelProperty(value = "前端路由") + @ApiModelProperty(value = "前端目录文件") private String frontRoute; - @ApiModelProperty(value = "图标") - private String icon; - @ApiModelProperty(value = "父id") private String parentId = "0"; - @ApiModelProperty(value = "说明备注") - private String description; - @ApiModelProperty(value = "排序值") @Column(precision = 10, scale = 2) private BigDecimal sortOrder; - @ApiModelProperty(value = "文件地址") - private String frontComponent; + @ApiModelProperty(value = "权限URL，*号模糊匹配，逗号分割") + private String permission; } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java index 5313fa723..acf550bbf 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java @@ -19,4 +19,10 @@ public class UserMenuVO extends Menu { */ private Boolean isSupper; + public Boolean getSupper() { + if (this.isSupper == null) { + return false; + } + return isSupper; + } } diff --git a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java index 3948977c6..20827a25d 100644 --- a/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java +++ b/framework/src/main/java/cn/lili/modules/system/token/ManagerTokenGenerate.java @@ -77,28 +77,27 @@ public class ManagerTokenGenerate extends AbstractTokenGenerate { //循环权限菜单 userMenuVOList.forEach(menu -> { //循环菜单，赋予用户权限 - if (menu.getPath() != null) { + if (menu.getPermission() != null) { //获取路径集合 - String[] paths = menu.getPath().split("\\|"); + String[] permissionUrl = menu.getPermission().split(","); //for循环路径集合 - for (String path : paths) { + for (String url : permissionUrl) { //如果是超级权限 则计入超级权限 - if (menu.getIsSupper() != null && menu.getIsSupper()) { + if (menu.getSupper()) { //如果已有超级权限，则这里就不做权限的累加 - if (!superPermissions.contains(path)) { - superPermissions.add(path); + if (!superPermissions.contains(url)) { + superPermissions.add(url); } } //否则计入浏览权限 else { - //如果已有超级权限，或者已有普通查看权限，则这里就不做权限的累加 - if (!superPermissions.contains(path) && !queryPermissions.contains(path)) { - queryPermissions.add(path); + //没有权限，则累加。 + if (!queryPermissions.contains(url)) { + queryPermissions.add(url); } } } } - //去除无效的权限 superPermissions.forEach(queryPermissions::remove); }); diff --git a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java index 70706a821..6fd2b16c5 100755 --- a/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java +++ b/manager-api/src/main/java/cn/lili/security/ManagerAuthenticationFilter.java @@ -75,24 +75,32 @@ public class ManagerAuthenticationFilter extends BasicAuthenticationFilter { private void customAuthentication(HttpServletRequest request, HttpServletResponse response, UsernamePasswordAuthenticationToken authentication) throws NoPermissionException { AuthUser authUser = (AuthUser) authentication.getDetails(); String requestUrl = request.getRequestURI(); - Map> permission = (Map>) cache.get(CachePrefix.PERMISSION_LIST.getPrefix(UserEnums.MANAGER) + authUser.getId()); - //如果不是超级管理员， 不做鉴权 + + + //如果不是超级管理员， 则鉴权 if (!authUser.getIsSuper()) { - //获取数据权限 + Map> permission = (Map>) cache.get(CachePrefix.PERMISSION_LIST.getPrefix(UserEnums.MANAGER) + authUser.getId()); + + System.out.println(requestUrl); + System.out.println(PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), requestUrl)); + System.out.println(PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.QUERY.name()).toArray(new String[0]), requestUrl)); + + //获取数据(GET 请求)权限 if (request.getMethod().equals(RequestMethod.GET.name())) { //如果用户的超级权限和查阅权限都不包含当前请求的api - if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), requestUrl) && - !PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.QUERY.name()).toArray(new String[0]), requestUrl)) { - - ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限")); + if (PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), requestUrl) + || PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.QUERY.name()).toArray(new String[0]), requestUrl)) { + } else { + ResponseUtil.output(response, ResponseUtil.resultMap(false, 400, "权限不足")); throw new NoPermissionException("权限不足"); } } - //非get请求（数据操作） 判定 + //非get请求（数据操作） 判定鉴权 else { - if (!PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), request.getRequestURI())) { + if (PatternMatchUtils.simpleMatch(permission.get(PermissionEnum.SUPER.name()).toArray(new String[0]), request.getRequestURI())) { - ResponseUtil.output(response, ResponseUtil.resultMap(false, 401, "抱歉，您没有访问权限")); + } else { + ResponseUtil.output(response, ResponseUtil.resultMap(false, 400, "权限不足")); throw new NoPermissionException("权限不足"); } } From b8634e9d59395bad428c714abf303dadfb17f6b4 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 27 Jul 2021 17:08:30 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=9C=80=E6=96=B0=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update-sql/version4.2to4.3.sql | 416 ++++++++++++++++++++++++++++++++- 1 file changed, 414 insertions(+), 2 deletions(-) diff --git a/update-sql/version4.2to4.3.sql b/update-sql/version4.2to4.3.sql index 8d3d3d416..e44303657 100644 --- a/update-sql/version4.2to4.3.sql +++ b/update-sql/version4.2to4.3.sql @@ -1,2 +1,414 @@ -/** 热词管理*/ -UPDATE `lilishop`.`li_menu` SET `create_by` = 'admin', `create_time` = '2021-03-03 09:54:51', `delete_flag` = b'0', `update_by` = 'admin', `update_time` = '2021-07-23 19:07:45', `description` = 'null', `front_route` = 'page/article-manage/hotWords', `icon` = 'md-aperture', `level` = 2, `name` = 'hotKeyWord', `parent_id` = '1367050250249830400', `path` = 'hotKeyWord', `sort_order` = 0.00, `title` = '搜索热词', `front_component` = 'null' WHERE `id` = 1367050829697122304; \ No newline at end of file +-- ---------------------------- +-- Table structure for li_menu +-- ---------------------------- +DROP TABLE IF EXISTS `li_menu`; +CREATE TABLE `li_menu` +( + `id` bigint NOT NULL COMMENT '' ID '', + `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '' 创建者 '', + `create_time` datetime DEFAULT NULL COMMENT '' 创建时间 '', + `delete_flag` bit(1) DEFAULT NULL COMMENT '' 删除标志 true / false 删除/未删除 '', + `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '' 更新者 '', + `update_time` datetime DEFAULT NULL COMMENT '' 更新时间 '', + `description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '' 说明备注 '', + `front_route` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '' 前端路由 '', + `icon` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '' 图标 '', + `level` int DEFAULT NULL COMMENT '' 层级 '', + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '' 菜单/权限名称 '', + `parent_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '' 父id '', + `path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '' 赋权API地址, + 正则表达式 '', + `sort_order` decimal(10, 2) DEFAULT NULL COMMENT '' 排序值 '', + `title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '' 菜单标题 '', + `front_component` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '' 文件地址 '', + `permission` varchar(255) DEFAULT NULL COMMENT '' 权限url '', , + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of li_menu +-- ---------------------------- +BEGIN; +INSERT INTO `li_menu` +VALUES (1348810750596767744, ''admin'', ''2021-01-12 09:55:17'', b''0'', ''admin'', ''2021-01-15 09:42:50'', ''null'', + ''1'', ''ios-american-football'', 0, ''settings'', ''0'', ''1'', 2.00, ''设置'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1348810864748945408, ''admin'', ''2021-01-12 09:55:45'', b''0'', ''admin'', ''2021-03-15 20:57:12'', ''null'', + ''null'', ''ios-american-football'', 0, ''log'', ''0'', ''null'', 3.00, ''日志'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1349237129847005184, ''admin'', ''2021-01-13 14:09:34'', b''0'', ''admin'', ''2021-01-15 09:43:16'', ''null'', + ''Main'', ''ios-american-football'', 1, ''sys'', ''1348810750596767744'', '' / sys '', 1.00, ''系统设置'', ''null'', + NULL); +INSERT INTO `li_menu` +VALUES (1349237207378714624, ''admin'', ''2021-01-13 14:09:53'', b''0'', ''admin'', ''2021-07-27 16:07:49'', ''null'', + ''Main'', ''ios-american-football'', 1, ''member'', ''1348810750596767744'', '' / member '', 0.00, ''用户管理'', + ''null'', '' / manager / user *, /manager / department *, /manager / role *, /manager / menu * ''); +INSERT INTO `li_menu` +VALUES (1349237928434098176, ''admin'', ''2021-01-13 14:13:03'', b''0'', ''admin'', ''2021-07-27 16:09:11'', ''null'', + ''Main'', ''ios-american-football'', 1, ''log'', ''1348810864748945408'', '' / log '', 1.00, ''系统监控'', ''null'', + '' / manager / log * ''); +INSERT INTO `li_menu` +VALUES (1349246048900243456, ''admin'', ''2021-01-13 14:45:00'', b''0'', ''admin'', ''2021-07-27 16:07:57'', ''null'', + ''sys/setting-manage/settingManage'', ''ios-american-football'', 2, ''setting'', ''1349237129847005184'', + ''setting'', 1.00, ''系统设置'', ''null'', '' / manager / system / setting / get *, /manager / system / setting / + put * ''); +INSERT INTO `li_menu` +VALUES (1349246347597602816, ''admin'', ''2021-01-13 14:46:12'', b''0'', ''admin'', ''2021-07-27 16:08:03'', ''null'', + ''sys/oss-manage/ossManage'', ''ios-american-football'', 2, ''oss-manage'', ''1349237129847005184'', + ''oss-manage'', 3.00, ''OSS资源'', '''', '' / manager / file * ''); +INSERT INTO `li_menu` +VALUES (1349246468775239680, ''admin'', ''2021-01-13 14:46:41'', b''0'', ''admin'', ''2021-07-27 16:08:14'', ''null'', + ''region/index'', ''ios-american-football'', 2, ''region'', ''1349237129847005184'', ''region'', 4.00, ''行政地区'', + ''null'', '' / manager / region * ''); +INSERT INTO `li_menu` +VALUES (1349246671158796288, ''admin'', ''2021-01-13 14:47:29'', b''0'', ''admin'', ''2021-07-27 16:08:09'', ''null'', + ''logistics/index'', ''ios-american-football'', 2, ''logistics'', ''1349237129847005184'', ''logistics'', 5.00, + ''物流公司'', ''null'', '' / manager / logistics * ''); +INSERT INTO `li_menu` +VALUES (1349246896661356544, ''admin'', ''2021-01-13 14:48:23'', b''0'', ''admin'', ''2021-07-27 16:08:23'', ''null'', + ''sys/setting-manage/settingManage'', ''ios-american-football'', 2, ''authLogin'', ''1349237129847005184'', + ''authLogin'', 6.00, ''信任登录'', ''null'', '' / manager / system / setting / get *, /manager / system / setting / + put * ''); +INSERT INTO `li_menu` +VALUES (1349247081504333824, ''admin'', ''2021-01-13 14:49:07'', b''0'', ''admin'', ''2021-07-27 16:08:45'', ''null'', + ''sys/setting-manage/settingManage'', ''ios-american-football'', 2, ''pay'', ''1349237129847005184'', ''pay'', + 7.00, ''支付设置'', ''null'', '' / manager / system / setting / get *, /manager / system / setting / put *, /manager + / system / setting * ''); +INSERT INTO `li_menu` +VALUES (1349247640584085504, ''admin'', ''2021-01-13 14:51:20'', b''0'', ''admin'', ''2021-07-27 16:08:56'', ''null'', + ''sensitiveWords/index'', ''ios-american-football'', 2, ''sensitiveWords'', ''1349237129847005184'', + ''sensitiveWords'', 8.00, ''敏感词'', ''null'', '' / manager / sensitiveWords * ''); +INSERT INTO `li_menu` +VALUES (1349254815809298432, ''admin'', ''2021-01-13 15:19:51'', b''0'', ''admin'', ''2021-01-15 11:15:40'', ''null'', + ''sys/user-manage/userManage'', ''ios-american-football'', 2, ''user-manage'', ''1349237207378714624'', + ''user-manage'', 1.00, ''用户管理'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1349255214977015808, ''admin'', ''2021-01-13 15:21:26'', b''0'', ''admin'', ''2021-01-15 11:16:21'', ''null'', + ''sys/department-manage/departmentManage'', ''ios-american-football'', 2, ''department-manage'', + ''1349237207378714624'', ''department-manage'', 3.00, ''部门管理'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1349255404425338880, ''admin'', ''2021-01-13 15:22:11'', b''0'', ''admin'', ''2021-02-24 09:22:21'', ''null'', + ''sys/role-manage/roleManage'', ''ios-american-football'', 2, ''role-manage'', ''1349237207378714624'', + ''role-manage'', 4.00, ''角色权限'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1349256082979840000, ''admin'', ''2021-01-13 15:24:53'', b''0'', ''admin'', ''2021-01-15 11:18:14'', ''null'', + ''sys/log-manage/logManage'', ''ios-american-football'', 2, ''log-manage'', ''1349237928434098176'', + ''log-manage'', 2.00, ''日志管理'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1357584224760102912, ''admin'', ''2021-02-05 06:57:57'', b''0'', ''admin'', ''2021-07-27 16:09:02'', ''null'', + ''sys/app-version/appVersion'', ''ios-american-football'', 2, ''appVersion'', ''1349237129847005184'', + ''appVersion'', 9.00, ''APP版本'', ''null'', '' / manager / systems / app * ''); +INSERT INTO `li_menu` +VALUES (1357873097859923969, ''admin'', ''2021-02-24 09:53:02'', b''0'', ''admin'', ''2021-02-24 09:53:12'', NULL, + ''sys/menu-manage/menuManage'', ''ios-american-football'', 2, ''menuManage'', ''1349237207378714624'', + ''menu-manage'', 2.00, ''菜单管理'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367038467288072192, ''admin'', ''2021-03-03 09:05:44'', b''0'', ''admin'', ''2021-03-03 09:09:27'', ''null'', + ''null'', ''ios-person-add'', 0, ''member'', ''0'', ''null'', 0.00, ''会员'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1367039534616805376, ''admin'', ''2021-03-03 09:09:58'', b''0'', ''admin'', ''2021-05-18 10:51:12'', ''null'', + ''null'', ''md-reorder'', 0, ''order'', ''0'', ''null'', 0.00, ''订单'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1367039950368800768, ''admin'', ''2021-03-03 09:11:37'', b''0'', NULL, NULL, NULL, NULL, ''ios-share'', 0, + ''goods'', ''0'', NULL, 0.20, ''商品'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367040067201138688, ''admin'', ''2021-03-03 09:12:05'', b''0'', NULL, NULL, NULL, NULL, ''ios-hammer'', 0, + ''promotion'', ''0'', NULL, 0.30, ''促销'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367040599596728320, ''admin'', ''2021-03-03 09:14:12'', b''0'', ''admin'', ''2021-03-03 09:52:13'', ''null'', + ''null'', ''ios-color-palette'', 0, ''operate'', ''0'', ''null'', 0.50, ''运营'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1367040819248234496, ''admin'', ''2021-03-03 09:15:04'', b''0'', NULL, NULL, NULL, NULL, ''ios-stats'', 0, + ''statistics'', ''0'', NULL, 0.70, ''统计'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367041332861730816, ''admin'', ''2021-03-03 09:17:07'', b''0'', NULL, NULL, NULL, ''Main'', ''ios-aperture'', + 1, '' / '', ''1367038467288072192'', '' / '', 0.00, ''会员管理'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367041461194850304, ''admin'', ''2021-03-03 09:17:37'', b''0'', ''admin'', ''2021-07-27 16:02:17'', NULL, + ''member/list/index'', ''ios-aperture'', 2, ''memberList'', ''1367041332861730816'', ''memberList'', 0.00, + ''会员列表'', NULL, '' / manager / member *, /manager / orders *, /manager / wallet / log *, /manager / receipt * + ''); +INSERT INTO `li_menu` +VALUES (1367041575619657728, ''admin'', ''2021-03-03 09:18:05'', b''0'', ''admin'', ''2021-07-27 15:59:50'', NULL, + ''member/list/memberRecycle'', ''ios-aperture'', 2, ''memberRecycle'', ''1367041332861730816'', + ''memberRecycle'', 1.00, ''回收站'', NULL, '' / manager / member * ''); +INSERT INTO `li_menu` +VALUES (1367042490443497472, ''admin'', ''2021-03-03 09:21:43'', b''0'', NULL, NULL, NULL, ''Main'', ''ios-aperture'', + 1, '' / '', ''1367038467288072192'', '' / '', 1.00, ''预存款'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367042664410644480, ''admin'', ''2021-03-03 09:22:24'', b''0'', ''admin'', ''2021-07-27 16:02:44'', ''null'', + ''member/advance/walletLog'', ''ios-aperture'', 2, ''walletLog'', ''1367042490443497472'', ''walletLog'', 0.00, + ''会员资金'', ''null'', '' / manager / wallet / log * ''); +INSERT INTO `li_menu` +VALUES (1367042804944994304, ''admin'', ''2021-03-03 09:22:58'', b''0'', ''admin'', ''2021-07-27 16:02:48'', NULL, + ''member/advance/recharge'', ''ios-alert'', 2, ''recharge'', ''1367042490443497472'', ''recharge'', 1.00, + ''充值记录'', NULL, '' / manager / recharge * ''); +INSERT INTO `li_menu` +VALUES (1367042804944994305, ''admin'', ''2021-03-03 09:22:58'', b''0'', ''admin'', ''2021-07-27 16:02:52'', NULL, + ''member/advance/withdrawApply'', ''ios-alert'', 2, ''withdrawApply'', ''1367042490443497472'', + ''withdrawApply'', 1.00, ''提现申请'', NULL, '' / manager / members / withdraw - apply * ''); +INSERT INTO `li_menu` +VALUES (1367042917113266176, ''admin'', ''2021-03-03 09:23:25'', b''0'', NULL, NULL, NULL, ''Main'', ''ios-aperture'', + 1, ''commont'', ''1367038467288072192'', '' / '', 0.00, ''评价'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367043020976816128, ''admin'', ''2021-03-03 09:23:49'', b''0'', ''admin'', ''2021-07-27 16:02:35'', NULL, + ''goods/goods-review/index'', ''md-aperture'', 2, ''goodsReview'', ''1367042917113266176'', ''goodsReview'', + 0.00, ''会员评价'', NULL, '' / manager / memberEvaluation * ''); +INSERT INTO `li_menu` +VALUES (1367043443917848576, ''admin'', ''2021-03-03 09:25:30'', b''0'', ''admin'', ''2021-07-27 16:03:00'', NULL, + ''Main'', ''md-aperture'', 1, ''order'', ''1367039534616805376'', '' / '', 0.00, ''订单'', NULL, + '' / manager / orders * ''); +INSERT INTO `li_menu` +VALUES (1367043505771249664, ''admin'', ''2021-03-03 09:25:45'', b''0'', NULL, NULL, NULL, ''Main'', ''md-aperture'', 1, + ''aftersale'', ''1367039534616805376'', '' / '', 0.00, ''售后'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367043642379730944, ''admin'', ''2021-03-03 09:26:17'', b''0'', NULL, NULL, NULL, ''order/order/orderList'', + ''ios-aperture'', 2, ''orderList'', ''1367043443917848576'', ''orderList'', 0.00, ''商品订单'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367043791105556480, ''admin'', ''2021-03-03 09:26:53'', b''0'', NULL, NULL, NULL, + ''order/order/fictitiousOrderList'', ''ios-aperture'', 2, ''fictitiousOrderList'', ''1367043443917848576'', + ''fictitiousOrderList'', 1.00, ''虚拟订单'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367043980407078912, ''admin'', ''2021-03-03 09:27:38'', b''0'', ''admin'', ''2021-07-27 16:03:43'', NULL, + ''order/after-order/afterSaleOrder'', ''md-alert'', 2, ''afterSaleOrder'', ''1367043505771249664'', + ''afterSaleOrder'', 0.00, ''售后管理'', NULL, '' / manager / afterSale * ''); +INSERT INTO `li_menu` +VALUES (1367044121163726848, ''admin'', ''2021-03-03 09:28:12'', b''0'', ''admin'', ''2021-07-27 16:03:48'', NULL, + ''order/after-order/orderComplaint'', ''md-alert'', 2, ''orderComplaint'', ''1367043505771249664'', + ''orderComplaint'', 2.00, ''交易投诉'', NULL, '' / manager / complain * ''); +INSERT INTO `li_menu` +VALUES (1367044247978508288, ''admin'', ''2021-03-03 09:28:42'', b''0'', ''admin'', ''2021-07-27 16:03:52'', NULL, + ''order/after-order/afterSale'', ''md-aperture'', 2, ''afterSaleReason'', ''1367043505771249664'', + ''afterSaleReason'', 3.00, ''售后原因'', NULL, '' / manager / afterSaleReason * ''); +INSERT INTO `li_menu` +VALUES (1367044376391319552, ''admin'', ''2021-03-03 09:29:12'', b''0'', ''admin'', ''2021-07-27 16:04:08'', NULL, + ''Main'', ''md-aperture'', 1, ''goodsManager'', ''1367039950368800768'', '' / '', 0.00, ''商品管理'', NULL, + '' / manager / goods * ''); +INSERT INTO `li_menu` +VALUES (1367044657296441344, ''admin'', ''2021-03-03 09:30:19'', b''0'', NULL, NULL, NULL, ''Main'', ''ios-aperture'', + 1, ''association'', ''1367039950368800768'', '' / '', 1.00, ''关联管理'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367045529720061952, ''admin'', ''2021-03-03 09:33:47'', b''0'', ''admin'', ''2021-07-27 15:38:46'', NULL, + ''goods/goods-info/goods'', ''md-aperture'', 2, ''managerGoods'', ''1367044376391319552'', ''managerGoods'', + 0.00, ''平台商品'', NULL, ''null''); +INSERT INTO `li_menu` +VALUES (1367045630710513664, ''admin'', ''2021-03-03 09:34:11'', b''0'', ''admin'', ''2021-07-27 15:38:56'', NULL, + ''goods/goods-info/goodsApply'', ''ios-alert'', 2, ''applyGoods'', ''1367044376391319552'', ''applyGoods'', + 1.00, ''商品审核'', NULL, ''null''); +INSERT INTO `li_menu` +VALUES (1367045794284175360, ''admin'', ''2021-03-03 09:34:50'', b''0'', ''admin'', ''2021-07-27 16:04:18'', NULL, + ''goods/goods-manage/category'', ''md-alert'', 2, ''goodsCategory'', ''1367044657296441344'', ''goodsCategory'', + 0.00, ''商品分类'', NULL, '' / manager / goods / category *, /manager / goods / brand *, /manager / goods / spec + *, /manager / goods / parameters * ''); +INSERT INTO `li_menu` +VALUES (1367045921434501120, ''admin'', ''2021-03-03 09:35:21'', b''0'', ''admin'', ''2021-07-27 16:04:23'', NULL, + ''goods/goods-manage/brand'', ''md-alert'', 2, ''goodsBrand'', ''1367044657296441344'', ''goodsBrand'', 1.00, + ''品牌列表'', NULL, '' / manager / goods / brand * ''); +INSERT INTO `li_menu` +VALUES (1367046068369358848, ''admin'', ''2021-03-03 09:35:56'', b''0'', ''admin'', ''2021-07-27 16:04:27'', NULL, + ''goods/goods-manage/spec'', ''md-aperture'', 2, ''goodsSpec'', ''1367044657296441344'', ''goodsSpec'', 2.00, + ''规格列表'', NULL, '' / manager / goods / spec * ''); +INSERT INTO `li_menu` +VALUES (1367046266214678528, ''admin'', ''2021-03-03 09:36:43'', b''0'', ''admin'', ''2021-07-27 16:04:32'', NULL, + ''goods-unit/index'', ''md-alert'', 2, ''goodsUnit'', ''1367044657296441344'', ''goodsUnit'', 4.00, ''计量单位'', + NULL, '' / manager / goods / goodsUnit * ''); +INSERT INTO `li_menu` +VALUES (1367048084701315072, ''admin'', ''2021-03-03 09:43:57'', b''0'', ''admin'', ''2021-03-03 09:52:17'', ''null'', + ''null'', ''ios-pricetags'', 0, ''shop'', ''0'', ''null'', 0.40, ''店铺'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1367048684339986432, ''admin'', ''2021-03-03 09:46:20'', b''0'', NULL, NULL, NULL, ''Main'', ''md-aperture'', 1, + ''shopManager'', ''1367048084701315072'', '' / '', 0.00, ''店铺管理'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367048754229673984, ''admin'', ''2021-03-03 09:46:36'', b''0'', NULL, NULL, NULL, ''Main'', ''md-aperture'', 1, + ''bill'', ''1367048084701315072'', '' / '', 0.00, '' 店铺结算'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367048832210173952, ''admin'', ''2021-03-03 09:46:55'', b''0'', ''admin'', ''2021-07-27 16:05:30'', NULL, + ''seller/shop/shopList'', ''md-aperture'', 2, ''shopList'', ''1367048684339986432'', ''shopList'', 0.00, + ''店铺列表'', NULL, '' / manager / store * ''); +INSERT INTO `li_menu` +VALUES (1367048967635861504, ''admin'', ''2021-03-03 09:47:27'', b''0'', ''admin'', ''2021-07-27 16:05:32'', NULL, + ''seller/shop/shopAuditList'', ''md-alert'', 2, ''shopAuth'', ''1367048684339986432'', ''shopAuth'', 1.00, + ''店铺审核'', NULL, '' / manager / store * ''); +INSERT INTO `li_menu` +VALUES (1367049068122996736, ''admin'', ''2021-03-03 09:47:51'', b''0'', ''admin'', ''2021-07-27 16:05:36'', NULL, + ''seller/bill/bill'', ''md-alert'', 2, ''billList'', ''1367048754229673984'', ''billList'', 0.00, ''店铺结算'', + NULL, '' / manager / store / bill * ''); +INSERT INTO `li_menu` +VALUES (1367049214198022144, ''admin'', ''2021-03-03 09:48:26'', b''0'', NULL, NULL, NULL, ''Main'', ''md-aperture'', 1, + ''promotionManager'', ''1367040067201138688'', '' / '', 0.00, ''促销管理'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1367049384792948736, ''admin'', ''2021-03-03 09:49:07'', b''0'', ''admin'', ''2021-07-27 16:04:42'', NULL, + ''promotion/coupon/coupon'', ''md-alert'', 2, ''coupon'', ''1367049214198022144'', ''coupon'', 0.00, ''优惠券'', + NULL, '' / manager / promotion / coupon * ''); +INSERT INTO `li_menu` +VALUES (1367049500782231552, ''admin'', ''2021-03-03 09:49:34'', b''0'', ''admin'', ''2021-07-27 16:04:53'', ''null'', + ''promotion/fullCut/full-cut'', ''md-alert'', 2, ''fullCut'', ''1367049214198022144'', ''fullCut'', 1.00, + ''满额活动'', ''null'', '' / manager / promotion / fullDiscount * ''); +INSERT INTO `li_menu` +VALUES (1367049611578966016, ''admin'', ''2021-03-03 09:50:01'', b''0'', ''admin'', ''2021-07-27 16:04:58'', ''null'', + ''promotion/seckill/seckill'', ''md-alert'', 2, ''seckill'', ''1367049214198022144'', ''seckill'', 2.00, + ''秒杀活动'', ''null'', '' / manager / promotion / seckill * ''); +INSERT INTO `li_menu` +VALUES (1367049712657498112, ''admin'', ''2021-03-03 09:50:25'', b''0'', ''admin'', ''2021-07-27 16:05:02'', ''null'', + ''promotion/pintuan/pintuan'', ''md-alert'', 2, ''pintuan'', ''1367049214198022144'', ''pintuan'', 3.00, + ''拼团活动'', ''null'', '' / manager / promotion / pintuan * ''); +INSERT INTO `li_menu` +VALUES (1367050250249830400, ''admin'', ''2021-03-03 09:52:33'', b''0'', ''admin'', ''2021-03-22 20:38:14'', ''null'', + ''Main'', ''md-aperture'', 1, ''document'', ''1367040599596728320'', '' / '', 2.00, ''文章管理'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1367050320584114176, ''admin'', ''2021-03-03 09:52:50'', b''0'', ''admin'', ''2021-07-27 16:05:49'', NULL, + ''Main'', ''md-aperture'', 1, ''floor'', ''1367040599596728320'', '' / '', 0.00, ''楼层装修'', NULL, + '' / manager / pageData *, /manager / file *, /manager / article - category *, /manager / article *, /manager / + promotion *, /manager / goods *, /manager / store * ''); +INSERT INTO `li_menu` +VALUES (1367050530030878720, ''admin'', ''2021-03-03 09:53:40'', b''0'', ''admin'', ''2021-03-04 01:05:57'', ''null'', + ''lili-floor-renovation/floorList'', ''md-alert'', 2, ''pcFloor'', ''1367050320584114176'', ''pcFloor'', 0.00, + ''PC端'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1367050673312497664, ''admin'', ''2021-03-03 09:54:14'', b''0'', ''admin'', ''2021-03-04 01:06:04'', ''null'', + ''lili-floor-renovation/wap/wapList'', ''md-aperture'', 2, ''wapList'', ''1367050320584114176'', ''wapList'', + 1.00, ''移动端'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1367050829697122304, ''admin'', ''2021-03-03 09:54:51'', b''0'', ''admin'', ''2021-07-27 16:06:32'', ''null'', + ''page/article-manage/hotWords'', ''md-aperture'', 2, ''hotKeyWord'', ''1367050250249830400'', ''hotKeyWord'', + 0.00, ''搜索热词'', ''null'', '' / manager / hotwords * ''); +INSERT INTO `li_menu` +VALUES (1367050939084570624, ''admin'', ''2021-03-03 09:55:17'', b''0'', ''admin'', ''2021-07-27 16:06:38'', NULL, + ''page/article-manage/ArticleCategory'', ''md-aperture'', 2, ''article-category'', ''1367050250249830400'', + ''article-category'', 1.00, ''文章分类'', NULL, '' / manager / article - category * ''); +INSERT INTO `li_menu` +VALUES (1367051048232943616, ''admin'', ''2021-03-03 09:55:43'', b''0'', ''admin'', ''2021-07-27 16:06:42'', NULL, + ''page/article-manage/articleList'', ''md-alert'', 2, ''articleList'', ''1367050250249830400'', ''articleList'', + 3.00, ''文章管理'', NULL, '' / manager / article - category *, /manager / article * ''); +INSERT INTO `li_menu` +VALUES (1367052616634204160, ''admin'', ''2021-03-03 10:01:57'', b''0'', ''admin'', ''2021-07-27 16:07:38'', NULL, + ''Main'', ''md-aperture'', 1, ''statistics'', ''1367040819248234496'', '' / '', 0.00, ''统计'', NULL, + '' / manager / store *, /manager / member * ''); +INSERT INTO `li_menu` +VALUES (1367052705725415424, ''admin'', ''2021-03-03 10:02:18'', b''0'', ''admin'', ''2021-03-11 22:11:05'', ''null'', + ''statistics/member'', ''md-alert'', 2, ''memberStatistics'', ''1367052616634204160'', ''memberStatistics'', + 0.00, ''会员统计'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1367052805503713280, ''admin'', ''2021-03-03 10:02:42'', b''0'', ''admin'', ''2021-03-11 22:11:14'', ''null'', + ''statistics/order'', ''md-alert'', 2, ''orderStatistics'', ''1367052616634204160'', ''orderStatistics'', 1.00, + ''订单统计'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1367052915314786304, ''admin'', ''2021-03-03 10:03:08'', b''0'', ''admin'', ''2021-03-11 22:11:23'', ''null'', + ''statistics/goods'', ''md-alert'', 2, ''goodsStatistics'', ''1367052616634204160'', ''goodsStatistics'', 2.00, + ''商品统计'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1367053087121866752, ''admin'', ''2021-03-03 10:03:49'', b''0'', ''admin'', ''2021-03-11 22:11:34'', ''null'', + ''statistics/traffic'', ''md-alert'', 2, ''trafficStatistics'', ''1367052616634204160'', ''trafficStatistics'', + 4.00, ''流量统计'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1372807928452481024, ''admin'', ''2021-03-19 02:11:30'', b''0'', NULL, NULL, NULL, ''Main'', ''ios-aperture'', + 1, ''flow'', ''1367039534616805376'', '' / '', 3.00, ''流水'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1372808148565360640, ''admin'', ''2021-03-19 02:12:23'', b''0'', ''admin'', ''2021-07-27 16:03:57'', NULL, + ''order/flow/paymentLog'', ''md-alert'', 2, ''paymentLog'', ''1372807928452481024'', ''paymentLog'', 1.00, + ''收款记录'', NULL, '' / manager / paymentLog * ''); +INSERT INTO `li_menu` +VALUES (1372808352295288832, ''admin'', ''2021-03-19 02:13:11'', b''0'', ''admin'', ''2021-07-27 16:04:01'', NULL, + ''order/flow/refundLog'', ''ios-aperture'', 2, ''refundLog'', ''1372807928452481024'', ''refundLog'', 2.00, + ''退款流水'', NULL, '' / manager / refundLog * ''); +INSERT INTO `li_menu` +VALUES (1373166892465782784, ''admin'', ''2021-03-20 01:57:54'', b''0'', ''admin'', ''2021-03-22 20:13:48'', ''null'', + ''Main'', ''ios-aperture'', 1, '' / '', ''1367038467288072192'', '' / '', 0.00, ''积分'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1373167227385151488, ''admin'', ''2021-03-20 01:59:14'', b''0'', ''admin'', ''2021-07-27 16:02:40'', ''null'', + ''member/point/point'', ''ios-aperture'', 2, ''point'', ''1373166892465782784'', ''point'', 0.00, ''积分历史'', + ''null'', '' / manager / member / memberPointsHistory * ''); +INSERT INTO `li_menu` +VALUES (1373791578371391488, ''admin'', ''2021-03-21 19:20:11'', b''0'', ''admin'', ''2021-07-27 16:05:38'', NULL, + ''seller/bill/accountStatementBill'', ''md-alert'', 2, ''accountStatementBill'', ''1367048754229673984'', + ''accountStatementBill'', 0.00, ''商家对账'', NULL, '' / manager / store / bill * ''); +INSERT INTO `li_menu` +VALUES (1374154349697040384, ''admin'', ''2021-03-22 19:21:42'', b''0'', ''admin'', ''2021-07-27 16:06:55'', ''null'', + ''Main'', ''md-aperture'', 1, ''feedback'', ''1367040599596728320'', '' / '', 3.00, ''意见反馈'', ''null'', + '' / manager / feedback * ''); +INSERT INTO `li_menu` +VALUES (1374155741123837952, ''admin'', ''2021-03-22 19:27:14'', b''0'', ''admin'', ''2021-07-27 15:41:40'', ''null'', + ''page/feedback/feedback'', ''md-aperture'', 2, ''feedback'', ''1374154349697040384'', ''feedback'', 0.00, + ''意见反馈'', ''null'', ''null''); +INSERT INTO `li_menu` +VALUES (1374173575405109248, ''admin'', ''2021-03-22 20:38:06'', b''0'', ''admin'', ''2021-03-22 20:52:58'', ''null'', + ''Main'', ''ios-analytics'', 1, ''distributionManager'', ''1367040599596728320'', '' / '', 1.00, ''分销管理'', + ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1374177618072436736, ''admin'', ''2021-03-22 20:54:10'', b''0'', ''admin'', ''2021-07-27 16:05:58'', ''null'', + ''distribution/distributionSetting'', ''ios-basketball'', 2, ''distributionSetting'', ''1374173575405109248'', + ''distributionSetting'', 0.00, ''分销设置'', ''null'', + '' / manager / system / setting / put / DISTRIBUTION_SETTING *, /manager / system / setting / get / + DISTRIBUTION_SETTING * ''); +INSERT INTO `li_menu` +VALUES (1374177789581721600, ''admin'', ''2021-03-22 20:54:51'', b''0'', ''admin'', ''2021-07-27 16:06:15'', ''null'', + ''distribution/distributionGoods'', ''ios-chatbubbles'', 2, ''distributionGoods'', ''1374173575405109248'', + ''distributionGoods'', 3.00, ''分销商品'', ''null'', '' / manager / distribution / goods * ''); +INSERT INTO `li_menu` +VALUES (1374177910411231232, ''admin'', ''2021-03-22 20:55:19'', b''0'', ''admin'', ''2021-07-27 16:06:20'', ''null'', + ''distribution/distributionOrder'', ''ios-cloudy'', 2, ''distributionOrder'', ''1374173575405109248'', + ''distributionOrder'', 4.00, ''分销订单'', ''null'', '' / manager / distribution / order *, /manager / store * ''); +INSERT INTO `li_menu` +VALUES (1374178079181635584, ''admin'', ''2021-03-22 20:56:00'', b''0'', ''admin'', ''2021-07-27 16:06:05'', ''null'', + ''distribution/distributionApply'', ''md-egg'', 2, ''distributionApply'', ''1374173575405109248'', + ''distributionApply'', 1.00, ''分销申请'', ''null'', '' / manager / distribution * ''); +INSERT INTO `li_menu` +VALUES (1374178303975358464, ''admin'', ''2021-03-22 20:56:53'', b''0'', ''admin'', ''2021-07-27 16:06:08'', ''null'', + ''distribution/distribution'', ''md-person'', 2, ''distribution'', ''1374173575405109248'', ''distribution'', + 2.00, ''分销员'', ''null'', '' / manager / distribution * ''); +INSERT INTO `li_menu` +VALUES (1374916594269945856, ''admin'', ''2021-03-24 21:50:35'', b''0'', ''admin'', ''2021-07-27 16:08:51'', NULL, + ''sys/slider/slider'', ''ios-aperture'', 2, ''slider'', ''1349237129847005184'', ''slider'', 7.00, ''验证码'', + NULL, '' / manager / verificationSource * ''); +INSERT INTO `li_menu` +VALUES (1376450531517530112, ''admin'', ''2021-03-29 03:25:55'', b''0'', NULL, NULL, NULL, ''Main'', ''md-basketball'', + 1, ''notice'', ''1367040599596728320'', '' / '', 5.00, ''站内信'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1376450662098796544, ''admin'', ''2021-03-29 03:26:26'', b''0'', ''admin'', ''2021-07-27 16:07:23'', NULL, + ''sys/message/noticeMessageTemplate'', ''ios-american-football'', 2, ''noticeMessageTemplate'', + ''1376450531517530112'', ''noticeMessageTemplate'', 1.00, ''站内信'', NULL, '' / manager / noticeMessage *, /manager + / message *, /manager / store *, /manager / member * ''); +INSERT INTO `li_menu` +VALUES (1376450766817984512, ''admin'', ''2021-03-29 03:26:51'', b''0'', ''admin'', ''2021-03-29 03:27:25'', ''null'', + ''Main'', ''md-checkmark'', 1, ''sms'', ''1367040599596728320'', '' / '', 6.00, ''短信管理'', ''null'', NULL); +INSERT INTO `li_menu` +VALUES (1376450876423536640, ''admin'', ''2021-03-29 03:27:17'', b''0'', ''admin'', ''2021-07-27 16:07:29'', NULL, + ''sys/message/sms'', ''ios-timer'', 2, ''sms'', ''1376450766817984512'', ''sms'', 1.00, ''短信'', NULL, + '' / manager / sms *, /manager / member * ''); +INSERT INTO `li_menu` +VALUES (1384035281702748160, ''admin'', ''2021-04-19 14:45:00'', b''0'', ''admin'', ''2021-07-27 16:08:18'', ''null'', + ''member/message-manage/weChatMessageManager'', ''md-aperture'', 2, ''message-manage'', ''1349237129847005184'', + ''message-manage'', 5.00, ''微信消息'', ''null'', '' / manager / message / wechat *, /manager / message / + wechatMPMessage * ''); +INSERT INTO `li_menu` +VALUES (1403988156444962818, ''admin'', ''2021-06-13 16:10:36'', b''0'', ''admin'', ''2021-07-27 16:04:48'', ''null'', + ''promotion/couponActivity/coupon'', '''', 2, ''coupon-activity'', ''1367049214198022144'', ''coupon-activity'', + 0.00, ''券活动'', ''null'', '' / manager / promotion / couponActivity * ''); +INSERT INTO `li_menu` +VALUES (1407601962899230721, ''admin'', ''2021-06-23 15:30:35'', b''0'', ''admin'', ''2021-07-27 16:05:08'', NULL, + ''Main'', '''', 1, ''liveManage'', ''1367040067201138688'', '' / '', 2.00, ''直播管理'', NULL, + '' / manager / broadcast * ''); +INSERT INTO `li_menu` +VALUES (1407602049759072258, ''admin'', ''2021-06-23 15:30:55'', b''0'', NULL, NULL, NULL, ''promotion/live/live'', + '''', 2, ''live'', ''1407601962899230721'', ''live'', 1.00, ''直播管理'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1407602441964244994, ''admin'', ''2021-06-23 15:32:29'', b''0'', NULL, NULL, NULL, ''Main'', '''', 1, + ''pointManage'', ''1367040067201138688'', '' / '', 3.00, ''积分活动'', NULL, NULL); +INSERT INTO `li_menu` +VALUES (1407602516912263170, ''admin'', ''2021-06-23 15:32:47'', b''0'', ''admin'', ''2021-07-27 16:05:14'', NULL, + ''promotion/pointsGoods/pointsGoods'', '''', 2, ''pointsGoods'', ''1407602441964244994'', ''pointsGoods'', 1.00, + ''积分商品'', NULL, '' / manager / promotion / pointsGoods *, /manager / goods * ''); +INSERT INTO `li_menu` +VALUES (1407602673334636546, ''admin'', ''2021-06-23 15:33:24'', b''0'', ''admin'', ''2021-07-27 16:05:18'', NULL, + ''promotion/pointsGoodsCategory/pointsGoodsCategory'', '''', 2, ''pointsGoodsCategory'', + ''1407602441964244994'', ''pointsGoodsCategory'', 2.00, ''积分分类'', NULL, + '' / manager / promotion / pointsGoodsCategory * ''); +INSERT INTO `li_menu` +VALUES (1410862675914764290, ''admin'', ''2021-07-02 15:27:29'', b''0'', ''admin'', ''2021-07-27 16:06:26'', ''null'', + ''distribution/distributionCash'', '''', 2, ''distributionCash'', ''1374173575405109248'', ''distributionCash'', + 5.00, ''分销提现'', ''null'', '' / manager / distribution / cash * ''); +INSERT INTO `li_menu` +VALUES (1419926569920536578, ''admin'', ''2021-07-27 15:44:10'', b''0'', ''admin'', ''2021-07-27 16:07:10'', NULL, + ''customWords/index'', NULL, 2, ''customWords'', ''1367050250249830400'', ''customWords'', 4.00, ''ES分词'', NULL, + '' / manager / manager / custom - words * ''); +COMMIT; From 4ac7c038f248b7020a84b1e0bb245180f8e5b87a Mon Sep 17 00:00:00 2001 From: lifenlong Date: Tue, 27 Jul 2021 17:17:11 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BA=97=E9=93=BA=E7=9A=84=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/member/entity/vo/MemberEvaluationListVO.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java index b7887db28..c1dc8995b 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java @@ -39,8 +39,15 @@ public class MemberEvaluationListVO { @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; + @ApiModelProperty(value = "物流评分") + private Integer deliveryScore; + @ApiModelProperty(value = "服务评分") + private Integer serviceScore; + + @ApiModelProperty(value = "描述评分") + private Integer descriptionScore; }