 疯狂的狮子li
|
9a94ab573d
|
!6 update ruoyi-admin/src/main/resources/application.yml.
Merge pull request !6 from hechieh/N/A
|
2021-03-10 13:34:15 +08:00 |
|
|
疯狂的狮子li
|
5494ec36e5
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
ruoyi-ui/src/components/Editor/index.vue
ruoyi-ui/src/permission.js
ruoyi-ui/src/store/modules/user.js
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
|
2021-03-09 09:32:49 +08:00 |
|
|
疯狂的狮子li
|
2c2deced02
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2021-03-03 17:14:21 +08:00 |
|
|
疯狂的狮子li
|
0638f3c1fe
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-ui/src/views/index.vue
|
2021-02-28 14:39:53 +08:00 |
|
|
疯狂的狮子li
|
9b136e76bb
|
update 3.4.0
|
2021-02-22 10:06:18 +08:00 |
|
|
疯狂的狮子li
|
ac99fddfe6
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
ruoyi-ui/src/views/index.vue
|
2021-02-22 10:04:43 +08:00 |
|
|
疯狂的狮子li
|
66899c4c96
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
sql/ry_20210210.sql
|
2021-02-18 09:12:32 +08:00 |
|
|
疯狂的狮子li
|
2c40a892f8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/system/role/index.vue
|
2021-02-07 09:18:17 +08:00 |
|
|
疯狂的狮子li
|
6f0dfa850a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/system/role/index.vue
|
2021-02-03 13:38:43 +08:00 |
|
|
疯狂的狮子li
|
8ba1266b6a
|
修改 页面生成模板 适配后端时间格式
|
2021-01-28 09:22:25 +08:00 |
|
|
疯狂的狮子li
|
118c02144f
|
集成 Feign 接口化管理 Http请求(如短信,支付,推送等)
|
2021-01-27 15:15:03 +08:00 |
|
|
疯狂的狮子li
|
a4756004f8
|
删除过时配置
|
2021-01-27 13:10:05 +08:00 |
|
|
疯狂的狮子li
|
6e6933bb25
|
支持树表生成 增加生成树表说明
|
2021-01-25 13:35:07 +08:00 |
|
|
疯狂的狮子li
|
2925f28255
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
|
2021-01-25 09:54:49 +08:00 |
|
|
疯狂的狮子li
|
b5e8fa2b98
|
统一校验配置类名称
|
2021-01-21 09:31:37 +08:00 |
|
|
疯狂的狮子li
|
09acac4caf
|
更新readme
|
2021-01-18 16:13:05 +08:00 |
|
|
疯狂的狮子li
|
9fdee373af
|
删除多余注解(@Data已包含)
|
2021-01-18 14:00:03 +08:00 |
|
|
疯狂的狮子li
|
3362ce5f33
|
升级 MybatisPlus 3.4.2
|
2021-01-15 15:55:24 +08:00 |
|
|
疯狂的狮子li
|
52325307f4
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
|
2021-01-15 15:08:50 +08:00 |
|
|
疯狂的狮子li
|
684eadbcc6
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.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/domain/GenTableColumn.java
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.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/VelocityInitializer.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/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/java/domain.java.vm
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/index.vue
sql/ry_20210108.sql
|
2021-01-11 09:58:41 +08:00 |
|
|
疯狂的狮子li
|
b368745380
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/package.json
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-01-06 09:35:00 +08:00 |
|
|
疯狂的狮子li
|
d73994f05d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/TagsView/index.vue
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/index.vue
|
2021-01-05 09:22:36 +08:00 |
|
|
疯狂的狮子li
|
e9d368ed0c
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
|
2020-12-30 16:20:09 +08:00 |
|
|
疯狂的狮子li
|
b8f6731584
|
增加 demo模块 方便参考扩展
|
2020-12-29 10:17:44 +08:00 |
|
|
疯狂的狮子li
|
93e7f53cf8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-28 10:40:13 +08:00 |
|
|
疯狂的狮子li
|
c24b912b50
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/store/modules/permission.js
|
2020-12-25 09:59:24 +08:00 |
|
|
疯狂的狮子li
|
476df3117b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/utils/permission.js
ruoyi-ui/src/utils/request.js
|
2020-12-24 10:04:54 +08:00 |
|
|
疯狂的狮子li
|
1000a577d0
|
配置文件新增redis数据库索引属性
|
2020-12-21 11:58:49 +08:00 |
|
|
疯狂的狮子li
|
78ef398257
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/src/store/modules/permission.js
|
2020-12-21 11:55:32 +08:00 |
|
|
疯狂的狮子li
|
805c79506b
|
代码生成 后端支持 between
|
2020-12-18 17:46:05 +08:00 |
|
|
疯狂的狮子li
|
817da5bc04
|
修复export与list结果不统一问题
|
2020-12-18 16:50:58 +08:00 |
|
|
疯狂的狮子li
|
2b0cf24be4
|
修改 controller 生成器 解决where条件重复bug
|
2020-12-18 09:47:35 +08:00 |
|
|
疯狂的狮子li
|
6c8497f632
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/package.json
ruoyi-ui/src/components/Breadcrumb/index.vue
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/store/getters.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
|
2020-12-18 09:45:54 +08:00 |
|
|
疯狂的狮子li
|
b029a7265a
|
将controller条件查询器改完隐式泛型
|
2020-12-18 00:02:40 +08:00 |
|
|
疯狂的狮子li
|
f44ff8477f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
|
2020-12-16 12:44:21 +08:00 |
|
|
疯狂的狮子li
|
1249c7ca26
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/permission.js
ruoyi-ui/src/views/login.vue
|
2020-12-15 10:25:00 +08:00 |
|
|
疯狂的狮子li
|
1ec7073027
|
同步升级 3.3
|
2020-12-14 09:28:15 +08:00 |
|
|
疯狂的狮子li
|
7e476b941e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
ruoyi-ui/package.json
ruoyi-ui/src/main.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2020-12-14 09:27:27 +08:00 |
|
|
疯狂的狮子li
|
8d4f3561d5
|
修复mybatis-plus插件不生效bug
|
2020-12-11 18:45:57 +08:00 |
|
|
疯狂的狮子li
|
8b88d91312
|
update README.md
|
2020-12-11 14:44:07 +08:00 |
|
|
疯狂的狮子li
|
f56f57a236
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/assets/styles/variables.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/components/Screenfull/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/layout/index.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/store/modules/user.js
ruoyi-ui/src/views/login.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/userInfo.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/vue.config.js
|
2020-12-11 14:27:54 +08:00 |
|
|
疯狂的狮子li
|
4e56f30381
|
修改 生成器controller模板缺导包 与 index页面兼容性
Merge pull request !2 from dragonwzj/master
|
2020-12-09 16:49:24 +08:00 |
|
|
疯狂的狮子li
|
5109eb0e7e
|
日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下
|
2020-12-09 13:37:04 +08:00 |
|
|
疯狂的狮子li
|
583738fa65
|
日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下
|
2020-12-09 13:33:41 +08:00 |
|
|
疯狂的狮子li
|
5a62019cdd
|
更新 如何修改为Tomcat相关注释配置与说明
|
2020-12-08 16:21:30 +08:00 |
|
|
疯狂的狮子li
|
69f30760f8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
|
2020-12-07 12:59:35 +08:00 |
|
|
疯狂的狮子li
|
e80349c343
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/utils/request.js
|
2020-12-04 11:46:29 +08:00 |
|
|
疯狂的狮子li
|
d2cef9c40d
|
新增 关于多数据源事务
|
2020-12-03 11:32:29 +08:00 |
|
|
疯狂的狮子li
|
b346036cca
|
增加 多数据源事务描述
|
2020-12-03 11:30:48 +08:00 |
|
|
疯狂的狮子li
|
5ebd0a971f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-03 11:20:50 +08:00 |
|
|
疯狂的狮子li
|
c50e058953
|
为所有MP插件增加官方链接
|
2020-12-03 11:15:54 +08:00 |
|
|
疯狂的狮子li
|
a3dfa843af
|
增加 多数据源使用注意事项
|
2020-12-03 11:13:58 +08:00 |
|
|
疯狂的狮子li
|
2afb109bff
|
增加 maven多环境配置注释
|
2020-12-01 11:53:55 +08:00 |
|
|
疯狂的狮子li
|
f7f7557d4d
|
项目修改为 maven多环境配置
|
2020-12-01 11:44:29 +08:00 |
|
|
疯狂的狮子li
|
b36b413a69
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-01 09:23:55 +08:00 |
|
|
疯狂的狮子li
|
ce438f182a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
sql/ry_20201128.sql
|
2020-11-30 12:41:39 +08:00 |
|
|
疯狂的狮子li
|
6d900dc654
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-11-25 09:30:42 +08:00 |
|
|
疯狂的狮子li
|
15c4428b9c
|
修改 ruoyi CharsetKit.java bug
|
2020-11-24 11:54:38 +08:00 |
|
|
疯狂的狮子li
|
20d7c90515
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
sql/ry_20201123.sql
|
2020-11-24 10:03:59 +08:00 |
|
|
疯狂的狮子li
|
3363d7b12d
|
同步升级 3.2.1 修复重大bug 阻止任意文件下载漏洞
|
2020-11-18 10:52:33 +08:00 |
|
|
疯狂的狮子li
|
ff563c44e2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/package.json
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
|
2020-11-18 10:41:13 +08:00 |
|
|
疯狂的狮子li
|
527decb7fa
|
更新 undertow 配置
|
2020-11-16 14:50:05 +08:00 |
|
|
疯狂的狮子li
|
03f0e3a137
|
为所有MP插件和配置增加官方链接
|
2020-11-16 14:12:14 +08:00 |
|
|
疯狂的狮子li
|
148d0361e0
|
增加字段填充配置
|
2020-11-16 14:03:55 +08:00 |
|
|
疯狂的狮子li
|
d626dd9e90
|
更新分页插件配置 增加主键插件配置
|
2020-11-16 13:57:26 +08:00 |
|
|
疯狂的狮子li
|
1043afcecc
|
重磅升级 Mybatis-Plus 升级为 3.4.1
|
2020-11-13 11:39:16 +08:00 |
|
|
疯狂的狮子li
|
04d1154be0
|
重磅升级 重写 Mybatis-Plus 配置文件 根据官方文档详细注释
|
2020-11-13 11:18:37 +08:00 |
|
|
疯狂的狮子li
|
550f781d6f
|
重磅升级 Mybatis-Plus 插件 全部升级为最新插件
|
2020-11-13 11:17:33 +08:00 |
|
|
疯狂的狮子li
|
b114d0a41c
|
重磅升级 Mybatis-Plus 升级为 3.4.1 Hutool 升级到 5.4.0
|
2020-11-13 11:16:57 +08:00 |
|
|
疯狂的狮子li
|
60dda6c7eb
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/index.vue
|
2020-11-12 09:24:40 +08:00 |
|
|
疯狂的狮子li
|
c57005b4e4
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-11-06 17:18:55 +08:00 |
|
|
疯狂的狮子li
|
93093d9f55
|
更改 MybatisPlus Lambda查询 改为官方推荐写法
|
2020-11-05 13:56:49 +08:00 |
|
|
疯狂的狮子li
|
e095a9f73f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-11-05 12:58:53 +08:00 |
|
|
疯狂的狮子li
|
5d748a50ff
|
删除 MyBatisConfig.java 配置文件
|
2020-11-03 09:58:01 +08:00 |
|
|
疯狂的狮子li
|
efb938c370
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java
ruoyi-ui/src/views/system/notice/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2020-11-03 09:56:18 +08:00 |
|
|
疯狂的狮子li
|
616fbc45ae
|
增加 校验框架配置与全局异常处理
|
2020-10-28 16:01:26 +08:00 |
|
|
疯狂的狮子li
|
cf44d1f213
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
ruoyi-ui/src/views/system/dept/index.vue
|
2020-10-28 11:54:52 +08:00 |
|
|
疯狂的狮子li
|
30d15afd33
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-ui/src/views/login.vue
sql/ry_20201021.sql
|
2020-10-23 17:41:02 +08:00 |
|
|
疯狂的狮子li
|
8747d36b2c
|
更改日志存储路径 使用项目变量
|
2020-10-20 16:38:39 +08:00 |
|
|
疯狂的狮子li
|
1a15c528a2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
|
2020-10-16 10:27:13 +08:00 |
|
|
疯狂的狮子li
|
f4876422a9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
|
2020-10-14 09:22:01 +08:00 |
|
|
疯狂的狮子li
|
8ca53c7666
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
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/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/src/views/tool/gen/index.vue
|
2020-10-12 09:54:59 +08:00 |
|
|
疯狂的狮子li
|
bd39b971cf
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/monitor/job/index.vue
|
2020-10-10 09:19:20 +08:00 |
|
|
疯狂的狮子li
|
cb92e41b76
|
修复生成树结构报错
|
2020-10-07 12:27:29 +08:00 |
|
|
疯狂的狮子li
|
cddaf4b088
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2020-10-07 12:25:38 +08:00 |
|
|
疯狂的狮子li
|
cc59e5ad89
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
|
2020-10-03 11:57:41 +08:00 |
|
|
疯狂的狮子li
|
3c703e4189
|
解决 druid 请求已响应bug
|
2020-09-25 12:05:41 +08:00 |
|
|
疯狂的狮子li
|
ef4731e3ff
|
删除无用js
|
2020-09-25 12:05:01 +08:00 |
|
|
疯狂的狮子li
|
6101a3bf0d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/Server.java
ruoyi-ui/src/assets/styles/sidebar.scss
|
2020-09-25 11:15:57 +08:00 |
|
|
疯狂的狮子li
|
aefa2095f0
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
sql/ry_20200920.sql
|
2020-09-22 13:22:30 +08:00 |
|
|
疯狂的狮子li
|
298fabfdec
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.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/resources/mapper/generator/GenTableColumnMapper.xml
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/api/tool/gen.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2020-09-18 17:38:23 +08:00 |
|
|
疯狂的狮子li
|
b111cbeedd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-ui/src/views/tool/gen/editTable.vue
|
2020-09-16 09:23:02 +08:00 |
|
|
疯狂的狮子li
|
06c4d4d01b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/components/Editor/index.vue
ruoyi-ui/src/router/index.js
|
2020-09-11 09:17:43 +08:00 |
|
|
疯狂的狮子li
|
a41bc230a1
|
修改上传文件路径
|
2020-09-08 14:49:37 +08:00 |
|
|
疯狂的狮子li
|
ef95cec77f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-ui/src/components/Editor/index.vue
|
2020-09-07 11:31:40 +08:00 |
|
|
疯狂的狮子li
|
f69cb567f0
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
sql/ry_20200901.sql
|
2020-09-02 09:08:52 +08:00 |
|
|
疯狂的狮子li
|
1ef17bb582
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
|
2020-08-31 09:12:13 +08:00 |
|
|
疯狂的狮子li
|
fdbe943053
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
|
2020-08-26 15:30:25 +08:00 |
|
|
疯狂的狮子li
|
184bb04bc2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/components/Editor/index.vue
ruoyi-ui/src/views/system/notice/index.vue
sql/ry_20200822.sql
|
2020-08-24 10:26:44 +08:00 |
|
|
疯狂的狮子li
|
d464d8703c
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
|
2020-08-21 13:01:12 +08:00 |
|