RuoYi
2020-06-01 5ce4291ef1e1436b8fcde190494e4eede52ca758
若依 2.3
已修改22个文件
89 ■■■■ 文件已修改
README.md 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/package.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/router/index.js 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/store/modules/permission.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/monitor/job/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/config/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/dept/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/dict/data.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/dict/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/menu/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/notice/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/post/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/role/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/profile/resetPwd.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/profile/userAvatar.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/system/user/profile/userInfo.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi/pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi/src/main/resources/vm/sql/sql.vm 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi/src/main/resources/vm/vue/index.vue.vm 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
README.md
@@ -5,6 +5,7 @@
* 权限认证使用Jwt,支持多终端认证系统。
* 支持加载动态权限菜单,多方式轻松权限控制。
* 高效率开发,使用代码生成器可以一键生成前后端代码。
* 提供了一个Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle),保持同步更新。
* 感谢[Vue-Element-Admin](https://github.com/PanJiaChen/vue-element-admin),[eladmin-web](https://gitee.com/elunez/eladmin-web?_from=gitee_search)。
* 不分离版本,请移步[RuoYi](https://gitee.com/y_project/RuoYi),微服务版本,请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
* 阿里云优惠券:[点我进入](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)  
ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
  "name": "ruoyi",
  "version": "2.2.0",
  "version": "2.3.0",
  "description": "若依管理系统",
  "author": "若依",
  "license": "MIT",
ruoyi-ui/src/router/index.js
@@ -33,23 +33,23 @@
    children: [
      {
        path: '/redirect/:path(.*)',
        component: (resolve) => require(['@/views/redirect'], resolve)
        component: () => import('@/views/redirect')
      }
    ]
  },
  {
    path: '/login',
    component: (resolve) => require(['@/views/login'], resolve),
    component: () => import('@/views/login'),
    hidden: true
  },
  {
    path: '/404',
    component: (resolve) => require(['@/views/error/404'], resolve),
    component: () => import('@/views/error/404'),
    hidden: true
  },
  {
    path: '/401',
    component: (resolve) => require(['@/views/error/401'], resolve),
    component: () => import('@/views/error/401'),
    hidden: true
  },
  {
@@ -59,7 +59,7 @@
    children: [
      {
        path: 'index',
        component: (resolve) => require(['@/views/index'], resolve),
        component: () => import('@/views/index'),
        name: '首页',
        meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
      }
@@ -73,7 +73,7 @@
    children: [
      {
        path: 'profile',
        component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
        component: () => import('@/views/system/user/profile/index'),
        name: 'Profile',
        meta: { title: '个人中心', icon: 'user' }
      }
@@ -86,7 +86,7 @@
    children: [
      {
        path: 'type/data/:dictId(\\d+)',
        component: (resolve) => require(['@/views/system/dict/data'], resolve),
        component: () => import('@/views/system/dict/data'),
        name: 'Data',
        meta: { title: '字典数据', icon: '' }
      }
@@ -99,7 +99,7 @@
    children: [
      {
        path: 'log',
        component: (resolve) => require(['@/views/monitor/job/log'], resolve),
        component: () => import('@/views/monitor/job/log'),
        name: 'JobLog',
        meta: { title: '调度日志' }
      }
@@ -112,7 +112,7 @@
    children: [
      {
        path: 'edit',
        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
        component: () => import('@/views/tool/gen/editTable'),
        name: 'GenEdit',
        meta: { title: '修改生成配置' }
      }
ruoyi-ui/src/store/modules/permission.js
@@ -48,7 +48,7 @@
}
export const loadView = (view) => { // 路由懒加载
  return (resolve) =>  require([`@/views/${view}`], resolve)
  return () => import(`@/views/${view}`)
}
export default permission
ruoyi-ui/src/views/monitor/job/index.vue
@@ -438,8 +438,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -448,8 +446,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }
ruoyi-ui/src/views/system/config/index.vue
@@ -305,8 +305,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -315,8 +313,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }
@@ -355,8 +351,6 @@
      clearCache().then(response => {
        if (response.code === 200) {
          this.msgSuccess("清理成功");
        } else {
          this.msgError(response.msg);
        }
      });
    }
ruoyi-ui/src/views/system/dept/index.vue
@@ -281,8 +281,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -291,8 +289,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }
ruoyi-ui/src/views/system/dict/data.vue
@@ -305,8 +305,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -315,8 +313,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }
ruoyi-ui/src/views/system/dict/index.vue
@@ -309,8 +309,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -319,8 +317,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }
@@ -359,8 +355,6 @@
      clearCache().then(response => {
        if (response.code === 200) {
          this.msgSuccess("清理成功");
        } else {
          this.msgError(response.msg);
        }
      });
    }
ruoyi-ui/src/views/system/menu/index.vue
@@ -340,8 +340,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -350,8 +348,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }
ruoyi-ui/src/views/system/notice/index.vue
@@ -308,8 +308,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -318,8 +316,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }
ruoyi-ui/src/views/system/post/index.vue
@@ -277,8 +277,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -287,8 +285,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }
ruoyi-ui/src/views/system/role/index.vue
@@ -482,8 +482,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -493,8 +491,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }
@@ -510,8 +506,6 @@
            this.msgSuccess("修改成功");
            this.openDataScope = false;
            this.getList();
          } else {
            this.msgError(response.msg);
          }
        });
      }
ruoyi-ui/src/views/system/user/index.vue
@@ -572,8 +572,6 @@
          resetUserPwd(row.userId, value).then(response => {
            if (response.code === 200) {
              this.msgSuccess("修改成功,新密码是:" + value);
            } else {
              this.msgError(response.msg);
            }
          });
        }).catch(() => {});
@@ -588,8 +586,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -598,8 +594,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
@@ -59,8 +59,6 @@
            response => {
              if (response.code === 200) {
                this.msgSuccess("修改成功");
              } else {
                this.msgError(response.msg);
              }
            }
          );
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
@@ -122,8 +122,6 @@
            this.open = false;
            this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
            this.msgSuccess("修改成功");
          } else {
            this.msgError(response.msg);
          }
          this.$refs.cropper.clearCrop();
        });
ruoyi-ui/src/views/system/user/profile/userInfo.vue
@@ -64,8 +64,6 @@
          updateUserProfile(this.user).then(response => {
            if (response.code === 200) {
              this.msgSuccess("修改成功");
            } else {
              this.msgError(response.msg);
            }
          });
        }
ruoyi/pom.xml
@@ -5,7 +5,7 @@
    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi</artifactId>
    <version>2.2.0</version>
    <version>2.3.0</version>
    <packaging>jar</packaging>
    <name>ruoyi</name>
ruoyi/src/main/resources/application.yml
@@ -3,7 +3,7 @@
  # 名称
  name: RuoYi
  # 版本
  version: 2.2.0
  version: 2.3.0
  # 版权年份
  copyrightYear: 2019
  # 实例演示开关
ruoyi/src/main/resources/vm/sql/sql.vm
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
@@ -375,8 +375,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -385,8 +383,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }
ruoyi/src/main/resources/vm/vue/index.vue.vm
@@ -392,8 +392,6 @@
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          } else {
@@ -402,8 +400,6 @@
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              } else {
                this.msgError(response.msg);
              }
            });
          }