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

1231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子li
1f2cf719da Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-ui/src/views/monitor/job/index.vue
 2021-07-21 14:00:07 +08:00
疯狂的狮子li
85376e8d6e add 演示Demo增加自定义分页接口案例 2021-07-21 12:07:12 +08:00
疯狂的狮子li
ed197ce7ac update 完成OSS模块页面功能 2021-07-20 17:26:20 +08:00
疯狂的狮子li
a4c019ace2 update OSS接口增加通用contentType 2021-07-20 11:12:22 +08:00
疯狂的狮子li
eea8f33cf9 发布 v2.5.2 bug修复版 
(cherry picked from commit b12bdd1f15c562c7f99ce1588d9f950aaee79bbe)
 2021-07-19 19:44:18 +08:00
疯狂的狮子li
0a128e454c update 编写 Minio 实现 调整OSS模块结构 2021-07-19 19:40:18 +08:00
疯狂的狮子li
3aaf4e2384 fix 回滚代码生成器 批处理优化(字段内容不一致, 不适合批处理) 2021-07-19 14:18:38 +08:00
疯狂的狮子li
1891dbc566 fix 代码生成 queryType 重复勾选数据库无默认值问题 2021-07-19 10:04:56 +08:00
疯狂的狮子li
00b9043915 add 增加 OSS 模块业务代码 2021-07-18 20:27:37 +08:00
疯狂的狮子li
fdd8c65b36 fix 修复接口单参数校验无效问题 2021-07-18 19:53:16 +08:00
疯狂的狮子li
7cffafcdaa update 增加OSS模块service自动激活 2021-07-18 19:29:33 +08:00
疯狂的狮子li
f847f67982 update 更新OSS配置类 使用内部类结构 2021-07-18 18:41:47 +08:00
疯狂的狮子li
4b921f5e72 remove 移除无用配置 2021-07-18 18:22:55 +08:00
疯狂的狮子li
089e288a6e update 使用 策略+工厂 重写OSS模块 2021-07-18 18:20:21 +08:00
疯狂的狮子li
d642c08c2e update 优化代码生成器注释格式 2021-07-18 18:19:16 +08:00
疯狂的狮子li
7e90d84598 add 增加 OSS 对象存储模块 相关代码(未完成) 2021-07-17 20:44:27 +08:00
疯狂的狮子li
d7fde6fe0d fix 代码生成器 queryType >= <= 标识符错误问题 2021-07-17 18:07:08 +08:00
RuoYi
b616a2f2e7 定时任务新增更多操作 2021-07-15 17:35:33 +08:00
疯狂的狮子li
dfebbfc331 remove 删除无用文档与脚本 2021-07-14 14:47:48 +08:00
疯狂的狮子Li
a42acb03ab !70 fix 未完全解决的代码生成字典问题 
Merge pull request !70 from Nguyendream/N/A
 2021-07-14 06:43:08 +00:00
Nguyendream
1031ba44b7 fix 未完全解决的代码生成字典问题 2021-07-14 06:38:56 +00:00
疯狂的狮子li
28fa991fc2 update 修复 thread-pool: enabled 配置不生效问题 2021-07-14 10:43:33 +08:00
RuoYi
60abdf1dbc 升级oshi到最新版本v5.7.5 2021-07-14 09:53:26 +08:00
疯狂的狮子li
55546dfc80 发布 v2.5.1 针对 v2.5.0 版本新特性bug修复 2021-07-13 13:49:47 +08:00
疯狂的狮子li
a412b6b03a update 验证码开关 转移到系统配置内 2021-07-13 13:38:53 +08:00
疯狂的狮子li
fd5414f82e 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-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/login.vue
	sql/ry_20210713.sql
 2021-07-13 13:34:10 +08:00
疯狂的狮子li
79965e30af fix 合并 pr !68 业务集群部署与文件上传的问题 2021-07-13 13:20:08 +08:00
疯狂的狮子li
5c8de41b32 fix 修复 docker业务集群部署与文件上传的问题 2021-07-13 13:12:32 +08:00
疯狂的狮子li
6bf38a806c fix 修复 docker业务集群部署与文件上传的问题 2021-07-13 13:11:37 +08:00
疯狂的狮子li
15c45eae11 fix 修复代码生成同步表结构id冲突问题 2021-07-13 13:08:47 +08:00
疯狂的狮子li
45b9acd57b fix 修复代码生成选择字典 无法取消问题 2021-07-13 11:32:02 +08:00
疯狂的狮子li
3b765f3ac9 fix 修复代码生成字典为null问题 2021-07-13 11:24:12 +08:00
RuoYi
7b894da43c 参数管理支持配置验证码开关 2021-07-13 10:30:40 +08:00
RuoYi
c8b66f9b04 删除富文本video事件 2021-07-13 10:28:55 +08:00
若依
25d9edd5c9 !259 图片上传 - 多图时无法删除相应图片修复 
Merge pull request !259 from 严俊东/N/A
 2021-07-13 02:26:10 +00:00
疯狂的狮子li
fdad98b321 Merge remote-tracking branch 'origin/dev' into dev 2021-07-12 14:30:05 +08:00
疯狂的狮子li
8ddd71a818 update 使用hutool重构 判断是否url 2021-07-12 14:29:49 +08:00
疯狂的狮子Li
1cbe4c0d88 Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev 2021-07-12 03:39:26 +00:00
严俊东
77a21d098f 图片上传 - 多图时无法删除相应图片修复 2021-07-12 03:01:50 +00:00
疯狂的狮子li
cd34c87afa fix 修复升级合并错误 2021-07-12 11:00:12 +08:00
疯狂的狮子li
d30ba9d52e 发布 v2.5.0 2021-07-12 09:58:32 +08:00
疯狂的狮子li
e085ec9418 发布 v2.5.0 2021-07-12 09:53:46 +08:00
疯狂的狮子li
aac20ca789 update hutool 5.7.4 2021-07-12 09:46:05 +08:00
疯狂的狮子li
599016a63a update 同步ruoyi修正差异 2021-07-12 09:44:46 +08:00
疯狂的狮子li
8231953e29 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/SysMenuController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/pom.xml
	ruoyi-quartz/pom.xml
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/index.vue
 2021-07-12 09:37:23 +08:00
RuoYi
170cfb356c 若依 3.6.0 2021-07-12 08:42:11 +08:00
RuoYi
5879c2484a 菜单路由配置支持内链访问 2021-07-11 16:31:10 +08:00
RuoYi
c02dad2ca3 默认访问首页新增提示语 2021-07-11 15:28:11 +08:00
RuoYi
1bfa14e3c6 富文本默认上传返回url类型 2021-07-10 12:17:32 +08:00
疯狂的狮子li
ea506de048 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/directive/index.js
	ruoyi-ui/src/directive/permission/hasPermi.js
	ruoyi-ui/src/directive/permission/hasRole.js
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/notice/index.vue
 2021-07-09 18:07:32 +08:00