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

729 Commits

Author SHA1 Message Date
疯狂的狮子li 827bbc2b17 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi/src/main/java/com/ruoyi/common/constant/HttpStatus.java
	ruoyi/src/main/java/com/ruoyi/common/core/lang/UUID.java
	ruoyi/src/main/java/com/ruoyi/common/utils/VerifyCodeUtils.java
	ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
	ruoyi/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java
	ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysRole.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java
 2020-06-21 10:06:26 +08:00
若依 0dff669374 !28 update ruoyi-ui/src/views/monitor/job/log.vue. 
Merge pull request !28 from abbfun/N/A
 2020-06-19 22:17:49 +08:00
Sxile 5bd2838b2b 修复注释与参数名称不对应 2020-06-19 18:22:47 +08:00
Sxile f39be3ab9b 添加缺少的@ Override 2020-06-19 18:17:57 +08:00
Sxile f5badba2bb 添加{}使代码更容易理解 2020-06-19 18:13:54 +08:00
Sxile 9ea0041fab 常量接口修改为常量类 2020-06-19 16:01:48 +08:00
abbfun f6de03a009 update ruoyi-ui/src/views/monitor/job/log.vue. 
data对象中属性【表单参数form】重复
 2020-06-19 10:00:41 +08:00
疯狂的狮子li eb7c29c647 解决文件上传bug,因undertow与tomcat对文件写入的底层实现不同,无需创建新文件 2020-06-18 15:33:36 +08:00
疯狂的狮子li 8d318c222e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
 2020-06-18 15:13:40 +08:00
RuoYi a195df175f 修正定时任务日志权限字符 2020-06-18 15:07:56 +08:00
疯狂的狮子li db380f9af1 还原 2020-06-15 14:06:12 +08:00
疯狂的狮子li 694fb19628 修复 上传文件重名问题 2020-06-15 13:07:14 +08:00
疯狂的狮子li c53d5fd1f6 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/monitor/online/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/vue.config.js
	ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java
 2020-06-12 15:14:19 +08:00
RuoYi 48ba7d5ed6 修改用户管理复选框宽度，防止部分浏览器出现省略号 2020-06-12 13:45:27 +08:00
RuoYi 03aef64693 缺少EscapeUtil包路径。 2020-06-10 22:09:35 +08:00
若依 c3b5cb20d8 !25 Live轻量级PR 
Merge pull request !25 from Live/live
 2020-06-10 22:04:51 +08:00
Live 2daf89e0c6 HttpUtils.sendPost()方法，参数无需拼接参数到url,否则会出现双份参数 
请求url或form参数 会出现双份参数,并无法获取
{"token":["xxxxxxx","xxxxxxx"],"payType":["weixin","weixin"],"amount":["100","100"],"orderId":["123","123"]}
 2020-06-10 18:30:17 +08:00
Live a2d1160205 add ruoyi-ui/public/robots.txt. 
项目添加robots.txt 防止后台管理系统被搜索引擎收录
 2020-06-09 11:38:16 +08:00
Live 0c069a57cc 项目添加robots.txt 防止后台管理系统被搜索引擎收录 2020-06-09 11:37:39 +08:00
Live 19b8688759 IpUtils工具，清除Xss特殊字符，防止Xff注入攻击 2020-06-09 11:36:10 +08:00
Live 33f09d7747 生成domain 如果是浮点型 统一用BigDecimal 2020-06-09 11:33:09 +08:00
疯狂的狮子li 6bb7db31aa Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/components/IconSelect/index.vue
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
	ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
	ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
	ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
	ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
	ruoyi/src/main/resources/vm/vue/index.vue.vm
	ruoyi/src/main/resources/vm/xml/mapper.xml.vm
 2020-06-08 12:01:19 +08:00
RuoYi 7afc5acc6f 定时任务调整label-width，防止部署出现错位 2020-06-07 17:52:14 +08:00
RuoYi 8a7f33807b 调整表头固定列默认样式 2020-06-07 17:20:35 +08:00
RuoYi 945fb282dd 代码生成模板调整，字段为String并且必填则加空串条件 2020-06-07 16:11:36 +08:00
RuoYi 2fd3cbbd18 Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue 2020-06-07 16:05:48 +08:00
RuoYi 5680d91a87 代码生成字典Integer/Long使用parseInt 2020-06-07 16:04:07 +08:00
RuoYi 9d8da28f2e Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue 2020-06-04 16:00:06 +08:00
若依 40185f27e2 !23 修复退出登录重定向到登录页，登录后参数丢失 update ruoyi-ui/src/permission.js. 
Merge pull request !23 from Elune/N/A
 2020-06-04 14:57:05 +08:00
Elune ef5adf2e2a update ruoyi-ui/src/permission.js. 
修复退出登录重定向到登录页，登录后参数丢失。/article?id=6

https://github.com/elunez/eladmin-web/pull/94
 2020-06-04 14:53:24 +08:00
RuoYi ff695831dc 修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序 2020-06-04 14:34:57 +08:00
RuoYi ea9effaf32 修正岗位导出权限注解 2020-06-04 13:57:25 +08:00
RuoYi 4cb4de86db 修复首页搜索菜单外链无法点击跳转问题 2020-06-04 09:48:05 +08:00
RuoYi c861b78f80 修复菜单管理选择图标，backspace删除时不过滤数据 2020-06-03 17:59:32 +08:00
RuoYi 5123832cd7 用户管理部门分支节点不可检查&显示计数 2020-06-03 16:53:17 +08:00
RuoYi ec407bbe25 数据范围过滤属性调整 2020-06-03 13:00:30 +08:00
疯狂的狮子li 2e37fe9bc9 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2020-06-01 13:40:15 +08:00
疯狂的狮子li 8a62368141 同步若依2.3版本 2020-06-01 13:40:01 +08:00
疯狂的狮子li 5f866906d1 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/api/system/config.js
	ruoyi-ui/src/api/system/dict/data.js
	ruoyi-ui/src/api/system/dict/type.js
	ruoyi-ui/src/assets/styles/element-variables.scss
	ruoyi-ui/src/components/SvgIcon/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Link.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/notice/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/vue.config.js
	ruoyi/pom.xml
	ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
	ruoyi/src/main/resources/application.yml
	ruoyi/src/main/resources/vm/sql/sql.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm
 2020-06-01 13:34:08 +08:00
RuoYi b4b3ff8813 若依 2.3 2020-06-01 10:49:36 +08:00
RuoYi 4cf3786f48 升级fastjson到最新版1.2.70 修复高危安全漏洞 2020-06-01 10:46:30 +08:00
RuoYi 0d7f5e037e 若依 2.3 2020-06-01 10:36:19 +08:00
RuoYi 31b63bf14d 升级fastjson到最新版1.2.70 修复高危安全漏洞 2020-06-01 10:09:39 +08:00
RuoYi 5ce4291ef1 若依 2.3 2020-06-01 09:18:18 +08:00
RuoYi d48475c585 dev启动默认打开浏览器 2020-05-31 09:56:11 +08:00
RuoYi f26f90fa23 使用vue-cli默认source-map 2020-05-30 15:08:36 +08:00
RuoYi 8a61b9fe99 slidebar eslint报错优化 2020-05-30 15:04:11 +08:00
RuoYi bb5520a7d1 当tags-view滚动关闭右键菜单 2020-05-30 14:54:58 +08:00
RuoYi 1e2058bdfb 字典管理添加缓存读取 2020-05-30 14:29:19 +08:00
RuoYi 0d546e4ba4 参数管理支持缓存操作 2020-05-30 13:46:31 +08:00