Merge remote-tracking branch 'origin/master'

liuhaonan

2022-06-23 073a8ef8b3372141a8a77d8f0220fb0dec5352ea

Merge remote-tracking branch 'origin/master'

 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