疯狂的狮子li
|
25afde4796
|
同步升级3.1
|
2020-08-13 11:28:11 +08:00 |
|
疯狂的狮子li
|
088bc98a43
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
|
2020-08-13 11:24:04 +08:00 |
RuoYi
|
8f9f0c04cc
|
若依 3.1
|
2020-08-13 10:27:56 +08:00 |
|
RuoYi
|
1bad003fe3
|
修改公私钥
|
2020-08-12 11:55:26 +08:00 |
|
疯狂的狮子li
|
3aaff7b776
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/main.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/operlog/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/tool/gen/index.vue
|
2020-08-12 10:16:29 +08:00 |
|
RuoYi
|
ad4df6245d
|
优化防重复提交拦截器，请求没有消息头则使用地址
|
2020-08-11 11:24:55 +08:00 |
gst
|
0070297fe1
|
根节点为子部门时，树状结构显示问题
|
2020-08-11 10:59:02 +08:00 |
|
RuoYi
|
71ec44a545
|
修正在线用户日志记录类型
|
2020-08-10 17:26:11 +08:00 |
|
RuoYi
|
1efae4a588
|
优化防重复提交拦截器，接口请求非json数据不获取Body消息体
|
2020-08-10 17:10:34 +08:00 |
liguonan
|
650359c357
|
修改sass为node-sass，避免el-icon图标乱码
|
2020-08-10 16:28:50 +08:00 |
|
RuoYi
|
a78211ca00
|
优化上级菜单不能选择自己
|
2020-08-10 12:20:52 +08:00 |
|
RuoYi
|
74f52677be
|
表格右侧工具栏组件
|
2020-08-10 10:12:39 +08:00 |
|
若依
|
60d5c03e65
|
!63 重写表格工具栏右侧添加刷新&显隐查询栏
Merge pull request !63 from 平凡/重写表格工具栏右侧添加刷新&显隐查询栏
|
2020-08-10 09:53:27 +08:00 |
|
疯狂的狮子li
|
4044ed23ea
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-ui/src/components/Editor/index.vue
|
2020-08-10 09:38:28 +08:00 |
平凡
|
5b04f388e9
|
重写表格工具栏右侧添加刷新&显隐查询栏
|
2020-08-09 11:07:10 +08:00 |
|
RuoYi
|
a7eb07c7a0
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-08-07 16:07:02 +08:00 |
|
RuoYi
|
d0b315f4a5
|
删除重复的placeholder
|
2020-08-07 16:03:45 +08:00 |
|
若依
|
a6051d4638
|
!60 代码注释错误
Merge pull request !60 from waylon/master
|
2020-08-07 15:56:44 +08:00 |
wanglei
|
c4ee9ea7c8
|
修复注释错误
|
2020-08-07 14:26:30 +08:00 |
|
RuoYi
|
7c39f92538
|
修复富文本空格和缩进保存后不生效问题
|
2020-08-07 12:26:15 +08:00 |
|
疯狂的狮子li
|
a9f4a4e111
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
.gitignore
ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/utils/ruoyi.js
|
2020-08-07 09:22:36 +08:00 |
|
RuoYi
|
51fa66f61a
|
唯一限制条件只返回单条数据
|
2020-08-05 14:28:45 +08:00 |
|
RuoYi
|
3b61ed56b0
|
添加获取当前的环境配置方法
|
2020-08-05 12:56:32 +08:00 |
|
若依
|
db904f679e
|
!57 若干 ruoyi-ui 前端公共工具函数优化
Merge pull request !57 from FungLeo/master
|
2020-08-05 11:39:56 +08:00 |
|
若依
|
98982515f7
|
!55 修复在线用户判断逻辑
Merge pull request !55 from 心悦李国楠/dev-心悦
|
2020-08-05 11:39:09 +08:00 |
|
若依
|
1a7baa0639
|
!58 cell的cellType由Numeric修正为String
Merge pull request !58 from 4ook/master
|
2020-08-05 11:38:44 +08:00 |
mazh
|
a9695d1756
|
修复BUG: 导出Excel功能, 当attr的cellType为String时, cell的cellType由Numeric修正为String。
|
2020-08-05 11:28:57 +08:00 |
fungleo
|
d78f642201
|
Merge remote-tracking branch 'upstream/master'
|
2020-08-05 10:26:05 +08:00 |
|
fungleo
|
26dfee2ce8
|
彻底重写回显数据字典方法
|
2020-08-05 10:24:54 +08:00 |
|
RuoYi
|
b56898858d
|
超时登录后页面跳转到首页
|
2020-08-05 10:04:43 +08:00 |
|
疯狂的狮子li
|
c7785d1dbc
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-ui/src/utils/request.js
|
2020-08-05 09:42:03 +08:00 |
|
疯狂的狮子li
|
5b1ed429ae
|
文件路径,使用jvm系统变量,兼容windows和linux;
|
2020-08-05 09:35:41 +08:00 |
|
疯狂的狮子li
|
c8613ac9a7
|
错误修正
|
2020-08-04 14:34:05 +08:00 |
|
fungleo
|
503dd64e3f
|
优化 addDateRange js 函数
|
2020-08-04 14:32:29 +08:00 |
|
疯狂的狮子li
|
d9aa681a0d
|
错误修正
|
2020-08-04 14:31:51 +08:00 |
|
fungleo
|
876ecf21c7
|
优化构建树形数据JS方法
|
2020-08-04 14:11:02 +08:00 |
|
fungleo
|
107672419e
|
Merge remote-tracking branch 'upstream/master'
|
2020-08-04 11:59:42 +08:00 |
|
RuoYi
|
21d07c1d71
|
修复角色的权限分配后，未实时生效问题
|
2020-08-04 11:51:25 +08:00 |
|
fungleo
|
d8d636fdbd
|
优化 回显数据字典（字符串数组）JS 函数
|
2020-08-04 11:39:43 +08:00 |
|
RuoYi
|
743fce7829
|
优化防重提交唯一标识
|
2020-08-04 11:07:37 +08:00 |
|
liguonan
|
de2ac66f0b
|
修复在线用户判断逻辑
|
2020-08-03 17:57:33 +08:00 |
|
RuoYi
|
8b5d254242
|
全局异常状态汉化拦截处理
|
2020-08-03 09:11:49 +08:00 |
|
RuoYi
|
a7eb0f98ac
|
README
|
2020-08-03 09:02:28 +08:00 |
|
疯狂的狮子li
|
c966d9bada
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/babel.config.js
ruoyi-ui/package.json
ruoyi-ui/src/api/tool/gen.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/operlog/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/tool/gen/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/vue.config.js
sql/ry_20200724.sql
|
2020-08-02 18:31:47 +08:00 |
|
疯狂的狮子li
|
a95abff0d3
|
删除文件 ruoyi-common/src/main/resources
|
2020-08-02 18:18:35 +08:00 |
|
RuoYi
|
4dcf737db0
|
表格工具栏右侧添加刷新&显隐查询栏
|
2020-08-01 15:45:38 +08:00 |
|
RuoYi
|
b32d0724b7
|
升级vue-cli版本到4.4.4
|
2020-07-31 22:35:30 +08:00 |
|
若依
|
8deacb702e
|
!54 update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml.
Merge pull request !54 from yongdaidai/N/A
|
2020-07-31 16:50:28 +08:00 |
|
若依
|
5be8d46d05
|
!51 优化生成vue文件的vm模板文件
Merge pull request !51 from FungLeo/master
|
2020-07-31 16:49:51 +08:00 |
yongdaidai
|
fb19dd3e4e
|
update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml.
解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题.
|
2020-07-31 14:59:23 +08:00 |