diff --git a/pom.xml b/pom.xml index f554d6526..06c1a61d0 100644 --- a/pom.xml +++ b/pom.xml @@ -91,12 +91,6 @@ - - io.swagger - swagger-annotations - ${swagger-annotations.version} - - io.swagger @@ -200,6 +194,10 @@ feign-core io.github.openfeign + + org.bouncycastle + bcprov-jdk15on + @@ -207,12 +205,6 @@ io.github.openfeign feign-okhttp ${feign-okhttp.version} - - - io.github.openfeign - feign-core - - com.squareup.okio @@ -278,6 +270,12 @@ com.xuxueli xxl-job-core ${xxl-job.version} + + + org.javassist + javassist + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 98f5838fc..8a467060d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -1,11 +1,11 @@ package com.ruoyi.web.controller.system; +import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ArrayUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; @@ -76,7 +76,7 @@ public class SysDeptController extends BaseController { */ @ApiOperation("获取部门下拉树列表") @GetMapping("/treeselect") - public AjaxResult> treeselect(SysDept dept) { + public AjaxResult>> treeselect(SysDept dept) { List depts = deptService.selectDeptList(dept); return AjaxResult.success(deptService.buildDeptTreeSelect(depts)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index 1fd181637..11371f843 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -1,10 +1,10 @@ package com.ruoyi.web.controller.system; +import cn.hutool.core.lang.tree.Tree; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.TreeSelect; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; @@ -61,7 +61,7 @@ public class SysMenuController extends BaseController { */ @ApiOperation("获取菜单下拉树列表") @GetMapping("/treeselect") - public AjaxResult> treeselect(SysMenu menu) { + public AjaxResult>> treeselect(SysMenu menu) { List menus = menuService.selectMenuList(menu, getUserId()); return AjaxResult.success(menuService.buildMenuTreeSelect(menus)); } diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml index 64181ee2d..123b1c508 100644 --- a/ruoyi-admin/src/main/resources/application-local.yml +++ b/ruoyi-admin/src/main/resources/application-local.yml @@ -1,3 +1,42 @@ +--- # 监控配置 +spring: + boot: + admin: + # Spring Boot Admin Client 客户端的相关配置 + client: + # 增加客户端开关 + enabled: true + # 设置 Spring Boot Admin Server 地址 + url: http://localhost:9090/admin + instance: + prefer-ip: true # 注册实例时，优先使用 IP + username: admin + password: admin123 + +--- # xxl-job 配置 +xxl: + job: + # 执行器开关 + enabled: true + # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。 + admin-addresses: http://localhost:9100/xxl-job-admin + # 执行器通讯TOKEN：非空时启用 + access-token: xxl-job + # 执行器配置 + executor: + # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册 + appname: xxl-job-executor + # 执行器端口号 执行器从9101开始往后写 + port: 9101 + # 执行器注册：默认IP:PORT + address: + # 执行器IP：默认自动获取IP + ip: + # 执行器运行日志文件存储磁盘路径 + logpath: ./logs/xxl-job + # 执行器日志文件保存天数：大于3生效 + logretentiondays: 30 + # 数据源配置 spring: datasource: @@ -38,7 +77,7 @@ spring: # 配置一个连接在池中最大生存的时间，单位是毫秒 maxEvictableIdleTimeMillis: 900000 # 配置检测连接是否有效 - validationQuery: SELECT 1 + validationQuery: SELECT 1 FROM DUAL testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -117,18 +156,3 @@ redisson: subscriptionsPerConnection: 5 # DNS监测时间间隔，单位：毫秒 dnsMonitoringInterval: 5000 - ---- # 监控配置 -spring: - boot: - admin: - # Spring Boot Admin Client 客户端的相关配置 - client: - # 增加客户端开关 - enabled: true - # 设置 Spring Boot Admin Server 地址 - url: http://localhost:9090/admin - instance: - prefer-ip: true # 注册实例时，优先使用 IP - username: admin - password: admin123 diff --git a/ruoyi-extend/ruoyi-isc-gateway/pom.xml b/ruoyi-extend/ruoyi-isc-gateway/pom.xml index 851b4665d..ec6d5d414 100644 --- a/ruoyi-extend/ruoyi-isc-gateway/pom.xml +++ b/ruoyi-extend/ruoyi-isc-gateway/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.1.0 + 3.3.0 ../../pom.xml 4.0.0 diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml new file mode 100644 index 000000000..89832e3ff --- /dev/null +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml @@ -0,0 +1,7 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + type: com.alibaba.druid.pool.DruidDataSource + url: jdbc:mysql://192.168.64.128:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + username: root + password: root \ No newline at end of file diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-local.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-local.yml new file mode 100644 index 000000000..0a9ae9bf1 --- /dev/null +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-local.yml @@ -0,0 +1,7 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + type: com.alibaba.druid.pool.DruidDataSource + url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + username: root + password: root \ No newline at end of file diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml new file mode 100644 index 000000000..68fb54360 --- /dev/null +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml @@ -0,0 +1,7 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + type: com.alibaba.druid.pool.DruidDataSource + url: jdbc:mysql://172.17.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&autoReconnect=true + username: root + password: root \ No newline at end of file diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml index fced7df80..012bdab41 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml @@ -1,14 +1,8 @@ server: port: 9090 - spring: boot: admin: context-path: /admin - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - type: com.alibaba.druid.pool.DruidDataSource - url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true - username: root - password: root - + profiles: + active: @profiles.active@ \ No newline at end of file diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml index 065b34262..0aa77cb64 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml +++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml @@ -3,12 +3,12 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.64.128:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true username: root password: root hikari: auto-commit: true - connection-test-query: SELECT 1 + connection-test-query: SELECT 1 FROM DUAL connection-timeout: 10000 idle-timeout: 30000 max-lifetime: 900000 diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-local.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-local.yml new file mode 100644 index 000000000..192d9226a --- /dev/null +++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-local.yml @@ -0,0 +1,36 @@ +--- # 数据库配置 +spring: + datasource: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true + username: root + password: root + hikari: + auto-commit: true + connection-test-query: SELECT 1 FROM DUAL + connection-timeout: 10000 + idle-timeout: 30000 + max-lifetime: 900000 + maximum-pool-size: 30 + minimum-idle: 10 + pool-name: HikariCP + validation-timeout: 1000 + +--- # 邮件配置 +spring: + mail: + from: xxx@qq.com + host: smtp.qq.com + username: xxx@qq.com + password: xxx + port: 25 + properties: + mail: + smtp: + auth: true + socketFactory: + class: javax.net.ssl.SSLSocketFactory + starttls: + enable: true + required: true diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml index 774d7f81c..2c221267f 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml +++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml @@ -3,12 +3,12 @@ spring: datasource: type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://172.30.0.92:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://172.17.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&autoReconnect=true username: root password: root hikari: auto-commit: true - connection-test-query: SELECT 1 + connection-test-query: SELECT 1 FROM DUAL connection-timeout: 10000 idle-timeout: 30000 max-lifetime: 900000 diff --git a/ruoyi-isc-parent/pom.xml b/ruoyi-isc-parent/pom.xml index d633933a2..1b0fcf665 100644 --- a/ruoyi-isc-parent/pom.xml +++ b/ruoyi-isc-parent/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 3.1.0 + 3.3.0 4.0.0 diff --git a/ruoyi-isc-parent/ruoyi-isc-common/pom.xml b/ruoyi-isc-parent/ruoyi-isc-common/pom.xml index 4bc845234..6e911eae8 100644 --- a/ruoyi-isc-parent/ruoyi-isc-common/pom.xml +++ b/ruoyi-isc-parent/ruoyi-isc-common/pom.xml @@ -5,7 +5,7 @@ ruoyi-isc-parent com.ruoyi - 3.1.0 + 3.3.0 4.0.0 diff --git a/ruoyi-isc-parent/ruoyi-isc/pom.xml b/ruoyi-isc-parent/ruoyi-isc/pom.xml index 80d4fd477..25ee9f7be 100644 --- a/ruoyi-isc-parent/ruoyi-isc/pom.xml +++ b/ruoyi-isc-parent/ruoyi-isc/pom.xml @@ -5,7 +5,7 @@ ruoyi-isc-parent com.ruoyi - 3.1.0 + 3.3.0 4.0.0 diff --git a/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java index 0b79e1ec4..f324bdfc2 100644 --- a/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java +++ b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java @@ -102,4 +102,10 @@ public class IscAppServiceApplyBo extends BaseEntity { @ApiModelProperty(value = "排序的方向", example = "asc,desc") private String isAsc; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + } diff --git a/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java index e40d7512c..1442d6709 100644 --- a/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java +++ b/ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java @@ -124,4 +124,9 @@ public class IscAppServiceBo extends BaseEntity { @ApiModelProperty(value = "排序的方向", example = "asc,desc") private String isAsc; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; }