From 7b7e387c1f547da0f531cf4a9f1811b959fcdd17 Mon Sep 17 00:00:00 2001 From: Lucky0829 <641787296@qq.com> Date: Mon, 29 Apr 2019 16:42:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=92=8C=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=BF=A1=E6=81=AF=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/core/constant/CacheConstants.java | 14 ++++++++++---- .../admin/service/impl/SysDictServiceImpl.java | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java index 7436b23c3..38343fe34 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java @@ -8,21 +8,27 @@ package com.pig4cloud.pigx.common.core.constant; */ public interface CacheConstants { + /** + * 菜单信息缓存 + */ + String MENU_DETAILS = "menu_details"; + /** * 用户信息缓存 */ String USER_DETAILS = "user_details"; + /** + * 字典信息缓存 + */ + String DICT_DETAILS = "dict_details"; + /** * oauth 客户端信息 */ String CLIENT_DETAILS_KEY = "pigx_oauth:client:details"; - /** - * 菜单信息缓存 - */ - String MENU_DETAILS = "menu_details"; /** * spring boot admin 事件key diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java index bad753575..5b53f8ad6 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java @@ -23,6 +23,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysDictItem; import com.pig4cloud.pigx.admin.mapper.SysDictItemMapper; import com.pig4cloud.pigx.admin.mapper.SysDictMapper; import com.pig4cloud.pigx.admin.service.SysDictService; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -46,7 +47,7 @@ public class SysDictServiceImpl extends ServiceImpl impl * @return */ @Override - @CacheEvict(value = "dict_details", allEntries = true) + @CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true) @Transactional(rollbackFor = Exception.class) public Boolean removeDict(Integer id) { baseMapper.deleteById(id); From 532dfe94f39f8b29fa764cb6b19a40dd2992c0f4 Mon Sep 17 00:00:00 2001 From: Lucky0829 <641787296@qq.com> Date: Tue, 30 Apr 2019 10:24:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E3=80=82=20gitig?= =?UTF-8?q?nore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 290129e4d..dc8628a31 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ bin/ *.iws *.iml *.ipr +*.lock rebel.xml ### NetBeans ### From f6fb9d0c56bf8e045d46e9782221021d3011ac01 Mon Sep 17 00:00:00 2001 From: Lucky0829 <641787296@qq.com> Date: Tue, 30 Apr 2019 10:26:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96.=20=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B8=B8=E9=87=8F=E8=8F=9C=E5=8D=95=E6=A0=91=E6=A0=B9?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/core/constant/CommonConstants.java | 5 +++++ .../com/pig4cloud/pigx/admin/controller/MenuController.java | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java index 812e942be..e46bb2738 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java @@ -47,6 +47,11 @@ public interface CommonConstants { */ String MENU = "0"; + /** + * 菜单树根节点 + */ + Integer MENU_TREE_ROOT_ID = -1; + /** * 编码 */ diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java index f9ed5f663..6f77cf2f1 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java @@ -68,7 +68,7 @@ public class MenuController { .map(MenuTree::new) .sorted(Comparator.comparingInt(MenuTree::getSort)) .collect(Collectors.toList()); - return new R<>(TreeUtil.build(menuTreeList, -1)); + return new R<>(TreeUtil.build(menuTreeList, CommonConstants.MENU_TREE_ROOT_ID)); } /** @@ -78,7 +78,9 @@ public class MenuController { */ @GetMapping(value = "/tree") public R getTree() { - return new R<>(TreeUtil.buildTree(sysMenuService.list(Wrappers.emptyWrapper()), -1)); + return new R<>(TreeUtil.buildTree(sysMenuService + .list(Wrappers.lambdaQuery() + .orderByAsc(SysMenu::getSort)), CommonConstants.MENU_TREE_ROOT_ID)); } /** From 58371ad4cfa73d87feda8f2e0fb64bb8b34ae4ab Mon Sep 17 00:00:00 2001 From: lisb Date: Mon, 6 May 2019 13:07:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?:recycle:=20Refactoring=20code.=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=96=B9=E6=B3=95=E7=A8=B3=E5=AE=9A=E6=80=A7=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8Dminio=E5=AD=98=E5=82=A8=E6=A1=B6=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E4=B8=AD=E5=B8=A6=E6=9C=89-=E6=97=B6=E9=80=A0?= =?UTF-8?q?=E6=88=90=E8=A7=A3=E6=9E=90=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pig4cloud/pigx/admin/controller/FileController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/FileController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/FileController.java index d341b6097..6b0980dbe 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/FileController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/FileController.java @@ -82,9 +82,8 @@ public class FileController { */ @GetMapping("/{fileName}") public void file(@PathVariable String fileName, HttpServletResponse response) { - String[] nameArray = StrUtil.split(fileName, StrUtil.DASHED); - - try (InputStream inputStream = minioTemplate.getObject(nameArray[0], nameArray[1])) { + Integer separator = fileName.lastIndexOf(StrUtil.DASHED); + try (InputStream inputStream = minioTemplate.getObject(fileName.substring(0,separator),fileName.substring(separator+1,fileName.length()))) { response.setContentType("application/octet-stream; charset=UTF-8"); IoUtil.copy(inputStream, response.getOutputStream()); } catch (Exception e) {