diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 2bb8832b..bd8734f7 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -77,7 +77,6 @@ public class SysDictController { private static final String DEL_SUCCESS = "删除成功!"; @GetMapping("/page") - @RequiresPermissions("dict:list") @ApiOperation(value = "字典控制器-分页列表查询", notes = "字典控制器-分页列表查询") public Results> queryPageList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @@ -104,7 +103,6 @@ public class SysDictController { */ @ApiOperation(value = "字典控制器-树形字典数据", notes = "字典控制器-树形字典数据") @GetMapping("/treeList") - @RequiresPermissions("dict:list") public Results> treeList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Results> result = new Results<>(); @@ -132,7 +130,6 @@ public class SysDictController { */ @ApiOperation(value = "字典控制器-获取全部字典数据", notes = "字典控制器-获取全部字典数据") @GetMapping("/queryAllDictItems") - @RequiresPermissions("dict:list") public Results>> queryAllDictItems(HttpServletRequest request) { Map> res ; res = sysDictService.queryAllDictItems(); @@ -146,7 +143,6 @@ public class SysDictController { */ @ApiOperation(value = "字典控制器-通过字典code和字典值key获取字典数据", notes = "字典控制器-通过字典code和字典值key获取字典数据") @GetMapping("/getDictText/{dictCode}/{key}") - @RequiresPermissions("dict:list") public Results getDictText(@PathVariable("dictCode") String dictCode, @PathVariable("key") String key) { log.info(" dictCode : "+ dictCode); Results result = new Results<>(); @@ -169,7 +165,6 @@ public class SysDictController { * @return */ @GetMapping("/getDictItems/{dictCode}") - @RequiresPermissions("dict:list") public Results> getDictItems(@PathVariable String dictCode, @RequestParam(value = "sign",required = false) String sign, HttpServletRequest request) { log.info(" dictCode : "+ dictCode); Results> result = new Results<>(); @@ -196,9 +191,8 @@ public class SysDictController { * @return */ @GetMapping("/loadDict/{dictCode}") - @RequiresPermissions("dict:list") public Results> loadDict(@PathVariable String dictCode, - @RequestParam(name="keyword") String keyword, + @RequestParam(name="keyword",required = false) String keyword, @RequestParam(value = "sign",required = false) String sign, @RequestParam(value = "pageSize", required = false) Integer pageSize) { log.info(" 加载字典表数据,加载关键字: "+ keyword); @@ -227,10 +221,9 @@ public class SysDictController { * @return */ @GetMapping("/loadDictOrderByValue/{dictCode}") - @RequiresPermissions("dict:list") public Results> loadDictOrderByValue( @PathVariable String dictCode, - @RequestParam(name = "keyword") String keyword, + @RequestParam(name = "keyword",required = false) String keyword, @RequestParam(value = "sign", required = false) String sign, @RequestParam(value = "pageSize", required = false) Integer pageSize) { // 首次查询查出来用户选中的值,并且不分页 @@ -270,7 +263,6 @@ public class SysDictController { * @return */ @GetMapping("/loadDictItem/{dictCode}") - @RequiresPermissions("dict:list") public Results> loadDictItem(@PathVariable String dictCode, @RequestParam(name="key") String keys, @RequestParam(value = "sign",required = false) String sign, @RequestParam(value = "delNotExist",required = false,defaultValue = "true") boolean delNotExist, HttpServletRequest request) { Results> result = new Results<>(); try { @@ -301,7 +293,6 @@ public class SysDictController { */ @ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据") @GetMapping("/loadTreeData") - @RequiresPermissions("dict:list") public Results> loadTreeData(@RequestParam(name="pid") String pid, @RequestParam(name="pidField") String pidField, @RequestParam(name="tableName") String tbname, @RequestParam(name="text") String text, @@ -324,7 +315,6 @@ public class SysDictController { */ @ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 加载树形数据") @GetMapping("/queryAllTreeData") - @RequiresPermissions("dict:list") public Results> queryAllTreeData(@RequestParam(name="pidField") String pidField, @RequestParam(name="tableName") String tbname, @RequestParam(name="text") String text, @@ -433,7 +423,6 @@ public class SysDictController { * @return */ @RequestMapping(value = "/refleshCache") - @RequiresPermissions("dict:list") public Results refleshCache() { Results result = new Results<>(); sysDictService.refreshCache(); @@ -553,7 +542,6 @@ public class SysDictController { * @return */ @GetMapping(value = "/deleteList") - @RequiresPermissions("dict:list") public Results> deleteList() { List list = this.sysDictService.queryDeleteList(); return Results.OK(list); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index ef989996..d40fc637 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -51,7 +51,6 @@ public class SysDictItemController { * @param req * @return */ - @RequiresPermissions("sys:dict:list") @GetMapping("/page") public Results> queryPageList(SysDictItem sysDictItem, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java index cac7dd38..31a42a8c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java @@ -473,7 +473,7 @@ public class LoginServiceImpl implements ILoginService { String privateKeyBase64 = rsa.getPrivateKeyBase64(); String publicKeyBase64 = rsa.getPublicKeyBase64(); //存到redis key为公钥 value为私钥,3分钟 - redisUtil.set(publicKeyBase64, privateKeyBase64, 10L); + redisUtil.set(publicKeyBase64, privateKeyBase64, 180L); Results result = new Results<>(); result.setResult(publicKeyBase64); return result; diff --git a/jero-web/src/components/dict/JSearchSelectTag.vue b/jero-web/src/components/dict/JSearchSelectTag.vue index 51cd848d..3fdd1b59 100644 --- a/jero-web/src/components/dict/JSearchSelectTag.vue +++ b/jero-web/src/components/dict/JSearchSelectTag.vue @@ -184,16 +184,20 @@ export default { } } } else { - // 异步一开始也加载一点数据 - this.loading = true - getAction(`/sys/dict/loadDict/${this.dict}`, { pageSize: this.pageSize, keyword: '' }).then(res => { - this.loading = false - if (res.success) { - this.options = res.result - } else { - this.$message.warning(res.message) - } - }) + if (!this.dict) { + console.error('搜索组件未配置字典项') + } else { + // 异步一开始也加载一点数据 + this.loading = true + getAction(`/sys/dict/loadDict/${this.dict}`, { pageSize: this.pageSize, keyword: '' }).then(res => { + this.loading = false + if (res.success) { + this.options = res.result + } else { + this.$message.warning(res.message) + } + }) + } } }, filterOption (input, option) { diff --git a/jero-web/src/components/jero/JTreeSelect.vue b/jero-web/src/components/jero/JTreeSelect.vue index 72aa5305..9d2dbbb2 100644 --- a/jero-web/src/components/jero/JTreeSelect.vue +++ b/jero-web/src/components/jero/JTreeSelect.vue @@ -175,6 +175,7 @@ export default { }, // 异步加载树节点 asyncLoadTreeData (treeNode) { + debugger return new Promise((resolve) => { if (treeNode.$vnode.children) { resolve()