diff --git a/README.md b/README.md index 25412480..468d9286 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ * 采用前后端分离的模式，微服务版本前端(基于 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue))。 * 后端采用Spring Boot、Spring Cloud & Alibaba。 * 注册中心、配置中心选型Nacos，权限认证使用Redis。 -* 流量控制框架选型Sentinel。 +* 流量控制框架选型Sentinel，分布式事务选型Seata。 * 如需不分离应用，请移步 [RuoYi](https://gitee.com/y_project/RuoYi)，如需分离应用，请移步 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue) * 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)   * 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)   @@ -41,7 +41,7 @@ com.ruoyi ## 架构图 - + ## 内置功能 diff --git a/pom.xml b/pom.xml index eac204ec..292ae495 100644 --- a/pom.xml +++ b/pom.xml @@ -6,20 +6,20 @@ com.ruoyi ruoyi - 2.4.0 + 2.5.0 ruoyi http://www.ruoyi.vip 若依微服务系统 - 2.4.0 + 2.5.0 UTF-8 UTF-8 1.8 2.3.7.RELEASE Hoxton.SR9 - 2.2.3.RELEASE + 2.2.5.RELEASE 2.3.1 2.1.3 2.9.2 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index b8cce4fb..1c24fbc5 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index edeb4b40..5c8b3af0 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 9fef8436..12bf28cf 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java index 5f4ff0c7..b12fb314 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java @@ -17,16 +17,6 @@ public class LoginBody */ private String password; - /** - * 验证码 - */ - private String code; - - /** - * 唯一标识 - */ - private String uuid = ""; - public String getUsername() { return username; @@ -46,24 +36,4 @@ public class LoginBody { this.password = password; } - - public String getCode() - { - return code; - } - - public void setCode(String code) - { - this.code = code; - } - - public String getUuid() - { - return uuid; - } - - public void setUuid(String uuid) - { - this.uuid = uuid; - } } diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index f4b0059d..df16e1da 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 44654085..5c437f09 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index 2f323dfd..2fbc8f61 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 363a8ed0..ca063068 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 2bb72b7c..fe322d1c 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index 1aaaa3ed..e498f15b 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index b1f7319a..3ee61b18 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index 4d93b8e8..e58f4413 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 1c522469..03d98345 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 48a89055..0a4eb86d 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index a799a19b..3abc27dc 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index e1f5c744..ca5369bb 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index f3ea3da1..b9b57b43 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index c3f52d0e..6e672ef1 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 1ccb8d8e..ad60e4e7 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "2.4.0", + "version": "2.5.0", "description": "若依管理系统", "author": "若依", "license": "MIT", diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js index ab109fcc..61f681cd 100644 --- a/ruoyi-ui/src/store/modules/permission.js +++ b/ruoyi-ui/src/store/modules/permission.js @@ -27,7 +27,7 @@ const permission = { const sdata = JSON.parse(JSON.stringify(res.data)) const rdata = JSON.parse(JSON.stringify(res.data)) const sidebarRoutes = filterAsyncRouter(sdata) - const rewriteRoutes = filterAsyncRouter(rdata, true) + const rewriteRoutes = filterAsyncRouter(rdata, false, true) rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) commit('SET_ROUTES', rewriteRoutes) commit('SET_SIDEBAR_ROUTERS', sidebarRoutes) @@ -39,9 +39,9 @@ const permission = { } // 遍历后台传来的路由字符串，转换为组件对象 -function filterAsyncRouter(asyncRouterMap, isRewrite = false) { +function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { return asyncRouterMap.filter(route => { - if (isRewrite && route.children) { + if (type && route.children) { route.children = filterChildren(route.children) } if (route.component) { @@ -55,13 +55,16 @@ function filterAsyncRouter(asyncRouterMap, isRewrite = false) { } } if (route.children != null && route.children && route.children.length) { - route.children = filterAsyncRouter(route.children, route, isRewrite) + route.children = filterAsyncRouter(route.children, route, type) + } else { + delete route['children'] + delete route['redirect'] } return true }) } -function filterChildren(childrenMap) { +function filterChildren(childrenMap, lastRouter = false) { var children = [] childrenMap.forEach((el, index) => { if (el.children && el.children.length) { @@ -77,6 +80,9 @@ function filterChildren(childrenMap) { return } } + if (lastRouter) { + el.path = lastRouter.path + '/' + el.path + } children = children.concat(el) }) return children diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 1c1d6ca0..3a7ae543 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -82,8 +82,8 @@
  • SpringCloud
  • Nacos
  • Sentinel
    • +
  • Seata
  • Minio
    • -
  • FastDFS
  • ...
    • @@ -94,7 +94,7 @@
  • Vuex
  • Element-ui
  • Axios
    • -
  • Sass
    • +
  • Echarts
  • Quill
  • ...
    • @@ -149,6 +149,39 @@ 更新日志 + +
      +
    1. 增加分布式事务seata支持
      2. +
    2. 代码生成模板支持主子表
      3. +
    3. 表格右侧工具栏组件支持显隐列
      4. +
    4. 代码生成支持文件上传组件
      5. +
    5. 图片组件添加预览&移除功能
      6. +
    6. Excel注解支持Image图片导出
      7. +
    7. 操作按钮组调整为朴素按钮样式
      8. +
    8. 代码生成支持文件上传组件
      9. +
    9. 代码生成日期控件区分范围
      10. +
    10. 代码生成数据库文本类型生成表单文本域
      11. +
    11. 用户手机邮箱&菜单组件修改允许空字符串
      12. +
    12. 修复header获取username中文情况下乱码
      13. +
    13. 修复角色管理-编辑角色-功能权限显示异常
      14. +
    14. 修正操作日志删除接口路径
      15. +
    15. 修复IE11浏览器报错问题
      16. +
    16. 修复sentinel流量告警前端不响应
      17. +
    17. 修正侧边栏静态路由丢失问题
      18. +
    18. 修复导入数据为负浮点数时丢失精度问题
      19. +
    19. 修复Get请求参数特殊值无法正确的传参
      20. +
    20. 更换过期的共享配置属性
      21. +
    21. 添加启动执行脚本
      22. +
    22. 升级element-ui到最新版本2.15.0
      23. +
    23. 升级spring-boot到最新版本2.3.7
      24. +
    24. 升级spring-cloud到Hoxton.SR9
      25. +
    25. 升级spring-boot-alibaba到最新版2.2.5
      26. +
    26. 升级spring-boot-admin到最新版2.3.1
      27. +
    27. 升级druid到最新版本v1.2.4
      28. +
    28. 升级fastjson到最新版1.2.75
      29. +
    29. 其他细节优化
      30. +
    +
    1. 增加分布式文件Minio支持
      2. @@ -420,7 +453,7 @@ export default { data() { return { // 版本号 - version: "2.4.0", + version: "2.5.0", }; }, methods: { diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index ea44d574..3003fc4a 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -213,7 +213,7 @@ - + { roleMenu.then(res => { - this.$refs.menu.setCheckedKeys(res.checkedKeys); + let checkedKeys = res.checkedKeys + checkedKeys.forEach((v) => { + this.$nextTick(()=>{ + this.$refs.menu.setChecked(v, true ,false); + }) + }) }); }); this.title = "修改角色"; }); }, + /** 选择角色权限范围触发 */ + dataScopeSelectChange(value) { + if(value !== '2') { + this.$refs.dept.setCheckedKeys([]); + } + }, /** 分配数据权限操作 */ handleDataScope(row) { this.reset(); diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index ceea8694..53cf218f 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 2.4.0 + 2.5.0 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index a3631790..486e499d 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 2.4.0 + 2.5.0 4.0.0 diff --git a/sql/ry_20210108.sql b/sql/ry_20210210.sql similarity index 99% rename from sql/ry_20210108.sql rename to sql/ry_20210210.sql index b983cc53..b13fbaad 100644 --- a/sql/ry_20210108.sql +++ b/sql/ry_20210210.sql @@ -52,7 +52,7 @@ create table sys_user ( password varchar(100) default '' comment '密码', status char(1) default '0' comment '帐号状态（0正常 1停用）', del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - login_ip varchar(50) default '' comment '最后登录IP', + login_ip varchar(128) default '' comment '最后登录IP', login_date datetime comment '最后登录时间', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间', @@ -426,7 +426,7 @@ create table sys_oper_log ( oper_name varchar(50) default '' comment '操作人员', dept_name varchar(50) default '' comment '部门名称', oper_url varchar(255) default '' comment '请求URL', - oper_ip varchar(50) default '' comment '主机地址', + oper_ip varchar(128) default '' comment '主机地址', oper_location varchar(255) default '' comment '操作地点', oper_param varchar(2000) default '' comment '请求参数', json_result varchar(2000) default '' comment '返回参数', @@ -557,7 +557,7 @@ drop table if exists sys_logininfor; create table sys_logininfor ( info_id bigint(20) not null auto_increment comment '访问ID', user_name varchar(50) default '' comment '用户账号', - ipaddr varchar(50) default '' comment '登录IP地址', + ipaddr varchar(128) default '' comment '登录IP地址', status char(1) default '0' comment '登录状态（0成功 1失败）', msg varchar(255) default '' comment '提示信息', access_time datetime comment '访问时间',