wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
845 Commits 2 Branches 0 Tags 6 MiB
Commit Graph

304 Commits

Author SHA1 Message Date
RuoYi 992a63482c 布局设置点击扩大范围 2020-04-01 11:35:58 +08:00
RuoYi 8132ae0913 代码生成列属性排序查询 2020-04-01 10:15:29 +08:00
RuoYi ed04c24eb3 代码生成列支持拖动排序 2020-04-01 09:52:49 +08:00
RuoYi f9799cd444 修复时间格式不支持ios问题 2020-03-31 16:40:26 +08:00
RuoYi 6b147281ad 表单构建添加父级class，防止冲突 2020-03-31 16:03:06 +08:00
疯狂的狮子li 39d8723159 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
 2020-03-24 15:29:45 +08:00
RuoYi e07d4c18ee 定时任务并发属性修正 2020-03-22 18:02:33 +08:00
疯狂的狮子li b1afb78ca2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/components/SvgIcon/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/tagsView.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi/pom.xml
	ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
	ruoyi/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi/src/main/java/com/ruoyi/framework/web/domain/Server.java
	ruoyi/src/main/java/com/ruoyi/project/common/CommonController.java
	ruoyi/src/main/resources/application.yml
 2020-03-19 09:10:03 +08:00
RuoYi 2cc14e5f56 若依 2.2 2020-03-18 09:43:17 +08:00
疯狂的狮子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
 2020-03-16 09:58:40 +08:00
RuoYi 4bbdc1e87b 修复TagsView组件中，鼠标滚轮按下的时候，可以关闭不可关闭的tag 2020-03-15 20:25:58 +08:00
RuoYi 3b87128461 修复点击退出登录有时会无效问题 2020-03-15 20:13:33 +08:00
RuoYi bc65e59fcb 修复charts切换侧边栏或者缩放窗口显示bug 2020-03-15 20:07:14 +08:00
RuoYi 56339214b6 升级element-ui版本到2.13.0 2020-03-15 20:00:01 +08:00
RuoYi 61142595c4 固定重定向路径表达式 2020-03-15 19:53:09 +08:00
RuoYi af7aa35884 路由地址添加必填限制 2020-03-14 10:58:51 +08:00
疯狂的狮子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
 2020-03-09 09:40:39 +08:00
RuoYi 103583a847 个人信息创建时间获取属性值 2020-03-08 21:16:16 +08:00
疯狂的狮子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
 2020-03-02 16:15:24 +08:00
RuoYi f18b3bc6be 代码生成字段描述可编辑 2020-02-28 20:29:19 +08:00
RuoYi 0c1a27769a 删除无用页面 2020-02-28 19:56:19 +08:00
疯狂的狮子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
 2020-02-28 17:34:44 +08:00
RuoYi bb1340ecc6 操作日志详细显示类型 2020-02-25 19:33:29 +08:00
RuoYi 759a0fcb32 导入表单击行数据时选中对应的复选框 2020-02-25 13:49:48 +08:00
疯狂的狮子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
 2020-02-24 09:56:22 +08:00
RuoYi cb0a4b78ee 若依 2.1 2020-02-24 09:28:16 +08:00
疯狂的狮子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
 2020-02-18 14:47:23 +08:00
RuoYi b7107a4dba 用户手机邮箱必填&密码参数修改 2020-02-18 11:15:08 +08:00
疯狂的狮子li 83c427c1bb 增加 代码生成与MybatisPlus测试案例 cstest 2020-02-14 13:36:52 +08:00
疯狂的狮子li 2841620be6 初始化项目 2020-02-13 10:48:51 +08:00
疯狂的狮子li abdb1048ed 删除文件 ruoyi-ui 2020-02-13 10:47:14 +08:00
RuoYi 554beaf6e7 修改在角色管理页修改菜单权限偶尔未选中问题 2020-02-08 18:30:09 +08:00
RuoYi a5c170fa2a 修改同一页面el-upload和Editor时不显示问题。 2020-02-08 17:05:46 +08:00
RuoYi d49ac2e0f8 成功登陆不恢复按钮，防止多次点击 2020-02-08 15:31:29 +08:00
RuoYi d677cd11d1 修改部门树默认值为[] 2019-12-31 18:03:01 +08:00
RuoYi 9067369ce0 防止时间为空出现的异常 2019-12-31 17:24:34 +08:00
RuoYi 3436f77c4a request.js缺少Message引用 2019-12-31 17:18:56 +08:00
RuoYi 61e48da354 规避上传头像控制台异常 2019-12-26 16:36:09 +08:00
RuoYi 3755597c76 添加一个默认空属性，用来判断节点显示 2019-12-26 15:59:03 +08:00
RuoYi 687e67dbea 修正关键词错误 2019-12-16 11:26:39 +08:00
RuoYi b508e6f202 新增用户导入 2019-12-11 18:12:00 +08:00
RuoYi 4e8b69c1d7 汉化错误页面 2019-12-03 19:18:22 +08:00
RuoYi 9f5ed82cdf 动态加载路由 页面刷新问题 2019-12-03 18:02:35 +08:00
RuoYi bc827ef377 无法匹配到的页面返回跳转至404页，防止整个页面显示空白 2019-12-02 16:03:18 +08:00
RuoYi fee8a5955b 若依 2.0 2019-12-02 09:28:11 +08:00
RuoYi 9f97fd0953 添加jsencrypt实现参数的前端加密 2019-11-20 11:53:04 +08:00
RuoYi 5d4b0e6b21 添加主目录添加/删除操作 2019-11-19 14:50:07 +08:00
RuoYi bcee37b84b 若依 1.1 2019-11-11 08:59:15 +08:00
RuoYi e235d5aa57 新增在线用户 2019-10-11 10:50:47 +08:00
RuoYi 319dfc2de3 修改函数命名防止冲突 2019-10-09 17:21:43 +08:00
RuoYi 3ba458b108 去除上级菜单校验，默认为顶级 2019-10-09 10:41:53 +08:00
RuoYi 7c908e9a56 用户密码无法修改问题 2019-10-09 10:21:06 +08:00
RuoYi fcacf93582 按钮类型显示权限标识 2019-10-09 10:20:21 +08:00
RuoYi 46444bd0fe RuoYi-Vue 1.0 2019-10-08 09:14:38 +08:00