opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 17:58:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

升级3.3.0版本

Browse Source
This commit is contained in:
Wenchao Gong 2021-10-31 14:52:47 +08:00
parent 9e701879a2
commit 1e1f03bbd9
17 changed files with 132 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pom.xml
View File

@ -91,12 +91,6 @@
</exclusions>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations.version}</version>
</dependency>
<!-- 指定 swagger-annotations 版本冲突-->
<dependency>
<groupId>io.swagger</groupId>
@ -200,6 +194,10 @@
<artifactId>feign-core</artifactId>
<groupId>io.github.openfeign</groupId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- @deprecated 由于使用人数较少 决定与 3.4.0 版本移除 -->
@ -207,12 +205,6 @@
<groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId>
<version>${feign-okhttp.version}</version>
<exclusions>
<exclusion>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
@ -278,6 +270,12 @@
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<version>${xxl-job.version}</version>
<exclusions>
<exclusion>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
View File

@ -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<List<TreeSelect>> treeselect(SysDept dept) {
public AjaxResult<List<Tree<Long>>> treeselect(SysDept dept) {
List<SysDept> depts = deptService.selectDeptList(dept);
return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
}

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
View File

@ -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<List<TreeSelect>> treeselect(SysMenu menu) {
public AjaxResult<List<Tree<Long>>> treeselect(SysMenu menu) {
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
}

56
ruoyi-admin/src/main/resources/application-local.yml
View File

@ -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

2
ruoyi-extend/ruoyi-isc-gateway/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.1.0</version>
<version>3.3.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

7
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml Normal file
View File

@ -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

7
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-local.yml Normal file
View File

@ -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

7
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml Normal file
View File

@ -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

10
ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
View File

@ -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@

4
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml
View File

@ -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

36
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-local.yml Normal file
View File

@ -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

4
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml
View File

@ -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

2
ruoyi-isc-parent/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-vue-plus</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.1.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-isc-parent/ruoyi-isc-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-isc-parent</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.1.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
ruoyi-isc-parent/ruoyi-isc/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi-isc-parent</artifactId>
<groupId>com.ruoyi</groupId>
<version>3.1.0</version>
<version>3.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6
ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceApplyBo.java
View File

@ -102,4 +102,10 @@ public class IscAppServiceApplyBo extends BaseEntity {
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
private String isAsc;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String remark;
}

5
ruoyi-isc-parent/ruoyi-isc/src/main/java/com/ruoyi/isc/domain/bo/IscAppServiceBo.java
View File

@ -124,4 +124,9 @@ public class IscAppServiceBo extends BaseEntity {
@ApiModelProperty(value = "排序的方向", example = "asc,desc")
private String isAsc;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String remark;
}