admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,958 Commits 3 Branches 0 Tags
Commit Graph

781 Commits

Author SHA1 Message Date
疯狂的狮子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
 2021-11-28 15:10:05 +08:00
RuoYi
89e7cb19b9 注册成功提示类型success 2021-11-26 18:11:57 +08:00
疯狂的狮子li
c00e397405 update 抽象 Excel 导入支持自定义监听器 2021-11-26 18:06:44 +08:00
khejing
e5fd1f76db camelCase中应该是下划线，而不是横杠 2021-11-26 08:26:45 +00:00
zhujie
c21ff85b57 update 增加excel导入样例 2021-11-26 13:02:59 +08:00
疯狂的狮子li
d2b7f8ef0f remove 删除无用 js 文件 2021-11-25 19:47:34 +08:00
疯狂的狮子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
 2021-11-25 19:39:53 +08:00
RuoYi
31106c91fb 修复使用 this.$options.data 报错问题 2021-11-24 15:00:51 +08:00
RuoYi
026a427103 优化前端代码 2021-11-24 14:47:24 +08:00
RuoYi
4f194aa101 升级js-cookie到最新版本3.0.1 2021-11-22 18:07:33 +08:00
RuoYi
ef4bfde4a8 优化提示信息 2021-11-22 18:06:44 +08:00
RuoYi
421593c0ba 添加新群号：101539465 2021-11-20 12:09:53 +08:00
RuoYi
91ad85aec1 添加新群号：264312783 2021-11-19 15:20:54 +08:00
RuoYi
d1eacc1d1c 新增tab对象简化页签操作 2021-11-19 14:53:40 +08:00
疯狂的狮子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
 2021-11-18 18:43:34 +08:00
RuoYi
fcf606acde 升级jsencrypt到最新版本3.2.1 2021-11-18 17:50:49 +08:00
疯狂的狮子li
531e0ef918 remove 删除 quartz 过时页面 2021-11-17 19:42:38 +08:00
疯狂的狮子li
2781655b0a update 适配 ruoyi 关于优化导出数据操作 2021-11-17 19:42:14 +08:00
疯狂的狮子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
 2021-11-17 19:14:03 +08:00
RuoYi
cedd2d1daf 优化导出数据操作 2021-11-17 11:57:17 +08:00
疯狂的狮子li
ead6da4760 update 更新页面与文档项目介绍 2021-11-16 18:54:53 +08:00
RuoYi
cb9c0e79eb 升级core-js到最新版本3.19.1 2021-11-16 14:15:17 +08:00
疯狂的狮子li
874cf18566 fix 修复 配置应用前缀路径书写问题 2021-11-12 19:43:49 +08:00
RuoYi
4e817a1109 升级axios到最新版本0.24.0 2021-11-10 11:14:50 +08:00
疯狂的狮子Li
4d5048435c fix 修复 ruoyi 关于 配置应用前缀路径的bug 改为配置文件统一配置 2021-11-08 18:17:29 +08:00
疯狂的狮子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
 2021-11-03 13:58:45 +08:00
RuoYi
bbbe83b737 添加新群号：101539465 2021-11-02 14:40:21 +08:00
RuoYi
181f62c15e 回显数据字典键值修正 2021-11-01 14:40:00 +08:00
RuoYi
3ae5ec92a5 登录/验证码请求headers不设置token 2021-11-01 13:29:27 +08:00
疯狂的狮子li
d6e080d546 发布 v3.3.0 2021-10-29 09:14:49 +08:00
疯狂的狮子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
 2021-10-25 18:24:55 +08:00
RuoYi
8a7dcf8a80 修正错别字 2021-10-25 10:26:00 +08:00
疯狂的狮子Li
2173ed504d update 更新关于全局路径设置与文档链接 2021-10-24 17:23:15 +08:00
RuoYi
a4558c32b2 解析blob响应是否登录失效 2021-10-23 10:23:32 +08:00
疯狂的狮子li
83ce927d16 add 前端增加 任务调度中心页面 与环境及nginx配置 2021-10-20 15:25:14 +08:00
RuoYi
c2a179e9dd 新增认证对象简化权限验证 2021-10-20 11:21:11 +08:00
疯狂的狮子li
60404a6564 update 调整不规范导包 2021-10-15 19:30:42 +08:00
RuoYi
519ea854d5 生产环境使用路由懒加载提升页面响应速度 2021-10-15 17:57:46 +08:00
疯狂的狮子li
bb43b2853d update 前端增加默认国际化参数 2021-10-15 11:45:43 +08:00
疯狂的狮子li
64ec206ecb update 更改上传数据回填 2021-10-14 17:28:13 +08:00
RuoYi
6d6271d6c9 修复五级以上菜单404问题 2021-10-14 16:19:46 +08:00
疯狂的狮子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
 2021-10-11 09:37:06 +08:00
RuoYi
4fdb0f48ec 同步element2.15.6表格样式 2021-10-10 11:23:04 +08:00
RuoYi
f1fed76273 升级element-ui到最新版本2.15.6 2021-10-09 12:22:48 +08:00
疯狂的狮子li
3f142dd0fa 发布 v3.2.0 2021-09-28 09:41:37 +08:00
疯狂的狮子li
22b4f87232 Merge remote-tracking branch 'origin/dev' into dev 2021-09-28 09:32:56 +08:00
疯狂的狮子li
ca5823fcdf Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/package.json
 2021-09-28 09:30:34 +08:00
疯狂的狮子Li
49fc74be5d fix 修复更新问题 导出文件名乱码 2021-09-27 21:30:07 +08:00
RuoYi
25f50d74c5 升级sass-loader到最新版本10.1.1 2021-09-27 18:54:43 +08:00
RuoYi
266f4d6806 升级dart-sass到版本1.32.13 2021-09-27 18:54:10 +08:00