疯狂的狮子li
|
af25588b88
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
# ruoyi-generator/pom.xml
# 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/vm/js/api.js.vm
# ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
# ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
# ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
# ruoyi-ui/package.json
# ruoyi-ui/src/api/monitor/server.js
# ruoyi-ui/src/components/RuoYi/Doc/index.vue
# ruoyi-ui/src/components/RuoYi/Git/index.vue
# ruoyi-ui/src/components/SizeSelect/index.vue
# ruoyi-ui/src/layout/components/Sidebar/Logo.vue
# ruoyi-ui/src/layout/components/TagsView/index.vue
# ruoyi-ui/src/layout/index.vue
# ruoyi-ui/src/main.js
# ruoyi-ui/src/plugins/download.js
# ruoyi-ui/src/router/index.js
# ruoyi-ui/src/store/modules/permission.js
# ruoyi-ui/src/store/modules/settings.js
# ruoyi-ui/src/store/modules/tagsView.js
# ruoyi-ui/src/store/modules/user.js
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/monitor/job/log.vue
# ruoyi-ui/src/views/system/dict/data.vue
# ruoyi-ui/src/views/system/role/index.vue
# ruoyi-ui/src/views/system/user/authRole.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
|
4 years ago |
Ricky
|
9fc3e220a7
|
防止修改用户个人信息接口修改用户名
|
4 years ago |
|
疯狂的狮子li
|
65a1245a03
|
update OSS 模块 整体重命名 消除歧义
|
4 years ago |
|
疯狂的狮子Li
|
2cdea69719
|
add 增加 缓存懒加载 开关
|
4 years ago |
|
疯狂的狮子Li
|
019526fbe9
|
update 解耦 LoginUser 与 SysUser 强关联
|
4 years ago |
|
疯狂的狮子li
|
321bb010cb
|
update 更新注解参数类型 去除多余警告
|
4 years ago |
|
疯狂的狮子li
|
2dd0add3e7
|
remove 删除无用日志配置
|
4 years ago |
|
疯狂的狮子li
|
f8487f581b
|
update 补全所有接口 单参数接口文档
|
4 years ago |
|
疯狂的狮子li
|
2781655b0a
|
update 适配 ruoyi 关于优化导出数据操作
|
4 years ago |
|
疯狂的狮子li
|
64add90edd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-ui/package.json
ruoyi-ui/src/api/monitor/logininfor.js
ruoyi-ui/src/api/monitor/operlog.js
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/api/system/post.js
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/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
|
4 years ago |
RuoYi
|
cedd2d1daf
|
优化导出数据操作
|
4 years ago |
|
疯狂的狮子li
|
5389663b72
|
fix 修复 临时文件存储位置 相对路径问题
|
4 years ago |
|
疯狂的狮子li
|
53cb0826bc
|
update 升级 swagger 配置 使用 knife4j 增强模式
|
4 years ago |
XTvLi
|
b00171366f
|
统一全局配置内容, 删除临时调用配置文件
|
4 years ago |
|
疯狂的狮子li
|
b132f04f71
|
fix 修复 SysLoginController 接口文档书写错误问题
|
4 years ago |
|
疯狂的狮子li
|
2f21f293c1
|
update 基于 hutool 封装树构建工具 重构部门与菜单树结构返回
|
4 years ago |
|
疯狂的狮子li
|
8a93371baa
|
remove 移除 feign 相关代码与依赖
|
4 years ago |
|
疯狂的狮子li
|
95dcae1a85
|
remove 移除 quartz 相关代码与依赖
|
4 years ago |
|
疯狂的狮子li
|
06f06ce390
|
fix 修复 Linux 清除临时目录 导致上传找不到目录报错问题
|
4 years ago |
|
疯狂的狮子li
|
da2cb61cae
|
update 调整 pr !107 代码格式
|
4 years ago |
sxq
|
ea2e560bd9
|
去掉jfr相关类。
|
4 years ago |
|
sxq
|
25321984fa
|
新增startup trace监控。
|
4 years ago |
|
疯狂的狮子li
|
d6e080d546
|
发布 v3.3.0
|
4 years ago |
|
疯狂的狮子li
|
7e3c9c1094
|
update 删除无用setUsername 使用自动注入
|
4 years ago |
|
疯狂的狮子li
|
2e4689d557
|
update 更新xxl-job执行器开关功能
|
4 years ago |
|
疯狂的狮子li
|
b8a8b76c38
|
fix 修复跨域访问无权限获取请求头 download-filename 导致文件名为空问题
|
4 years ago |
|
疯狂的狮子li
|
296e6171a1
|
update 补全国际化文件
|
4 years ago |
|
疯狂的狮子li
|
32bfe334c0
|
update 整理删除无用注释 保证代码整洁
|
4 years ago |
|
疯狂的狮子li
|
c0eb3c53c1
|
update swagger组 顺序配置
|
4 years ago |
|
疯狂的狮子li
|
b6443e0c01
|
update quartz改为保留一个版本
|
4 years ago |
|
疯狂的狮子li
|
eed4e09282
|
update 从总输出模块剔除 ruoyi-quartz 切换至 ruoyi-job
|
4 years ago |
|
疯狂的狮子li
|
aaa15b403a
|
add [重大更新]增加 ruoyi-job 任务调度模块(基于xxl-job)
|
4 years ago |
|
疯狂的狮子li
|
a6fb88d74c
|
update [重大更新]全业务 增加 接口文档注解 格式化代码
|
4 years ago |
|
疯狂的狮子li
|
6684812014
|
update 标记过期 推荐迁移至新框架 xxl-job
|
4 years ago |
|
疯狂的狮子li
|
cbb0c98f98
|
add [重磅更新] 增加分布式日志框架 TLog
|
4 years ago |
|
RuoYi
|
ae5c68368b
|
升级SpringBoot到最新版本2.5.5
|
4 years ago |
|
RuoYi
|
48813161f6
|
设置mybatis默认的执行器
|
4 years ago |
|
RuoYi
|
5477ce3c39
|
修正swagger没有指定dataTypeClass导致启动出现warn日志
|
4 years ago |
|
疯狂的狮子li
|
3f142dd0fa
|
发布 v3.2.0
|
4 years ago |
|
疯狂的狮子Li
|
49fc74be5d
|
fix 修复更新问题 导出文件名乱码
|
4 years ago |
|
疯狂的狮子li
|
c4f8c1b296
|
update 更新线程池策略说明
|
4 years ago |
|
疯狂的狮子li
|
3434610349
|
update 接口文档 支持分组配置
|
4 years ago |
|
疯狂的狮子li
|
bcac70b2ab
|
update 扩展 security 配置属性
|
4 years ago |
|
疯狂的狮子li
|
0f2caf1cb6
|
update security 路径配置抽取到配置文件
|
4 years ago |
|
疯狂的狮子li
|
40984e201e
|
update 同步ruoyi修改命名
|
4 years ago |
|
疯狂的狮子li
|
50599487f8
|
update [重大改动] 将 framework 与 system 模块 解耦
|
4 years ago |
|
疯狂的狮子li
|
d3d3972bea
|
update OSS模块 关于下载403报错信息优化
|
4 years ago |
|
疯狂的狮子li
|
5285735c7a
|
add 增加 redis redisson 集群配置
|
4 years ago |
|
疯狂的狮子li
|
2af534eea4
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-quartz/pom.xml
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/components/ImageUpload/index.vue
ruoyi-ui/src/components/ThemePicker/index.vue
ruoyi-ui/src/layout/components/Sidebar/Link.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
sql/ry_20210908.sql
|
4 years ago |
|
RuoYi
|
db193a46e8
|
若依 3.7.0
|
4 years ago |
