240 Commits (942629722d994238065916eb01eeba630ebcd723)
 

Author SHA1 Message Date
疯狂的狮子li 942629722d 删除 测试数据 4 years ago
疯狂的狮子li f652a035b7 增加 数据库超时重连配置 4 years ago
疯狂的狮子li c70ec63952 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi/sql/ry_20200629.sql
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
4 years ago
RuoYi 338f661d41 创建用户不允许选择系统管理员角色 4 years ago
疯狂的狮子li f0bee6af63 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/RuoYiApplication.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java
4 years ago
疯狂的狮子li 2e95557840 删除测试代码 4 years ago
RuoYi 794d6f17db 修复代码生成导入表结构出现异常页面不提醒问题 4 years ago
RuoYi 7a9564ced5 修复代码生成点击多次表修改数据不变化的问题 4 years ago
RuoYi 5d5f955a34 修复头像上传成功二次打开无法改变裁剪框大小和位置问题 4 years ago
RuoYi eac9403ea4 修复布局为small者mini用户表单显示错位问题 4 years ago
RuoYi f7f02e3a3f 修复热部署导致的强换异常问题 4 years ago
疯狂的狮子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
4 years ago
若依 0dff669374 !28 update ruoyi-ui/src/views/monitor/job/log.vue.
Merge pull request !28 from abbfun/N/A
4 years ago
Sxile 5bd2838b2b 修复注释与参数名称不对应 4 years ago
Sxile f39be3ab9b 添加缺少的@ Override 4 years ago
Sxile f5badba2bb 添加{}使代码更容易理解 4 years ago
Sxile 9ea0041fab 常量接口修改为常量类 4 years ago
abbfun f6de03a009 update ruoyi-ui/src/views/monitor/job/log.vue.
data对象中属性【表单参数form】重复
4 years ago
疯狂的狮子li eb7c29c647 解决文件上传bug,因undertow与tomcat对文件写入的底层实现不同,无需创建新文件 4 years ago
疯狂的狮子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
4 years ago
RuoYi a195df175f 修正定时任务日志权限字符 4 years ago
疯狂的狮子li db380f9af1 还原 4 years ago
疯狂的狮子li 694fb19628 修复 上传文件重名问题 4 years ago
疯狂的狮子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
4 years ago
RuoYi 48ba7d5ed6 修改用户管理复选框宽度,防止部分浏览器出现省略号 4 years ago
RuoYi 03aef64693 缺少EscapeUtil包路径。 4 years ago
若依 c3b5cb20d8 !25 Live轻量级PR
Merge pull request !25 from Live/live
4 years ago
Live 2daf89e0c6 HttpUtils.sendPost()方法,参数无需拼接参数到url,否则会出现双份参数
请求url或form参数 会出现双份参数,并无法获取
{"token":["xxxxxxx","xxxxxxx"],"payType":["weixin","weixin"],"amount":["100","100"],"orderId":["123","123"]}
4 years ago
Live a2d1160205 add ruoyi-ui/public/robots.txt.
项目添加robots.txt 防止后台管理系统被搜索引擎收录
5 years ago
Live 0c069a57cc 项目添加robots.txt 防止后台管理系统被搜索引擎收录 5 years ago
Live 19b8688759 IpUtils工具,清除Xss特殊字符,防止Xff注入攻击 5 years ago
Live 33f09d7747 生成domain 如果是浮点型 统一用BigDecimal 5 years ago
疯狂的狮子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
5 years ago
RuoYi 7afc5acc6f 定时任务调整label-width,防止部署出现错位 5 years ago
RuoYi 8a7f33807b 调整表头固定列默认样式 5 years ago
RuoYi 945fb282dd 代码生成模板调整,字段为String并且必填则加空串条件 5 years ago
RuoYi 2fd3cbbd18 Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue 5 years ago
RuoYi 5680d91a87 代码生成字典Integer/Long使用parseInt 5 years ago
RuoYi 9d8da28f2e Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue 5 years ago
若依 40185f27e2 !23 修复退出登录重定向到登录页,登录后参数丢失 update ruoyi-ui/src/permission.js.
Merge pull request !23 from Elune/N/A
5 years ago
Elune ef5adf2e2a update ruoyi-ui/src/permission.js.
修复退出登录重定向到登录页,登录后参数丢失。/article?id=6

https://github.com/elunez/eladmin-web/pull/94
5 years ago
RuoYi ff695831dc 修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序 5 years ago
RuoYi ea9effaf32 修正岗位导出权限注解 5 years ago
RuoYi 4cb4de86db 修复首页搜索菜单外链无法点击跳转问题 5 years ago
RuoYi c861b78f80 修复菜单管理选择图标,backspace删除时不过滤数据 5 years ago
RuoYi 5123832cd7 用户管理部门分支节点不可检查&显示计数 5 years ago
RuoYi ec407bbe25 数据范围过滤属性调整 5 years ago
疯狂的狮子li 2e37fe9bc9 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 5 years ago
疯狂的狮子li 8a62368141 同步若依2.3版本 5 years ago
疯狂的狮子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
5 years ago