wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,429 Commits 2 Branches 0 Tags 6 MiB
Commit Graph

1429 Commits

Author SHA1 Message Date
sanmao 3624db9f23 Merge branch 'master' of https://git.we-zone.com/wezone/Ry-master into main 2021-09-26 16:27:24 +08:00
sanmao 9d7fc90ab9 升级至vue3 2021-09-26 16:26:28 +08:00
sanmao 894980afb5 first commit 2021-09-16 15:26:57 +08:00
Eee f5212046ee 测试Fluent-Mybatis多对多关系 2021-09-15 18:31:58 +08:00
Eee 6a5146d7b0 增加mall模块，测试Fluent-Mybatis 2021-09-09 16:37:05 +08:00
Eee a72109cd7a Merge branch 'master' of https://git.we-zone.com/wezone/Ry-master 
# Conflicts:
#	ruoyi-admin/src/main/resources/application-dev.yml
#	ruoyi-common/pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java
#	ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java
#	ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java
#	ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java
#	ruoyi-common/src/main/java/com/ruoyi/common/exception/job/TaskException.java
#	ruoyi-generator/src/main/resources/generator.yml
#	ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
#	ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml
#	ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
#	ruoyi-ui/public/html/ie.html
#	ruoyi-ui/public/robots.txt
#	ruoyi-ui/src/api/monitor/cache.js
#	ruoyi-ui/src/assets/images/dark.svg
#	ruoyi-ui/src/assets/images/light.svg
#	ruoyi-ui/src/components/DictTag/index.vue
#	ruoyi-ui/src/components/RightToolbar/index.vue
#	ruoyi-ui/src/components/iFrame/index.vue
#	ruoyi-ui/src/directive/dialog/drag.js
#	ruoyi-ui/src/layout/components/InnerLink/index.vue
#	ruoyi-ui/src/utils/generator/config.js
#	ruoyi-ui/src/utils/generator/css.js
#	ruoyi-ui/src/utils/generator/drawingDefalut.js
#	ruoyi-ui/src/utils/generator/html.js
#	ruoyi-ui/src/utils/generator/js.js
#	ruoyi-ui/src/utils/generator/render.js
#	ruoyi-ui/src/views/index_v1.vue
#	ruoyi-ui/src/views/monitor/cache/index.vue
#	ruoyi-ui/src/views/system/role/authUser.vue
#	ruoyi-ui/src/views/system/role/selectUser.vue
#	ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue
#	ruoyi-ui/src/views/tool/build/DraggableItem.vue
#	ruoyi-ui/src/views/tool/build/IconsDialog.vue
#	ruoyi-ui/src/views/tool/build/RightPanel.vue
#	ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue
#	sql/quartz.sql
 2021-09-07 10:20:56 +08:00
Eee ddba5accd4 引入Fluent-mybatis并做初步测试 2021-09-07 10:02:16 +08:00
Eee b47601fa4f RY-Base 2021-09-07 09:57:42 +08:00
疯狂的狮子Li 94be46d065 fix 修复定时器工具编写错误问题 2021-08-26 18:03:33 +08:00
疯狂的狮子li d48c57917c fix 修复 excel 导入与 class 未对应问题 2021-08-20 17:01:18 +08:00
疯狂的狮子li c91d33e4ab update 优化 OSS 模块与上传组件 异常处理 2021-08-18 19:15:03 +08:00
疯狂的狮子li a33a919169 fix 修复 OSS配置清空被过滤问题 2021-08-18 18:24:24 +08:00
疯狂的狮子li 96c4c4da56 fix 修复 新版本说明 标签错误 2021-08-18 16:54:22 +08:00
疯狂的狮子li cf4b49ca3b fix 修复 富文本图片路径错误问题 2021-08-18 14:50:10 +08:00
疯狂的狮子li 6a8deaf61a fix 修复 minio 无 perfix 问题 2021-08-18 14:14:50 +08:00
疯狂的狮子Li 0375fd319c !78 同步dev分支 
Merge pull request !78 from 疯狂的狮子Li/dev
 2021-08-18 03:11:24 +00:00
疯狂的狮子Li b19111b9bf Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev 2021-08-18 03:11:04 +00:00
疯狂的狮子li a937e3f268 发布 v3.0.0 2021-08-18 11:09:14 +08:00
疯狂的狮子li 4eb94f4a1e update 更新vip群信息 2021-08-18 10:44:08 +08:00
疯狂的狮子li 8cc673ec95 update 同步 ruoyi 自定义限流 新功能 2021-08-17 14:39:38 +08:00
疯狂的狮子li c271ffc066 update 同步 ruoyi 自定义限流 新功能 2021-08-17 14:34:29 +08:00
疯狂的狮子li 896939ce4e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
 2021-08-17 14:23:19 +08:00
