748 Commits (9a3111487a68cf2975ea505a28299a8df940e374)

Author SHA1 Message Date
RuoYi 2cc14e5f56 若依 2.2 5 years ago
疯狂的狮子li 2e6bb454f4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/bin/package.bat
	ruoyi-ui/package.json
	ruoyi-ui/src/assets/styles/element-ui.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/components/icons/element-icons.js
	ruoyi-ui/src/views/dashboard/mixins/resize.js
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi/src/main/java/com/ruoyi/common/filter/XssFilter.java
	ruoyi/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi/src/main/java/com/ruoyi/common/utils/text/CharsetKit.java
	ruoyi/src/main/java/com/ruoyi/common/utils/text/Convert.java
	ruoyi/src/main/java/com/ruoyi/common/utils/text/StrFormatter.java
	ruoyi/src/main/java/com/ruoyi/framework/config/FilterConfig.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
	ruoyi/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
5 years ago
RuoYi 505ee1d63e 添加一个打包Web工程bat 5 years ago
RuoYi 4bbdc1e87b 修复TagsView组件中,鼠标滚轮按下的时候,可以关闭不可关闭的tag 5 years ago
RuoYi 3b87128461 修复点击退出登录有时会无效问题 5 years ago
RuoYi bc65e59fcb 修复charts切换侧边栏或者缩放窗口显示bug 5 years ago
RuoYi 56339214b6 升级element-ui版本到2.13.0 5 years ago
RuoYi 61142595c4 固定重定向路径表达式 5 years ago
RuoYi af7aa35884 路由地址添加必填限制 5 years ago
疯狂的狮子li 7507a3ed2a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/views/system/user/profile/index.vue
	ruoyi/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java
	ruoyi/src/main/java/com/ruoyi/framework/security/service/TokenService.java
	ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
5 years ago
RuoYi 103583a847 个人信息创建时间获取属性值 5 years ago
疯狂的狮子li bed1fd98ff Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/views/login/auth-redirect.vue
	ruoyi-ui/src/views/login/components/SocialSignin.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
5 years ago
RuoYi f18b3bc6be 代码生成字段描述可编辑 5 years ago
RuoYi 0c1a27769a 删除无用页面 5 years ago
疯狂的狮子li f9b9156c8a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/tool/gen/importTable.vue
	ruoyi/src/main/resources/vm/java/mapper.java.vm
	ruoyi/src/main/resources/vm/java/service.java.vm
5 years ago
RuoYi bb1340ecc6 操作日志详细显示类型 5 years ago
RuoYi 759a0fcb32 导入表单击行数据时选中对应的复选框 5 years ago
疯狂的狮子li 0ba48df61e 升级 v2.1 5 years ago
疯狂的狮子li 6687efd887 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/components/RuoYi/Git/index.vue
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/utils/index.js
	ruoyi-ui/src/utils/permission.js
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/tool/build/index.vue
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue
	ruoyi/pom.xml
	ruoyi/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
	ruoyi/src/main/resources/application.yml
	ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml
	ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
	ruoyi/src/main/resources/vm/java/controller.java.vm
	ruoyi/src/main/resources/vm/java/domain.java.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm
5 years ago
RuoYi cb0a4b78ee 若依 2.1 5 years ago
疯狂的狮子li a1cf719d26 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
5 years ago
RuoYi b7107a4dba 用户手机邮箱必填&密码参数修改 5 years ago
疯狂的狮子li 83c427c1bb 增加 代码生成与MybatisPlus测试案例 cstest 5 years ago
疯狂的狮子li 2841620be6 初始化项目 5 years ago
疯狂的狮子li abdb1048ed 删除文件 ruoyi-ui 5 years ago
RuoYi 554beaf6e7 修改在角色管理页修改菜单权限偶尔未选中问题 5 years ago
RuoYi a5c170fa2a 修改同一页面el-upload和Editor时不显示问题。 5 years ago
RuoYi d49ac2e0f8 成功登陆不恢复按钮,防止多次点击 5 years ago
RuoYi d677cd11d1 修改部门树默认值为[] 5 years ago
RuoYi 9067369ce0 防止时间为空出现的异常 5 years ago
RuoYi 3436f77c4a request.js缺少Message引用 5 years ago
RuoYi 61e48da354 规避上传头像控制台异常 5 years ago
RuoYi 3755597c76 添加一个默认空属性,用来判断节点显示 5 years ago
RuoYi 687e67dbea 修正关键词错误 5 years ago
RuoYi b508e6f202 新增用户导入 5 years ago
RuoYi 4e8b69c1d7 汉化错误页面 5 years ago
RuoYi 9f5ed82cdf 动态加载路由 页面刷新问题 5 years ago
RuoYi bc827ef377 无法匹配到的页面返回跳转至404页,防止整个页面显示空白 5 years ago
RuoYi fee8a5955b 若依 2.0 5 years ago
RuoYi 9f97fd0953 添加jsencrypt实现参数的前端加密 5 years ago
RuoYi 5d4b0e6b21 添加主目录添加/删除操作 5 years ago
RuoYi bcee37b84b 若依 1.1 5 years ago
RuoYi e235d5aa57 新增在线用户 5 years ago
RuoYi 319dfc2de3 修改函数命名防止冲突 5 years ago
RuoYi 3ba458b108 去除上级菜单校验,默认为顶级 5 years ago
RuoYi 7c908e9a56 用户密码无法修改问题 5 years ago
RuoYi fcacf93582 按钮类型显示权限标识 5 years ago
RuoYi 46444bd0fe RuoYi-Vue 1.0 5 years ago