疯狂的狮子li
|
42008124b6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ruoyi-ui/src/assets/styles/ruoyi.scss
# ruoyi-ui/src/views/tool/gen/index.vue
|
6 years ago |
|
疯狂的狮子li
|
1dae7c9bc9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
ruoyi/src/main/resources/vm/java/domain.java.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
6 years ago |
RuoYi
|
aa23ef1e99
|
添加新群号：104180207
|
6 years ago |
|
疯狂的狮子li
|
1062da678f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
ruoyi/src/main/resources/vm/java/domain.java.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
6 years ago |
|
RuoYi
|
e7ac78535d
|
表格树模板去掉多余的)
|
6 years ago |
|
RuoYi
|
526c3867b4
|
代码生成Date字段添加默认格式
|
6 years ago |
|
RuoYi
|
d452ddf5f0
|
用户管理角色选择权限控制
|
6 years ago |
|
疯狂的狮子li
|
405ad4280c
|
Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
|
6 years ago |
|
疯狂的狮子li
|
44e2618ee2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/monitor/job/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/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/tool/gen/importTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi/sql/ry_20200415.sql
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
ruoyi/src/main/resources/vm/sql/sql.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
6 years ago |
|
疯狂的狮子li
|
09918e338a
|
修复 undertow 未生效问题
|
6 years ago |
|
RuoYi
|
aae1825697
|
模板sql.vm添加菜单状态
|
6 years ago |
|
RuoYi
|
14392d9764
|
dialog添加append-to-body属性，防止ie遮罩
|
6 years ago |
|
RuoYi
|
ec98648e4d
|
菜单区分状态和显示隐藏功能
|
6 years ago |
|
疯狂的狮子li
|
1dac24c9f8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi/pom.xml
|
6 years ago |
|
疯狂的狮子li
|
76ea06748b
|
升级fastjson到最新版1.2.68 修复安全加固
|
6 years ago |
|
RuoYi
|
5d20be2976
|
升级fastjson到最新版1.2.68 修复安全加固
|
6 years ago |
|
疯狂的狮子li
|
29b131b107
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
6 years ago |
|
RuoYi
|
5ded2569d0
|
修复代码生成如果选择字典类型缺失逗号问题
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
ec65b1f7ec
|
登录请求params更换为data，防止暴露url
|
6 years ago |
|
RuoYi
|
8a394f0363
|
日志返回时间格式处理
|
6 years ago |
|
RuoYi
|
8132ae0913
|
代码生成列属性排序查询
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
9b0828be8e
|
角色禁用&菜单隐藏不查询权限
|
6 years ago |
|
疯狂的狮子li
|
67657e9f02
|
升级 v2.2
|
6 years ago |
|
疯狂的狮子li
|
2a922caf89
|
升级 v2.2
|
6 years ago |
|
疯狂的狮子li
|
bd7371fb8b
|
升级 v2.2
|
6 years ago |
|
疯狂的狮子li
|
51ae2d1a87
|
升级 v2.2
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
2cc14e5f56
|
若依 2.2
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
109c64e7c2
|
批量替换表前缀调整
|
6 years ago |
|
RuoYi
|
c0cd030d0f
|
批量替换表前缀修改
|
6 years ago |
|
RuoYi
|
7604d59e49
|
修复通知公告批量删除异常问题
|
6 years ago |
|
RuoYi
|
02062f31e9
|
通用http工具类
|
6 years ago |
|
RuoYi
|
ab992f4848
|
修复防重复提交注解无效问题
|
6 years ago |
|
RuoYi
|
baea48be68
|
调整包路径
|
6 years ago |
|
RuoYi
|
1590e1068c
|
删除多余包
|
6 years ago |
|
疯狂的狮子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
|
6 years ago |
|
RuoYi
|
166d5ec55f
|
修改个人信息，密码后redis中登录信息不会过期问题
|
6 years ago |
|
RuoYi
|
09a3a971ff
|
操作日志排序调整
|
6 years ago |
|
RuoYi
|
bb1340ecc6
|
操作日志详细显示类型
|
6 years ago |
|
疯狂的狮子li
|
87c0074fab
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
|
6 years ago |
|
RuoYi
|
9d45070429
|
设置mybatis全局的配置文件
|
6 years ago |
|
疯狂的狮子li
|
0ba48df61e
|
升级 v2.1
|
6 years ago |
|
疯狂的狮子li
|
db20b4a3d3
|
升级 v2.1
|
6 years ago |
|
疯狂的狮子li
|
6687efd887
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
ruoyi-ui/src/components/RuoYi/Git/index.vue
ruoyi-ui/src/layout/components/Navbar.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/index.js
ruoyi-ui/src/utils/permission.js
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/tool/build/index.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi/pom.xml
ruoyi/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
ruoyi/src/main/resources/application.yml
ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml
ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml
ruoyi/src/main/resources/vm/java/controller.java.vm
ruoyi/src/main/resources/vm/java/domain.java.vm
ruoyi/src/main/resources/vm/vue/index.vue.vm
|
6 years ago |
|
RuoYi
|
cb0a4b78ee
|
若依 2.1
|
6 years ago |
|
疯狂的狮子li
|
c9527fcf42
|
修复地址开关无效问题
|
6 years ago |
|
RuoYi
|
46a1695292
|
修复地址开关无效问题
|
6 years ago |