RuoYi 5c155f5f11 支持自定义注解实现接口限流 2021-08-17 14:08:18 +08:00
疯狂的狮子li 5bfb2dae13 update 优化OSS异常判断 2021-08-17 11:43:14 +08:00
疯狂的狮子li 52d0d62c35 update 同步 ruoyi 适配改动 2021-08-17 10:45:01 +08:00
疯狂的狮子li d3abd6c96e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.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/SysDictTypeServiceImpl.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/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/components/Breadcrumb/index.vue
 2021-08-17 10:38:07 +08:00
RuoYi 03cf98d3c9 优化异常信息 2021-08-16 16:25:25 +08:00
若依 6f51f729ba !289 添加日期范围支持重复添加多组日期范围，请求参数中对象的属性为null、undefined不进行拼接 
Merge pull request !289 from wangzhaoqiang/master
 2021-08-16 08:23:27 +00:00
疯狂的狮子li 73d2ed4c02 update 更新批量演示demo代码 2021-08-16 16:18:36 +08:00
wangzhaoqiang 57b159eb98 添加日期范围支持重复添加多组日期范围，请求参数中对象的属性为null、undefined不进行拼接 2021-08-16 14:48:34 +08:00
若依 08da6834a5 !288 修正方法名单词拼写错误 
Merge pull request !288 from 稚屿/N/A
 2021-08-16 02:36:36 +00:00
若依 268468fb47 !287 更新到【默认首页使用keep-alive缓存】后报错 
Merge pull request !287 from wangzhaoqiang/master
 2021-08-16 02:36:29 +00:00
稚屿 333e19339c 修正方法名单词拼写错误 2021-08-15 10:26:05 +00:00
疯狂的狮子li 25b47db3cb update 移除Spring注入 改为全局缓存 并使用更新时间确保集群配置最终一致性 2021-08-15 16:59:46 +08:00
wangzhaoqiang 7b6ccd9b22 解决登录后浏览器后台Breadcrumb组件报错 2021-08-14 20:16:48 +08:00
疯狂的狮子li 881edb3e62 update springboot admin 2.4.3 => 2.5.0 (新增 Quartz 专属监控页) 2021-08-14 14:53:25 +08:00
疯狂的狮子li bb1d8d5796 remove 删除无用常量 2021-08-14 14:30:52 +08:00
疯狂的狮子li cb13642e85 update 重写 OSS 模块相关实现 支持动态配置(页面配置) 2021-08-13 21:09:24 +08:00
疯狂的狮子li 6473d4d8be Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	bin/clean.bat
	bin/run.bat
	ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.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-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/bin/run-web.bat
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/index.vue
 2021-08-13 17:36:26 +08:00
RuoYi 5d6f134609 多图上传组件移除多余的api地址 2021-08-13 15:15:35 +08:00
RuoYi f02743bde5 代码生成主子表多选行数据 2021-08-13 14:50:35 +08:00
疯狂的狮子li 8c09c30ca0 remove 删除OSS配置页面无用按钮 2021-08-13 14:32:24 +08:00
疯狂的狮子li 86fba4aed4 remove 删除配置文件 OSS存储相关配置 2021-08-13 14:10:16 +08:00
疯狂的狮子li a5a71bf505 fix 修复代码生成 删除按钮报错 loading 不取消问题 2021-08-13 14:07:32 +08:00
疯狂的狮子li 652a39b11c update 修正 PR 相关问题 2021-08-13 14:04:57 +08:00
疯狂的狮子li 824635df7f update 修正 PR 相关问题 2021-08-13 12:37:34 +08:00
RuoYi 3003bb0f50 Excel注解图片导入兼容xls 2021-08-13 10:56:35 +08:00
RuoYi 5139265d32 默认首页使用keep-alive缓存 2021-08-13 10:10:29 +08:00
孤舟烟雨 c9f7314cd0 !77 update 对象存储配置 重构到数据库 动态配置 
* 增加对象存储配置sql
* 修改对象存储配置
* Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
* 增加对象存储配置
* 增加对象存储配置
 2021-08-13 02:03:46 +00:00
若依 8a67af6c26 !285 修复角色分配用户页面接收参数与传递参数类型不一致导致的错误 
Merge pull request !285 from 稚屿/N/A
 2021-08-13 01:55:58 +00:00