疯狂的狮子li
|
ce279ca360
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-ui/package.json
ruoyi-ui/src/utils/request.js
|
4 years ago |
RuoYi
|
fcf606acde
|
升级jsencrypt到最新版本3.2.1
|
4 years ago |
|
疯狂的狮子li
|
531e0ef918
|
remove 删除 quartz 过时页面
|
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
|
ead6da4760
|
update 更新页面与文档项目介绍
|
4 years ago |
|
RuoYi
|
cb9c0e79eb
|
升级core-js到最新版本3.19.1
|
4 years ago |
|
疯狂的狮子li
|
874cf18566
|
fix 修复 配置应用前缀路径书写问题
|
4 years ago |
|
RuoYi
|
4e817a1109
|
升级axios到最新版本0.24.0
|
4 years ago |
|
疯狂的狮子Li
|
4d5048435c
|
fix 修复 ruoyi 关于 配置应用前缀路径的bug 改为配置文件统一配置
|
4 years ago |
|
疯狂的狮子li
|
1ea73a67ca
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-ui/src/api/login.js
ruoyi-ui/src/views/index.vue
|
4 years ago |
|
RuoYi
|
bbbe83b737
|
添加新群号：101539465
|
4 years ago |
|
RuoYi
|
181f62c15e
|
回显数据字典键值修正
|
4 years ago |
|
RuoYi
|
3ae5ec92a5
|
登录/验证码请求headers不设置token
|
4 years ago |
|
疯狂的狮子li
|
d6e080d546
|
发布 v3.3.0
|
4 years ago |
|
疯狂的狮子Li
|
42a3117e2a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/plugins/download.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/role/index.vue
ry.bat
|
4 years ago |
|
RuoYi
|
8a7dcf8a80
|
修正错别字
|
4 years ago |
|
疯狂的狮子Li
|
2173ed504d
|
update 更新关于全局路径设置与文档链接
|
4 years ago |
|
RuoYi
|
a4558c32b2
|
解析blob响应是否登录失效
|
4 years ago |
|
疯狂的狮子li
|
83ce927d16
|
add 前端增加 任务调度中心页面 与环境及nginx配置
|
4 years ago |
|
RuoYi
|
c2a179e9dd
|
新增认证对象简化权限验证
|
4 years ago |
|
疯狂的狮子li
|
60404a6564
|
update 调整不规范导包
|
4 years ago |
|
RuoYi
|
519ea854d5
|
生产环境使用路由懒加载提升页面响应速度
|
4 years ago |
|
疯狂的狮子li
|
bb43b2853d
|
update 前端增加默认国际化参数
|
4 years ago |
|
疯狂的狮子li
|
64ec206ecb
|
update 更改上传数据回填
|
4 years ago |
|
RuoYi
|
6d6271d6c9
|
修复五级以上菜单404问题
|
4 years ago |
|
疯狂的狮子li
|
741a5b275b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.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-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/views/monitor/server/index.vue
|
4 years ago |
|
RuoYi
|
4fdb0f48ec
|
同步element2.15.6表格样式
|
4 years ago |
|
RuoYi
|
f1fed76273
|
升级element-ui到最新版本2.15.6
|
4 years ago |
|
疯狂的狮子li
|
3f142dd0fa
|
发布 v3.2.0
|
4 years ago |
|
疯狂的狮子li
|
22b4f87232
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
疯狂的狮子li
|
ca5823fcdf
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/package.json
|
4 years ago |
|
疯狂的狮子Li
|
49fc74be5d
|
fix 修复更新问题 导出文件名乱码
|
4 years ago |
|
RuoYi
|
25f50d74c5
|
升级sass-loader到最新版本10.1.1
|
4 years ago |
|
RuoYi
|
266f4d6806
|
升级dart-sass到版本1.32.13
|
4 years ago |
|
疯狂的狮子li
|
5a8d3ddef0
|
update 回退 dart-sass 新版报大量警告
|
4 years ago |
|
疯狂的狮子li
|
99dcbe0207
|
update 封装通用下载方法简化下载使用
|
4 years ago |
|
疯狂的狮子li
|
75b22e9a23
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/package.json
ruoyi-ui/src/main.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
ruoyi-ui/src/views/tool/build/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
4 years ago |
|
RuoYi
|
ded99502ae
|
新增通用方法简化下载使用
|
4 years ago |
|
RuoYi
|
02b95f95a8
|
升级file-saver到最新版本2.0.5
|
4 years ago |
|
RuoYi
|
2a6d2d733e
|
升级dart-sass到最新版本1.42.1
|
4 years ago |
|
疯狂的狮子li
|
125547f08f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
ruoyi-ui/src/views/monitor/server/index.vue
|
4 years ago |
|
疯狂的狮子li
|
eaa3baab3c
|
update 代码生成编辑页面 拼写错误修正
|
4 years ago |
|
RuoYi
|
1a5881b1d0
|
修正服务监控磁盘变量
|
4 years ago |
|
疯狂的狮子li
|
071c4c1412
|
update 同步ruoyi适配改动
|
4 years ago |
|
疯狂的狮子li
|
03b31652a2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/main.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/online/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/monitor/server/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/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
ruoyi-ui/src/views/tool/gen/importTable.vue
|
4 years ago |
|
RuoYi
|
258335cc65
|
新增通用方法简化模态/缓存使用
|
4 years ago |
|
疯狂的狮子Li
|
5306a45093
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
|
4 years ago |
|
RuoYi
|
a292cccb63
|
代码生成点击预览重置激活tab
|
4 years ago |
