667 Commits (12f5327e0efc18be9d1c7b7a37364a55d113398f)

Author	SHA1	Message	Date
疯狂的狮子li	cd312f1348	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-ui/src/assets/styles/sidebar.scss ruoyi-ui/src/layout/components/Settings/index.vue ruoyi-ui/src/layout/index.vue ruoyi-ui/src/store/modules/app.js ruoyi-ui/src/store/modules/permission.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/system/dict/data.vue ruoyi-ui/src/views/system/dict/index.vue ruoyi-ui/src/views/system/role/index.vue ruoyi-ui/src/views/system/user/index.vue ruoyi-ui/src/views/tool/gen/importTable.vue	3 years ago
疯狂的狮子li	2285a94958	update 更新首页关于 权限认证框架 框架说明 改为 Sa-Token	3 years ago
疯狂的狮子li	333a38978e	update 重命名 菜单字段 query -> query_param 解决系统关键字问题	3 years ago
疯狂的狮子Li	604c671d41	update 临时处理 关于数据源的切换(后续在页面做个输入框 有兴趣的可以pr)	3 years ago
RuoYi	6130bebbb3	开启TopNav没有子菜单情况隐藏侧边栏	3 years ago
SG	07dfef48be	修改提示	3 years ago
疯狂的狮子li	8ee749f137	update 初步适配oracle(未完成)	3 years ago
RuoYi	cb8f5de5af	修复表单清除元素位置未垂直居中问题(I4V27B)	3 years ago
疯狂的狮子li	42df37bb21	发布 4.0.1 大升级 4.X 之后第一个修复版本	3 years ago
疯狂的狮子li	2190d87dc9	update 文件上传补全漏改	3 years ago
疯狂的狮子li	b9afd55856	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/common/CommonController.java ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java ruoyi-ui/src/components/FileUpload/index.vue ruoyi-ui/src/components/ImageUpload/index.vue ruoyi-ui/src/views/monitor/server/index.vue ruoyi-ui/src/views/system/user/index.vue	3 years ago
疯狂的狮子li	147eb7a9e5	update 图片上传 文件上传 支持并发上传	3 years ago
fuzui	96edba7eec	fix: 服务监控中运行参数显示条件错误	3 years ago
疯狂的狮子li	6751b97db9	fix 修复一些小问题	3 years ago
RuoYi	927b05713a	组件fileUpload支持多文件同时选择上传	3 years ago
RuoYi	e62e8e372c	组件ImageUpload支持多图同时选择上传	3 years ago
疯狂的狮子li	568e2a9337	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: pom.xml ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml ruoyi-ui/src/components/Pagination/index.vue ruoyi-ui/src/permission.js ruoyi-ui/src/utils/request.js ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/monitor/server/index.vue ruoyi-ui/src/views/system/user/index.vue ruoyi-ui/src/views/system/user/profile/userInfo.vue	3 years ago
RuoYi	bb65cd1976	代码生成子表支持日期/字典配置	3 years ago
“lumingsyc”	9aaa9ce8aa	优化部门管理页面email字段的表单验证多余的单引号	3 years ago
RuoYi	cb5a6d29e2	页面若未匹配到字典标签则返回原字典值	3 years ago
RuoYi	4d8bd8805b	优化个人中心页面email字段的表单验证多余的单引号	3 years ago
RuoYi	aa9ed2e863	修复分页组件请求两次问题	3 years ago
疯狂的狮子li	075f7fc19e	update 增加 用户注册 用户类型默认值	3 years ago
RuoYi	54c6c4e547	服务监控新增运行参数信息显示	3 years ago
疯狂的狮子li	587fb27484	add 增加页面更新说明	3 years ago
疯狂的狮子li	7f305962f2	发布 4.0.0	3 years ago
疯狂的狮子li	f6edb48df9	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java ruoyi-ui/src/components/Pagination/index.vue	3 years ago
积硅步，至千里	e793138031	修改登录超时刷新页面跳转登录页面还提示重新登录问题	3 years ago
RuoYi	d734bfc34f	修复分页组件请求两次问题(I4SQOR)	3 years ago
疯狂的狮子li	ee2f74dc5e	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: .gitignore ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.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/SysRoleServiceImpl.java ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml ruoyi-ui/src/components/FileUpload/index.vue ruoyi-ui/src/views/tool/build/index.vue	3 years ago
RuoYi	b7b4364db2	代码生成编辑修改打开新页签	3 years ago
若依	5e6fd0d1e1	!429 修复自定义组件`file-upload`无法显示第一个文件，列表显示的文件比实际文件少一个的问题 ... Merge pull request !429 from hjk2008/master	3 years ago
sam	c491257359	修复自定义组件`file-upload`无法显示第一个文件，列表显示的文件比实际文件少一个的问题	3 years ago
疯狂的狮子li	d99dd4b875	update 调整oss预览开关 使用前端直接调用更改配置参数	3 years ago
稚屿	a29201a248	修正单词拼写错误	3 years ago
疯狂的狮子li	0b852faf00	Merge remote-tracking branch 'ruoyi-vue/master' into dev ... # Conflicts: # pom.xml # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.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/utils/poi/ExcelUtil.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-ui/src/assets/styles/ruoyi.scss # ry.bat	3 years ago
wind	48b007543a	fix css class name	3 years ago
疯狂的狮子li	c636e6909b	Merge remote-tracking branch 'ruoyi-vue/master' into dev ... # Conflicts: # ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java # ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java # ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java	3 years ago
RuoYi	dccb3ac6c6	修复选项卡点击右键刷新丢失参数问题	3 years ago
疯狂的狮子li	911867d5a5	update 数据库更改 对接多用户体系	3 years ago
疯狂的狮子li	8052d75957	Merge remote-tracking branch 'ruoyi-vue/master' into dev ... # Conflicts: # ruoyi-admin/src/main/resources/application.yml # ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java # ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java # ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java # ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java # ruoyi-ui/src/views/login.vue # ruoyi-ui/src/views/register.vue	3 years ago
RuoYi	d7ca248bc8	update copyright 2022	3 years ago
疯狂的狮子li	a0bed51d96	update 格式化代码 统一间隔符 ... update 格式化代码 统一间隔符	3 years ago
疯狂的狮子li	5413b37d71	Merge remote-tracking branch 'ruoyi-vue/master' into dev ... # Conflicts: # README.md # ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java # ruoyi-ui/src/views/index.vue	3 years ago
RuoYi	9bd7509e87	添加新群号：264312783	3 years ago
RuoYi	9f7acd4cf9	优化部门修改缩放后出现的错位问题	3 years ago
疯狂的狮子li	1c7d840ff6	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: pom.xml ruoyi-admin/pom.xml ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java ruoyi-admin/src/main/resources/application.yml ruoyi-common/pom.xml ruoyi-framework/pom.xml ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java ruoyi-generator/pom.xml ruoyi-job/pom.xml ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java ruoyi-system/pom.xml ruoyi-ui/package.json ruoyi-ui/src/api/system/user.js ruoyi-ui/src/utils/request.js ruoyi-ui/src/views/index.vue ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/system/user/index.vue	3 years ago
RuoYi	c8d9b3f8fc	前端支持设置是否需要防止数据重复提交	3 years ago
RuoYi	c9d19cbe56	空值不进行回显数据字典	3 years ago
RuoYi	7bc15245aa	预览组件支持多图显示	3 years ago