疯狂的狮子li
|
29c46a15f9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-system/pom.xml
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/mapper/SysPostMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.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/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.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/SysPostMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/directive/index.js
ruoyi-ui/src/plugins/download.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/system/user/authRole.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
|
4 years ago |
RuoYi
|
2a235917dc
|
优化下载解析blob异常提示
|
4 years ago |
|
RuoYi
|
44ce6774dc
|
代码生成预览支持复制内容
|
4 years ago |
|
RuoYi
|
b911d7f78f
|
自定义文字复制剪贴指令
|
4 years ago |
|
RuoYi
|
4644176e26
|
升级clipboard到最新版本2.0.8
|
4 years ago |
|
RuoYi
|
850b98337b
|
修正用户分配角色属性错误
|
4 years ago |
|
RuoYi
|
6bfae2652f
|
若依 3.8.0
|
4 years ago |
|
RuoYi
|
a2d3f987c0
|
优化代码
|
4 years ago |
|
疯狂的狮子li
|
f43a5cb244
|
update 更改前端工程文件版本号
|
4 years ago |
fuzui
|
f28a91969a
|
fix: crontab组件中规范数据范围、冗余代码去除以及部分通配符说明
|
4 years ago |
|
fuzui
|
ca285f5e53
|
fix: crontab组件周显示及计算bug
|
4 years ago |
|
fuzui
|
34f2552cad
|
fix: crontab组件互斥bug
|
4 years ago |
|
疯狂的狮子li
|
dbba894544
|
发布 v3.4.0
|
4 years ago |
|
疯狂的狮子li
|
52673152cc
|
发布 v3.4.0
|
4 years ago |
|
疯狂的狮子li
|
81755a280d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/utils/index.js
ruoyi-ui/src/views/register.vue
|
4 years ago |
|
RuoYi
|
89e7cb19b9
|
注册成功提示类型success
|
4 years ago |
|
疯狂的狮子li
|
c00e397405
|
update 抽象 Excel 导入支持自定义监听器
|
4 years ago |
khejing
|
e5fd1f76db
|
camelCase中应该是下划线，而不是横杠
|
4 years ago |
zhujie
|
c21ff85b57
|
update 增加excel导入样例
|
4 years ago |
|
疯狂的狮子li
|
d2b7f8ef0f
|
remove 删除无用 js 文件
|
4 years ago |
|
疯狂的狮子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 |
|
RuoYi
|
31106c91fb
|
修复使用 this.$options.data 报错问题
|
4 years ago |
|
RuoYi
|
026a427103
|
优化前端代码
|
4 years ago |
|
RuoYi
|
4f194aa101
|
升级js-cookie到最新版本3.0.1
|
4 years ago |
|
RuoYi
|
ef4bfde4a8
|
优化提示信息
|
4 years ago |
|
RuoYi
|
421593c0ba
|
添加新群号：101539465
|
4 years ago |
|
RuoYi
|
91ad85aec1
|
添加新群号：264312783
|
4 years ago |
|
RuoYi
|
d1eacc1d1c
|
新增tab对象简化页签操作
|
4 years ago |
|
疯狂的狮子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 |
