| ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ximon-admin/src/main/resources/application-dev.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ximon-admin/src/main/resources/application-local.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ximon-admin/src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MenuService.java
@@ -42,7 +42,8 @@ * è·åè§è²ä¸çèå */ public List<Menu> listByRoleIds(List<Long> roleIdList) { List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class).in(RoleMenuRelation::getRoleId, roleIdList).select(RoleMenuRelation::getMenuId)) List<Long> menuIdList = roleMenuRelationService.list(Wrappers.lambdaQuery(RoleMenuRelation.class) .in(RoleMenuRelation::getRoleId, roleIdList).select(RoleMenuRelation::getMenuId)) .stream().map(RoleMenuRelation::getMenuId).distinct().collect(Collectors.toList()); if (CollectionUtil.isEmpty(menuIdList)) { return null; ximon-admin/src/main/java/com/sandu/ximon/admin/service/RoleService.java
@@ -81,7 +81,8 @@ */ public List<Role> listByAdminId(Long adminId) { // è·å管çåçè§è²id List<AdminRoleRelation> list = adminRoleRelationService.list(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, adminId).select(AdminRoleRelation::getRoleId)); List<AdminRoleRelation> list = adminRoleRelationService.list(Wrappers.lambdaQuery(AdminRoleRelation.class) .eq(AdminRoleRelation::getAdminId, adminId).select(AdminRoleRelation::getRoleId)); List<Long> roleIdList = list.stream().map(AdminRoleRelation::getRoleId).collect(Collectors.toList()); if (CollectionUtil.isEmpty(roleIdList)) { return null; ximon-admin/src/main/resources/application-dev.yml
@@ -1,8 +1,10 @@ spring: datasource: username: sandu password: Sandu.520 url: jdbc:mysql://112.74.63.130:3306/ximon_light?useUnicode=true&autoReconnect=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai # æ°æ®åºç¨æ·å username: dev # æ°æ®åºå¯ç password: xv6d7qviZHQu+pB0 url: jdbc:mysql://localhost:3306/ximon_light?useUnicode=true&autoReconnect=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai type: com.alibaba.druid.pool.DruidDataSource druid: connection-init-sqls: set names utf8mb4 @@ -11,7 +13,7 @@ host: 112.74.63.130 # Redisæå¡å¨å°å database: 0 # Redisæ°æ®åºç´¢å¼ï¼é»è®¤ä¸º0ï¼ port: 6379 # Redisæå¡å¨è¿æ¥ç«¯å£ password: Sandu.520.ifzdm # Redisæå¡å¨è¿æ¥å¯ç ï¼é»è®¤ä¸ºç©ºï¼ password: uIEFHmj4bC0wJCyM # Redisæå¡å¨è¿æ¥å¯ç ï¼é»è®¤ä¸ºç©ºï¼ timeout: 300ms # è¿æ¥è¶ æ¶æ¶é´ï¼æ¯«ç§ï¼ server: port: 20017 ximon-admin/src/main/resources/application-local.yml
ÎļþÃû´Ó ximon-admin/src/main/resources/application-test.yml ÐÞ¸Ä @@ -1,7 +1,9 @@ spring: datasource: # æ°æ®åºç¨æ·å username: sandu password: Sandu.520 # æ°æ®åºå¯ç password: dygOHN4&mZC9X+99 url: jdbc:mysql://112.74.63.130:3306/ximon_light?useUnicode=true&autoReconnect=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai type: com.alibaba.druid.pool.DruidDataSource druid: @@ -11,10 +13,10 @@ host: 112.74.63.130 # Redisæå¡å¨å°å database: 0 # Redisæ°æ®åºç´¢å¼ï¼é»è®¤ä¸º0ï¼ port: 6379 # Redisæå¡å¨è¿æ¥ç«¯å£ password: Sandu.520.ifzdm # Redisæå¡å¨è¿æ¥å¯ç ï¼é»è®¤ä¸ºç©ºï¼ password: uIEFHmj4bC0wJCyM # Redisæå¡å¨è¿æ¥å¯ç ï¼é»è®¤ä¸ºç©ºï¼ timeout: 300ms # è¿æ¥è¶ æ¶æ¶é´ï¼æ¯«ç§ï¼ server: port: 8080 port: 20017 sandu: jwt: header: Authorization @@ -25,20 +27,19 @@ # 令çè¿ææ¶é´ æ¤å¤åä½/æ¯«ç§ ï¼å¯å¨æ¤ç½ç«çæ https://www.convertworld.com/zh-hans/time/milliseconds.html 1个æ token-validity-in-seconds: 2629800000 # å¨çº¿ç¨æ·key online-key: light-user online-key: online-token # æ¯å¦å¯å¨redisç¼åç¨æ·ä¿¡æ¯ cache-online: false upload: upload-root-path: /usr/local/project/ximon-light-20017/file/ storage: local common: urlPrefix: http://112.74.63.130:20017/file/ urlPrefix: http://112.74.63.130/file/ quartz: enable: true listenter: isOpen: false isOpen: true minio: endpoint: 47.106.172.9 ximon-admin/src/main/resources/application.yml
@@ -1,6 +1,6 @@ spring: profiles: active: dev active: test jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8