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

246 Commits

Author SHA1 Message Date
疯狂的狮子li eef65b449d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/README.md
	ruoyi/src/main/resources/application.yml
 2020-07-06 09:16:44 +08:00
RuoYi 31765f6392 Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue 2020-07-04 16:07:51 +08:00
RuoYi 1e2a2026c6 修改文件编码格式 2020-07-04 16:04:30 +08:00
RuoYi e56efebce5 调整文件编码 2020-07-04 15:56:56 +08:00
若依 fb53780d8a !32 令牌秘钥的“秘”写错了，看到顺手就提交了哈 
Merge pull request !32 from jack/N/A
 2020-07-02 21:01:23 +08:00
jack d9367425fa 令牌秘钥的“秘”写错了，看到顺手就提交了哈 2020-07-02 18:03:18 +08:00
疯狂的狮子li 942629722d 删除 测试数据 2020-07-02 10:58:13 +08:00
疯狂的狮子li f652a035b7 增加 数据库超时重连配置 2020-07-01 09:16:47 +08:00
疯狂的狮子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
 2020-07-01 09:16:25 +08:00
RuoYi 338f661d41 创建用户不允许选择系统管理员角色 2020-06-29 11:44:46 +08:00
疯狂的狮子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
 2020-06-29 09:08:18 +08:00
疯狂的狮子li 2e95557840 删除测试代码 2020-06-29 09:07:17 +08:00
RuoYi 794d6f17db 修复代码生成导入表结构出现异常页面不提醒问题 2020-06-24 17:55:36 +08:00
RuoYi 7a9564ced5 修复代码生成点击多次表修改数据不变化的问题 2020-06-24 17:17:22 +08:00
RuoYi 5d5f955a34 修复头像上传成功二次打开无法改变裁剪框大小和位置问题 2020-06-24 15:59:18 +08:00
RuoYi eac9403ea4 修复布局为small者mini用户表单显示错位问题 2020-06-24 15:21:39 +08:00
RuoYi f7f02e3a3f 修复热部署导致的强换异常问题 2020-06-24 14:26:21 +08:00
疯狂的狮子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