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

1224 Commits

Author SHA1 Message Date
RuoYi 5d20be2976 升级fastjson到最新版1.2.68 修复安全加固 2020-04-13 11:58:03 +08:00
疯狂的狮子li 29b131b107 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi/src/main/resources/vm/vue/index.vue.vm
 2020-04-10 13:43:18 +08:00
RuoYi 5ded2569d0 修复代码生成如果选择字典类型缺失逗号问题 2020-04-10 11:49:08 +08:00
RuoYi 48509d6488 添加新群号 2020-04-08 14:22:48 +08:00
疯狂的狮子li 31a2713012 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/utils/ruoyi.js
	ruoyi-ui/src/views/tool/build/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
	ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
	ruoyi/src/main/resources/mybatis/tool/GenTableMapper.xml
 2020-04-03 10:16:28 +08:00
RuoYi ec65b1f7ec 登录请求params更换为data，防止暴露url 2020-04-01 14:01:31 +08:00
RuoYi 8a394f0363 日志返回时间格式处理 2020-04-01 13:09:27 +08:00
RuoYi 441da7ecd7 添加handle控制允许拖动的元素 2020-04-01 12:21:48 +08:00
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
RuoYi 9b0828be8e 角色禁用&菜单隐藏不查询权限 2020-03-22 16:41:30 +08:00
疯狂的狮子li 67657e9f02 升级 v2.2 2020-03-19 09:32:15 +08:00
疯狂的狮子li 2a922caf89 升级 v2.2 2020-03-19 09:22:46 +08:00
疯狂的狮子li bd7371fb8b 升级 v2.2 2020-03-19 09:21:17 +08:00
疯狂的狮子li 51ae2d1a87 升级 v2.2 2020-03-19 09:13:07 +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 505ee1d63e 添加一个打包Web工程bat 2020-03-15 21:00:53 +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
RuoYi 109c64e7c2 批量替换表前缀调整 2020-03-13 22:14:58 +08:00
RuoYi c0cd030d0f 批量替换表前缀修改 2020-03-13 21:41:57 +08:00
RuoYi 7604d59e49 修复通知公告批量删除异常问题 2020-03-13 21:24:26 +08:00
RuoYi 02062f31e9 通用http工具类 2020-03-13 21:18:41 +08:00
RuoYi ab992f4848 修复防重复提交注解无效问题 2020-03-13 21:15:50 +08:00
RuoYi baea48be68 调整包路径 2020-03-13 18:10:32 +08:00
RuoYi 1590e1068c 删除多余包 2020-03-13 18:07:02 +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
RuoYi 166d5ec55f 修改个人信息，密码后redis中登录信息不会过期问题 2020-03-07 10:19:04 +08:00
RuoYi 09a3a971ff 操作日志排序调整 2020-03-07 10:11:22 +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 87c0074fab Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
 2020-02-25 10:48:50 +08:00
RuoYi 9d45070429 设置mybatis全局的配置文件 2020-02-24 14:32:21 +08:00
疯狂的狮子li 0ba48df61e 升级 v2.1 2020-02-24 10:19:17 +08:00